Merge branch 'main' of https://github.com/HHS/ASPR-ms-taskit into dev

HHS · Apr 8, 2024 · b2d254a · b2d254a
2 parents e5d8e16 + 6018355
commit b2d254a
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 74 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,9 +22,11 @@ updates:
         patterns:   
           - "org.codehaus.mojo:flatten-maven-plugin"
           - "org.apache.maven.plugins*"
-      dependencies:
+      protobuf-dependencies:
         patterns:
           - "com.google.protobuf*"
+      dependencies:
+        patterns:
           - "gov.hhs.aspr.ms:util"
           - "com.google.code.gson:gson"
       test-dependencies:

diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -33,14 +33,17 @@ jobs:
         echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
 
     - name: Checkout Util
+      if: ${{ endsWith(env.util_version, 'SNAPSHOT') }}
       uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-ms-util
         path: util
-        ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
+        ref: dev
 
     - name: Build Util
+      if: ${{ endsWith(env.util_version, 'SNAPSHOT') }}
       run: mvn clean install -DskipTests --file util/pom.xml
+
     - name: Build Taskit
       run: mvn clean install --file pom.xml
 

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -28,22 +28,18 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-
-    - name: Get Util Version
-      run: |
-        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
-
-    - name: Checkout Util
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
-        ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
-
-    - name: Build Util
-      run: mvn clean install -DskipTests --file util/pom.xml
-    - name: Build Taskit
-      run: mvn clean install -Prelease --file pom.xml
+        server-id: central
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_PASSWORD
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+    - name: Build and Deploy Taskit
+      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 Taskit Version
       run: |
@@ -52,8 +48,7 @@ jobs:
     - name: Make Taskit Release
       uses: ncipollo/[email protected]
       with:
-        artifacts: "core/target/core-${{ env.version }}*.jar,protobuf/target/protobuf-${{ env.version }}*.jar"
-        prerelease: ${{ endsWith(env.version, '-SNAPSHOT') || contains(env.version, '-RC') }}
+        artifacts: "core/target/core-${{ env.version }}*,protobuf/target/protobuf-${{ env.version }}*"
         name: "v${{ env.version }}"
         tag: "v${{ env.version }}"
         generateReleaseNotes: true

diff --git a/.github/workflows/release_pr_build.yml b/.github/workflows/release_pr_build.yml
@@ -26,19 +26,6 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-
-    - name: Get Util Version
-      run: |
-        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"
-
-    - name: Checkout Util
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
-        ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
-
-    - name: Build Util
-      run: mvn clean install -DskipTests --file util/pom.xml
+
     - name: Build 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
@@ -57,6 +57,8 @@ Documentation has yet to be created. In the interim, the code is mostly commente
 ## 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).
+
 
 <!-- MARKDOWN LINKS & IMAGES -->
 [contributors-shield]: https://img.shields.io/github/contributors/HHS/ASPR-ms-taskit

diff --git a/core/pom.xml b/core/pom.xml
@@ -18,4 +18,11 @@
     <name>Translation and Serialization Toolkit (Taskit): Core</name>
     <description>The core components of a toolkit that aids in the conversion between two Java objects, primiarly for use with coverting between an input Java object and a application Java object.</description>
 
+    <!-- SCM Information -->
+    <scm>
+        <connection>scm:git:git://github.com/HHS/aspr-ms-taskit.git</connection>
+        <developerConnection>scm:git:ssh://github.com:HHS/aspr-ms-taskit.git</developerConnection>
+        <url>https://github.com/HHS/aspr-ms-taskit/tree/main/core</url>
+    </scm>
+
 </project>
diff --git a/pom.xml b/pom.xml
@@ -19,6 +19,10 @@
             <name>GNU GENERAL PUBLIC LICENSE v3</name>
             <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
         </license>
+        <license>
+            <name>Vulnerability Disclosure Policy</name>
+            <url>https://www.hhs.gov/vulnerability-disclosure-policy/index.html</url>
+        </license>
     </licenses>
 
     <!-- Developers -->
