Merge pull request #38 from HHS/dev

v4.3.0
HHS · Aug 19, 2024 · 81a7bd0 · 81a7bd0
2 parents 674cc54 + b7651ac
commit 81a7bd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 55 deletions.
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -58,56 +58,9 @@ jobs:
         tag: "v${{ env.version }}"
         generateReleaseNotes: true
         skipIfReleaseExists: true
-
-  update-gcm:
-    needs: release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    env:
-      VERSION: ${{ needs.release.outputs.util_version }}
-    steps:
-      - name: Checkout GCM
-        uses: actions/checkout@v4
-        with:
-          repository: HHS/ASPR-8
-          token: ${{ secrets.GHA_BOT }}
-
-      - name: Update Util version
-        run : |
-          echo "$VERSION"
-          sed -i "0,/<util.version>.*<\/util.version>/s//<util.version>$VERSION<\/util.version>/g" pom.xml
-
-      - name: Increment GCM Version
-        run: |
-          current_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)
-          echo GCM Version: $current_version
-          parts=( ${current_version//./ } )
-          bv=$((parts[2] + 1))
-          new_version="${parts[0]}.${parts[1]}.${bv}"
-          echo New GCM Version: $new_version
-          sed -i "0,/<revision>.*<\/revision>/s//<revision>$new_version<\/revision>/g" pom.xml
-
-      - name: Setup Git
-        run: |
-          git config --global user.name "github-actions"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-      - name: Make branch in GCM
-        run: |
-          git checkout -b update-util-to-$VERSION
-          git add pom.xml
-          git commit -m "Update util to $VERSION"
-          git push --set-upstream origin update-util-to-$VERSION
-      
-      - name: Make PR in GCM
-        run: |
-          gh pr create -R HHS/ASPR-8 -B main --fill
-          gh pr merge -m --auto
-        env:
-          GH_TOKEN: ${{ secrets.GHA_BOT }}
-
+
   update-taskit:
+    if: ${{ !endsWith(needs.release.outputs.util_version, '0') }}
     needs: release
     runs-on: ubuntu-latest
     permissions:

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <!-- Artifact -->
     <groupId>gov.hhs.aspr.ms</groupId>
     <artifactId>util</artifactId>
-    <version>4.2.1</version>
+    <version>4.3.0</version>
     <packaging>jar</packaging>
 
     <name>Modeling Utils</name>
@@ -58,16 +58,16 @@
 
         <!-- plugin versions -->
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
-        <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
-        <central-publishing-maven-plugin.version>0.4.0</central-publishing-maven-plugin.version>
+        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
+        <central-publishing-maven-plugin.version>0.5.0</central-publishing-maven-plugin.version>
 
         <!-- dependency versions-->
         <commons-math3.version>3.6.1</commons-math3.version>
         <jcip-annotations.version>1.0</jcip-annotations.version>
-        <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
+        <junit-jupiter-engine.version>5.11.0</junit-jupiter-engine.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     </properties>