Merge pull request #44 from HHS/dev

GCM Taskit 2.8.0
HHS · Apr 24, 2024 · 4b72001 · 4b72001
2 parents 51c627a + 7695077
commit 4b72001
Show file tree

Hide file tree

Showing 233 changed files with 1,376 additions and 725 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
     target-branch: "dev"
     open-pull-requests-limit: 10
     groups:
@@ -23,11 +23,13 @@ updates:
         patterns:
           - "org.codehaus.mojo:flatten-maven-plugin"
           - "org.apache.maven.plugins*"
-      dependencies:
+      protobuf-dependencies:
         patterns:
-          - "gov.hhs.aspr.ms.taskit:taskit*"
-          - "gov.hhs.aspr.ms.gcm:simulation"
           - "com.google.protobuf:protoc"
+      aspr-ms-dependencies:
+        patterns:
+          - "gov.hhs.aspr.ms.gcm:simulation"
+          - "gov.hhs.aspr.ms.taskit*"  
       test-dependencies:
         patterns:
           - "org.jacoco*"

diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -6,16 +6,16 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Development Build Pre Maven Central
+name: GCM Taskit Development Build
 
 on:
   push:
     branches: [ "dev" ]
   pull_request:
-    branches-ignore: ["main"]
+    branches: [ "dev" ]
 
 jobs:
-  build:
+  dev-build:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout GCM Taskit
@@ -28,29 +28,32 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
-    - name: Get Taskit and GCM Versions
+    - name: Get GCM Version
       run: |
-        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
         echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
 
+    - name: Checkout GCM
+      if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
+      uses: actions/checkout@v4
+      with:
+        repository: HHS/ASPR-8
+        path: gcm
+        ref: dev
+
+    - name: Get Taskit Version
+      run: |
+        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
+
     - name: Checkout Taskit
       if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }}
       uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-ms-taskit
         path: taskit
         ref: dev
-
-    - name: Checkout GCM
-      # if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-8
-        path: gcm
-        ref: ${{ (endsWith(env.gcm_version, 'SNAPSHOT') && 'dev') || env.gcm_version }}
 
     - name: Get Util Version
-      # if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
+      if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
       run: |
         echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
 
@@ -67,7 +70,7 @@ jobs:
       run: mvn clean install -DskipTests --file util/pom.xml
 
     - name: Build GCM
-      # if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
+      if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }}
       run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
 
     - name: Build Taskit

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -16,7 +16,7 @@ on:
     branches: ["main"]
 
 jobs:
-  create-release:
+  release:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -29,26 +29,23 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+        server-id: central
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_PASSWORD
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
-    - name: Get Taskit and GCM Versions
-      run: |
-        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
-
-    - name: Checkout GCM
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-8
-        path: gcm
-        ref: ${{ env.gcm_version }}
-
-    - name: Build GCM
-      run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
     - name: Build GCM Taskit
-      run: mvn clean install -Prelease --file pom.xml
+      run: mvn clean deploy -Pjavadoc,sign --file pom.xml
+      env:
+        MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSWORD }}
 
     - name: Get Version
       run: |
         echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
+        
     - name: Make Release
       uses: ncipollo/release-action@v1
       with:

diff --git a/.github/workflows/release_pr_build.yml b/.github/workflows/release_pr_build.yml
@@ -27,18 +27,15 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
 
-    - name: Get GCM Version
+    - name: Get Version
       run: |
-        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
+        echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
     
-    - name: Checkout GCM
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-8
-        path: gcm
-        ref: ${{ env.gcm_version }}
+    - name: Version Is Snapshot
+      if: ${{ endsWith(env.version, 'SNAPSHOT') }}
+      run: |
+        echo "Version is a SNAPSHOT version. Update version to proper version."
+        exit 1 
 
-    - name: Build GCM
-      run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
     - name: Build GCM Taskit
-      run: mvn clean install -Prelease --file pom.xml
+      run: mvn clean install -Pjavadoc,jacoco --file pom.xml
diff --git a/README.md b/README.md
@@ -9,11 +9,23 @@ An implementation of [Taskit](https://github.com/HHS/ASPR-ms-taskit) for use wit
 
 Currently there is only 1 supported serialzation format, and that is protobuf. Other formats such as binary will follow in the future.
 
+As of v2.8.0, this project is in Maven Central
+
 ## License
 Distributed under the GPLv3 License. See [LICENSE](LICENSE) for more information.
 
 Please read the [HHS vulnerability discloure](https://www.hhs.gov/vulnerability-disclosure-policy/index.html).
 
+## Usage 
+To use this project in your project, simply add the following dependency to your `dependencies` section of your pom.xml file.
+```
+<dependency>
+    <groupId>gov.hhs.aspr.ms.gcm.taskit</groupId>
+    <artifactId>protobuf</artifactId>
+    <version>2.8.0</version>
+</dependency>
+```
+
 ## Overview
 This taskit implementation is built as follows:
 
@@ -42,7 +54,7 @@ Just the following classes support serialization
 - GCM located [here](https://github.com/HHS/ASPR8)
 - Taskit located [here](https://github.com/HHS/ASPR-ms-taskit)
 
-*NOTE that both Taskit and Modeling Util are in maven central, so there is no need to clone and build those repos
+*NOTE that Modeling Utils, GCM and Taskit are in maven central, so there is no need to clone and build those repos
 
 ### Building
 To build this project: