diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8cfc936..784cc02 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,7 @@ 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: @@ -16,6 +16,10 @@ updates: 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 index dc82252..dfc187c 100644 --- 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 index f6fe721..9339be5 100644 --- 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 index 07b3f9f..1cfd154 100644 --- 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 index 3fe827e..d5ccae6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ To use this project in your project, simply add the following dependency to your gov.hhs.aspr.ms util - 4.1.1 + 4.1.2 ``` ## Building from Source diff --git a/pom.xml b/pom.xml index dc03316..dafc5ea 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ gov.hhs.aspr.ms util - 4.1.1 + 4.1.2 jar Modeling Utils @@ -21,7 +21,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html - Vulnerability Disclosure Policy + HHS Vulnerability Disclosure Policy https://www.hhs.gov/vulnerability-disclosure-policy/index.html @@ -55,20 +55,20 @@ UTF-8 17 17 - - false + 1.6.0 3.2.5 - 3.3.0 + 3.3.1 3.6.3 3.2.2 + 0.4.0 3.6.1 1.0 5.10.2 - 0.8.11 + 0.8.12 @@ -106,6 +106,36 @@ + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + + + flatten + process-resources + + flatten + + + true + ossrh + all + + + + + flatten.clean + clean + + clean + + + + + org.apache.maven.plugins @@ -137,11 +167,12 @@ org.sonatype.central central-publishing-maven-plugin - 0.4.0 + ${central-publishing-maven-plugin.version} true central true + ASPR MS Util @@ -197,9 +228,6 @@ - - false - @@ -263,4 +291,4 @@ - \ No newline at end of file +