diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ae463a6..8943677 100644 --- 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 index 5ad8d2c..547308a 100644 --- 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 index bdc8808..15756ca 100644 --- 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/release-action@v1.13.0 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 index c5efd37..4fb97f0 100644 --- 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 \ No newline at end of file + run: mvn clean install -Pjavadoc,jacoco --file pom.xml \ No newline at end of file diff --git a/README.md b/README.md index 21e64df..51eec04 100644 --- 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). + [contributors-shield]: https://img.shields.io/github/contributors/HHS/ASPR-ms-taskit diff --git a/core/pom.xml b/core/pom.xml index 9dc3910..4984da0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,4 +18,11 @@ Translation and Serialization Toolkit (Taskit): Core 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. + + + scm:git:git://github.com/HHS/aspr-ms-taskit.git + scm:git:ssh://github.com:HHS/aspr-ms-taskit.git + https://github.com/HHS/aspr-ms-taskit/tree/main/core + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d751996..78f1a73 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,10 @@ GNU GENERAL PUBLIC LICENSE v3 https://www.gnu.org/licenses/gpl-3.0.en.html + + Vulnerability Disclosure Policy + https://www.hhs.gov/vulnerability-disclosure-policy/index.html + @@ -55,10 +59,12 @@ 3.1.1 3.1.1 3.6.3 + 3.2.2 + 0.4.0 2.10.1 - 4.1.0 + 4.1.1 5.10.2 0.8.11 @@ -173,6 +179,16 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} + @@ -251,12 +267,90 @@ false + + + org.sonatype.central + central-publishing-maven-plugin + true + + central + true + ASPR MS Taskit + + - release + javadoc + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + all,-missing + + + gov.hhs.aspr.ms + util + ${util.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter-engine.version} + + + false + + -Xmaxerrs + 65536 + -Xmaxwarns + 65536 + + + + + attach-javadocs + verify + + jar + + + + + + + + + sign + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + + + false + + + + + + + jacoco @@ -309,45 +403,9 @@ - - - org.apache.maven.plugins - maven-javadoc-plugin - - all,-missing - - - gov.hhs.aspr.ms - util - ${util.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter-engine.version} - - - false - - -Xmaxerrs - 65536 - -Xmaxwarns - 65536 - - - - - attach-javadocs - verify - - jar - - - - - + \ No newline at end of file diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 945bf4f..b271fdb 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -18,6 +18,13 @@ Translation and Serialization Toolkit (Taskit): Protobuf A toolkit that aids in the conversion between Protobuf Java objects and application Java objects. + + + scm:git:git://github.com/HHS/aspr-ms-taskit.git + scm:git:ssh://github.com:HHS/aspr-ms-taskit.git + https://github.com/HHS/aspr-ms-taskit/tree/main/protobuf + +