Update gcm dep (#31)

* update to new gcm * update groupId * update poms * pom update * fix
HHS · Feb 14, 2024 · c60ea3c · c60ea3c
1 parent 46369bb
commit c60ea3c
Show file tree

Hide file tree

Showing 21 changed files with 466 additions and 904 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: "maven" # See documentation for possible values
-    directory: "/protobuf" # Location of package manifests
+    directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
     target-branch: "dev"
@@ -18,15 +18,15 @@ updates:
           - "org.apache.maven.plugins:maven-dependency-plugin"
           - "org.codehaus.mojo:build-helper-maven-plugin"
           - "org.xolstice.maven.plugins:protobuf-maven-plugin"
+          - "com.google.code.maven-replacer-plugin:maven-replacer-plugin"
       standard-plugins:
         patterns:
           - "org.codehaus.mojo:flatten-maven-plugin"
           - "org.apache.maven.plugins*"
-          - "com.google.code.maven-replacer-plugin:maven-replacer-plugin"
       dependencies:
         patterns:
-          - "gov.hhs.aspr.ms.taskit:taskit-protobuf"
-          - "gov.hhs.aspr.ms:gcm"
+          - "gov.hhs.aspr.ms.taskit:taskit*"
+          - "gov.hhs.aspr.ms.gcm:simulation"
           - "com.google.protobuf:protoc"
       test-dependencies:
         patterns:

diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -30,8 +30,8 @@ jobs:
 
     - name: Get Taskit and GCM Versions
       run: |
-        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
-        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        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 Taskit
       uses: actions/checkout@v4
@@ -48,7 +48,7 @@ jobs:
 
     - name: Get Util Version
       run: |
-        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
 
     - name: Checkout Util
       uses: actions/checkout@v4
@@ -60,11 +60,11 @@ jobs:
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM
-      run: mvn clean install -DskipTests --file gcm/gcm/pom.xml
+      run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
     - name: Build Taskit
       run: mvn clean install -DskipTests --file taskit/pom.xml
     - name: Build GCM Taskit
-      run: mvn clean install --file protobuf/pom.xml
+      run: mvn clean install --file pom.xml
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
    # - name: Update dependency graph

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -31,8 +31,8 @@ jobs:
 
     - name: Get Taskit and GCM Versions
       run: |
-        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
-        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        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 Taskit
       uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
 
     - name: Get Util Version
       run: |
-        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
 
     - name: Checkout Util
       uses: actions/checkout@v4
@@ -61,19 +61,19 @@ jobs:
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM
-      run: mvn clean install -DskipTests --file gcm/gcm/pom.xml
+      run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
     - name: Build Taskit
       run: mvn clean install -DskipTests --file taskit/pom.xml
     - name: Build GCM Taskit
-      run: mvn clean install -Prelease --file protobuf/pom.xml
+      run: mvn clean install -Prelease --file pom.xml
 
     - name: Get Version
       run: |
-        echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
     - name: Make Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: "protobuf/target/gcm-taskit-protobuf-${{ env.version }}.jar,protobuf/target/gcm-taskit-protobuf-${{ env.version }}-sources.jar,protobuf/target/gcm-taskit-protobuf-${{ env.version }}-javadoc.jar"
+        artifacts: "protobuf/target/gcm-taskit-protobuf-${{ env.version }}*.jar"
         prerelease: ${{ endsWith(env.version, '-SNAPSHOT') || contains(env.version, '-RC') }}
         name: "v${{ env.version }}"
         tag: "v${{ env.version }}"

diff --git a/.github/workflows/release_pr_build.yml b/.github/workflows/release_pr_build.yml
@@ -29,8 +29,8 @@ jobs:
 
     - name: Get Taskit and GCM Versions
       run: |
-        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
-        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.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 Taskit
       uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
 
     - name: Get Util Version
       run: |
-        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV"
 
     - name: Checkout Util
       uses: actions/checkout@v4
@@ -59,8 +59,8 @@ jobs:
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM
-      run: mvn clean install -DskipTests --file gcm/gcm/pom.xml
+      run: mvn clean install -DskipTests --file gcm/simulation/pom.xml
     - name: Build Taskit
       run: mvn clean install -DskipTests --file taskit/pom.xml
     - name: Build GCM Taskit
-      run: mvn clean install -Prelease --file protobuf/pom.xml
+      run: mvn clean install -Prelease --file pom.xml