Merge pull request #21 from HHS/dev

Util 4.1.2
HHS · Apr 15, 2024 · 37b989e · 37b989e
2 parents 1199f8e + afc440c
commit 37b989e
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 16 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,14 +8,18 @@ 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:
       standard-plugins:
         patterns:
           - "org.codehaus.mojo:flatten-maven-plugin"
           - "org.apache.maven.plugins*"
+          - "org.sonatype.central"
+      deploy-plugins:
+        patterns:
+          - "org.sonatype.central"
       dependencies:
         patterns:
           - "org.apache.commons:commons-math3"

diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -15,7 +15,7 @@ on:
     branches-ignore: ["main"]
 
 jobs:
-  build:
+  dev-build:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Util

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -16,7 +16,7 @@ on:
     branches: ["main"]
 
 jobs:
-  build-deploy:
+  release:
     runs-on: ubuntu-latest
     permissions:
       contents: write

diff --git a/.github/workflows/release_pr_build.yml b/.github/workflows/release_pr_build.yml
@@ -13,7 +13,7 @@ on:
     branches: ["main"]
 
 jobs:
-  build:
+  release-pr-build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Util
@@ -24,7 +24,16 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
+      - name: Get Version
+        run: |
+          echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
   
+      - 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 Util
         run: mvn clean install -Pjavadoc,jacoco --file pom.xml
 

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ To use this project in your project, simply add the following dependency to your
 <dependency>
     <groupId>gov.hhs.aspr.ms</groupId>
     <artifactId>util</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
 </dependency>
 ```
 ## Building from Source

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <!-- Artifact -->
     <groupId>gov.hhs.aspr.ms</groupId>
     <artifactId>util</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <packaging>jar</packaging>
 
     <name>Modeling Utils</name>
@@ -21,7 +21,7 @@
             <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
         </license>
         <license>
-            <name>Vulnerability Disclosure Policy</name>
+            <name>HHS Vulnerability Disclosure Policy</name>
             <url>https://www.hhs.gov/vulnerability-disclosure-policy/index.html</url>
         </license>
     </licenses>
@@ -55,20 +55,20 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <!-- <gpg.executable>gpg2</gpg.executable> -->
-        <gpg.useAgent>false</gpg.useAgent>
 
         <!-- 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-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-gpg-plugin.version>3.2.2</maven-gpg-plugin.version>
+        <central-publishing-maven-plugin.version>0.4.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>
-        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     </properties>
 
     <!-- Dependencies -->
@@ -106,6 +106,36 @@
     <!-- Configure Build -->
     <build>
         <plugins>
+            <!-- used with the ${revision} for versioning, creates a pom that has the version replaced with the value of ${revision} -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>ossrh</flattenMode>
+                            <flattenDependencyMode>all</flattenDependencyMode>
+                        </configuration>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Runs unit tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -137,11 +167,12 @@
             <plugin>
                 <groupId>org.sonatype.central</groupId>
                 <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.4.0</version>
+                <version>${central-publishing-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                   <publishingServerId>central</publishingServerId>
                   <tokenAuth>true</tokenAuth>
+                  <deploymentName>ASPR MS Util</deploymentName>
                 </configuration>
               </plugin>
         </plugins>
@@ -197,9 +228,6 @@
                                 </goals>
                             </execution>
                         </executions>
-                        <configuration>
-                                <useAgent>false</useAgent>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -263,4 +291,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>