@@ -55,10 +59,12 @@
         <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
         <maven-deploy-plugin.version>3.1.1</maven-deploy-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 -->
         <gson.version>2.10.1</gson.version>
-        <util.version>4.1.0</util.version>
+        <util.version>4.1.1</util.version>
         <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
     </properties>
@@ -173,6 +179,16 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${maven-javadoc-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${maven-gpg-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.central</groupId>
+                    <artifactId>central-publishing-maven-plugin</artifactId>
+                    <version>${central-publishing-maven-plugin.version}</version>
+                </plugin>
             </plugins>
 
         </pluginManagement>
@@ -251,12 +267,90 @@
                 </configuration>
                 <inherited>false</inherited>
             </plugin>
+
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                  <publishingServerId>central</publishingServerId>
+                  <tokenAuth>true</tokenAuth>
+                  <deploymentName>ASPR MS Taskit</deploymentName>
+                </configuration>
+              </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
-            <id>release</id>
+            <id>javadoc</id>
+            <build>
+                <plugins>
+                    <!--Attaches javadoc jar to project -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <doclint>all,-missing</doclint>
+                            <additionalDependencies>
+                                <additionalDependency>
+                                    <groupId>gov.hhs.aspr.ms</groupId>
+                                    <artifactId>util</artifactId>
+                                    <version>${util.version}</version>
+                                </additionalDependency>
+                                <additionalDependency>
+                                    <groupId>org.junit.jupiter</groupId>
+                                    <artifactId>junit-jupiter-api</artifactId>
+                                    <version>${junit-jupiter-engine.version}</version>
+                                </additionalDependency>
+                            </additionalDependencies>
+                            <author>false</author>
+                            <additionalJOptions>
+                                <additionalJOption>-Xmaxerrs</additionalJOption>
+                                <additionalJOption>65536</additionalJOption>
+                                <additionalJOption>-Xmaxwarns</additionalJOption>
+                                <additionalJOption>65536</additionalJOption>
+                            </additionalJOptions>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven-gpg-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <useAgent>false</useAgent>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jacoco</id>
             <build>
                 <plugins>
 
@@ -309,45 +403,9 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!--Attaches javadoc jar to project -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <doclint>all,-missing</doclint>
-                            <additionalDependencies>
-                                <additionalDependency>
-                                    <groupId>gov.hhs.aspr.ms</groupId>
-                                    <artifactId>util</artifactId>
-                                    <version>${util.version}</version>
-                                </additionalDependency>
-                                <additionalDependency>
-                                    <groupId>org.junit.jupiter</groupId>
-                                    <artifactId>junit-jupiter-api</artifactId>
-                                    <version>${junit-jupiter-engine.version}</version>
-                                </additionalDependency>
-                            </additionalDependencies>
-                            <author>false</author>
-                            <additionalJOptions>
-                                <additionalJOption>-Xmaxerrs</additionalJOption>
-                                <additionalJOption>65536</additionalJOption>
-                                <additionalJOption>-Xmaxwarns</additionalJOption>
-                                <additionalJOption>65536</additionalJOption>
-                            </additionalJOptions>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
@@ -18,6 +18,13 @@
     <name>Translation and Serialization Toolkit (Taskit): Protobuf</name>
     <description>A toolkit that aids in the conversion between Protobuf Java objects and application Java objects.</description>
 
+    <!-- SCM Information -->
+    <scm>
+        <connection>scm:git:git://github.com/HHS/aspr-ms-taskit.git</connection>
+        <developerConnection>scm:git:ssh://github.com:HHS/aspr-ms-taskit.git</developerConnection>
+        <url>https://github.com/HHS/aspr-ms-taskit/tree/main/protobuf</url>
+    </scm>
+
     <!-- Properties -->
     <properties>
         <!-- plugin versions -->