From db11ba2bbf480a41dfe571ca6f3d923a71e5bc07 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 25 Mar 2021 13:53:40 -0500 Subject: [PATCH 1/4] Fixing security issues with dependencies. --- pom.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca42668..10ba96d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,8 @@ 2.0.0 2.29.1 - 2.10.1 + 2.10.5 + 2.10.5.1 @@ -240,6 +241,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + io.adobe.cloudmanager + + @@ -278,6 +289,11 @@ jacoco-maven-plugin 0.8.6 + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + @@ -450,7 +466,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-version} + ${jackson-databind-version} com.fasterxml.jackson.datatype From 5261f350f04006dc048eef9ef4bc722a71fc07e9 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 25 Mar 2021 13:54:15 -0500 Subject: [PATCH 2/4] Test changelog steps. --- .github/workflows/changelog.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/changelog.yaml diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml new file mode 100644 index 0000000..ff4bfbd --- /dev/null +++ b/.github/workflows/changelog.yaml @@ -0,0 +1,24 @@ +name: Changelog + +on: workflow_dispatch + +jobs: + changelog: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Generate Changelog + uses: heinrichreimer/github-changelog-generator-action@v2.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Commit Changelog + run: | + git config user.name "GitHub Actions" + git config user.email noreply@github.com + git add CHANGELOG.md + git commit -m 'Update Changelog.' + git push + From c29755c3d8e8acff0a29aa3bbcc71ad8946bd789 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 25 Mar 2021 16:14:49 -0500 Subject: [PATCH 3/4] Adding some more automated tasks. --- .github/workflows/changelog.yaml | 24 ------------------------ .github/workflows/maven-verify.yaml | 3 --- .github/workflows/release.yaml | 25 +++++++++++++++++++++++-- .github/workflows/snapshot-deploy.yaml | 7 +++++-- 4 files changed, 28 insertions(+), 31 deletions(-) delete mode 100644 .github/workflows/changelog.yaml diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml deleted file mode 100644 index ff4bfbd..0000000 --- a/.github/workflows/changelog.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Changelog - -on: workflow_dispatch - -jobs: - changelog: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Generate Changelog - uses: heinrichreimer/github-changelog-generator-action@v2.1.1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Commit Changelog - run: | - git config user.name "GitHub Actions" - git config user.email noreply@github.com - git add CHANGELOG.md - git commit -m 'Update Changelog.' - git push - diff --git a/.github/workflows/maven-verify.yaml b/.github/workflows/maven-verify.yaml index 7f98bc1..6b4da93 100644 --- a/.github/workflows/maven-verify.yaml +++ b/.github/workflows/maven-verify.yaml @@ -1,9 +1,6 @@ name: Build on: - push: - branches: - - main pull_request: branches: - main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bc39675..17203a3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -168,16 +168,37 @@ jobs: ${{ runner.os }}-maven- - name: Publish to Apache Maven Central - run: mvn clean deploy -P release,attach-javadoc,attach-source + run: mvn clean deploy -P release,attach-javadoc,attach-source -DskipStagingRepositoryClose=true env: MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Publish to Apache Maven Central - run: mvn clean deploy -P release,java8 + run: mvn clean deploy -P release,java8 -DautoReleaseAfterClose=true env: MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + changelog: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Generate Changelog + uses: heinrichreimer/github-changelog-generator-action@v2.2 + with: + issues: false + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Commit Changelog + run: | + git config user.name "GitHub Actions" + git config user.email noreply@github.com + git add CHANGELOG.md + git commit -m 'Update Changelog.' + git push diff --git a/.github/workflows/snapshot-deploy.yaml b/.github/workflows/snapshot-deploy.yaml index 5e40665..dbbf33a 100644 --- a/.github/workflows/snapshot-deploy.yaml +++ b/.github/workflows/snapshot-deploy.yaml @@ -1,11 +1,14 @@ name: Deploy SNAPSHOT -on: workflow_dispatch +on: + push: + branches: + - main jobs: deploy-snapshot: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' + steps: - name: Checkout code uses: actions/checkout@v2 From fb848898b94963df7cb76603cac3a5a8ca90c95a Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 25 Mar 2021 16:15:10 -0500 Subject: [PATCH 4/4] Add ignored file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 831cc86..0fa2716 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ tmp/ local.properties .settings/ .loadpath +.classpath # Eclipse Core .project