diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fc7fec..282af6a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,8 @@ on: workflow_dispatch: jobs: - build: + publish: + name: Release to Maven Central runs-on: ubuntu-latest steps: - name: Check out source @@ -29,38 +30,21 @@ jobs: - name: Configure Maven settings.xml uses: whelk-io/maven-settings-xml-action@v21 with: - repositories: >- - [ - { - "id": "thundra-releases", - "url": "https://repo.thundra.io/content/repositories/thundra-releases" - }, - { - "id": "sidekick-releases", - "url": "https://repo.thundra.io/content/repositories/sidekick-releases", - "releases": { - "enabled": "true" - }, - "snapshots": { - "enabled": "false" - } - } - ] servers: >- [ { - "id": "thundra-releases", - "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME}}", - "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD}}" - }, - { - "id": "sidekick-releases", - "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME}}", - "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD}}" + "id": "ossrh", + "username": "${{ secrets.SIDEKICK_SONATYPE_NEXUS_USERNAME}}", + "password": "${{ secrets.SIDEKICK_SONATYPE_NEXUS_PASSWORD}}" } ] + - name: Import GPG key + uses: crazy-max/ghaction-import-gpg@v3 + with: + gpg-private-key: ${{ secrets.SIDEKICK_GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.SIDEKICK_GPG_PASSPHRASE}} - name: Build and Release with Maven env: GITHUB_TOKEN: ${{ secrets.SIDEKICK_DEVOPS_GITHUB_ACCESS_TOKEN }} - run: mvn -q clean install release:clean release:prepare release:perform release:clean --batch-mode -P release + run: mvn -X clean package release:clean release:prepare release:perform release:clean --batch-mode -P release diff --git a/pom.xml b/pom.xml index b33d622..6c8c210 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT pom Sidekick Java Agent @@ -365,51 +365,14 @@ - com.github.wvengen - proguard-maven-plugin - ${maven.proguard.plugin.version} + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true - false - ${project.build.finalName}.jar - ${project.build.finalName}.jar - !**/module-info.class,!META-INF/versions/9/** - - ${java.home}/lib/rt.jar - - - - - package - - proguard - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.8.1 - - - org.apache.maven.plugins - maven-scm-plugin - 1.8.1 - - - - v@{project.version} - true - releases - false - - pom.xml - + ossrh + https://s01.oss.sonatype.org/ + true @@ -419,40 +382,100 @@ release - - - sidekick-snapshots - Sidekick Snapshots - https://repo.thundra.io/content/repositories/sidekick-snapshots/ - true - - - sidekick-releases - Sidekick Releases - https://repo.thundra.io/content/repositories/sidekick-releases/ - - + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + org.apache.maven.plugins - maven-jar-plugin + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + org.apache.maven.plugins maven-release-plugin + 2.5.3 + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.8.1 + + + org.apache.maven.plugins + maven-scm-plugin + 1.8.1 + + + + v@{project.version} + [ci skip] + true + release + false + + pom.xml + + - + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + - thundra-releases - Thundra Releases - https://repo.thundra.io/content/repositories/thundra-releases + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - + diff --git a/sidekick-agent-all/pom.xml b/sidekick-agent-all/pom.xml index 865f283..eaca17a 100644 --- a/sidekick-agent-all/pom.xml +++ b/sidekick-agent-all/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-api-broker/pom.xml b/sidekick-agent-api-broker/pom.xml index 819e71d..703c51c 100644 --- a/sidekick-agent-api-broker/pom.xml +++ b/sidekick-agent-api-broker/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-api-data-redaction/pom.xml b/sidekick-agent-api-data-redaction/pom.xml index 4f9024b..35ff903 100644 --- a/sidekick-agent-api-data-redaction/pom.xml +++ b/sidekick-agent-api-data-redaction/pom.xml @@ -3,7 +3,7 @@ sidekick-agent-parent com.runsidekick.agent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT 4.0.0 diff --git a/sidekick-agent-api-logpoint/pom.xml b/sidekick-agent-api-logpoint/pom.xml index d1b0b19..d927b25 100755 --- a/sidekick-agent-api-logpoint/pom.xml +++ b/sidekick-agent-api-logpoint/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml b/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml index 764c515..17b6b84 100644 --- a/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml +++ b/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml b/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml index 8fb94bd..32e040f 100644 --- a/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml +++ b/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-api-tracepoint/pom.xml b/sidekick-agent-api-tracepoint/pom.xml index 3f25208..02c59f9 100644 --- a/sidekick-agent-api-tracepoint/pom.xml +++ b/sidekick-agent-api-tracepoint/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-bootstrap/pom.xml b/sidekick-agent-bootstrap/pom.xml index 8be6e17..32a896d 100644 --- a/sidekick-agent-bootstrap/pom.xml +++ b/sidekick-agent-bootstrap/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-broker/pom.xml b/sidekick-agent-broker/pom.xml index 1cc009f..1ca9d0a 100644 --- a/sidekick-agent-broker/pom.xml +++ b/sidekick-agent-broker/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-core/pom.xml b/sidekick-agent-core/pom.xml index d74d5fe..a6c9684 100644 --- a/sidekick-agent-core/pom.xml +++ b/sidekick-agent-core/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-data-redaction/pom.xml b/sidekick-agent-data-redaction/pom.xml index 604b518..58259b3 100644 --- a/sidekick-agent-data-redaction/pom.xml +++ b/sidekick-agent-data-redaction/pom.xml @@ -3,7 +3,7 @@ sidekick-agent-parent com.runsidekick.agent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT 4.0.0 diff --git a/sidekick-agent-instrument/pom.xml b/sidekick-agent-instrument/pom.xml index 7d3f805..ac076b8 100644 --- a/sidekick-agent-instrument/pom.xml +++ b/sidekick-agent-instrument/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-jdk-attach/pom.xml b/sidekick-agent-jdk-attach/pom.xml index 3259168..a2de5b4 100644 --- a/sidekick-agent-jdk-attach/pom.xml +++ b/sidekick-agent-jdk-attach/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-logpoint/pom.xml b/sidekick-agent-logpoint/pom.xml index 12f59d6..47567a2 100755 --- a/sidekick-agent-logpoint/pom.xml +++ b/sidekick-agent-logpoint/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-probe-tag/pom.xml b/sidekick-agent-probe-tag/pom.xml index b8c290c..c9f8184 100644 --- a/sidekick-agent-probe-tag/pom.xml +++ b/sidekick-agent-probe-tag/pom.xml @@ -3,7 +3,7 @@ sidekick-agent-parent com.runsidekick.agent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT 4.0.0 diff --git a/sidekick-agent-probe/pom.xml b/sidekick-agent-probe/pom.xml index aee3c84..108237d 100644 --- a/sidekick-agent-probe/pom.xml +++ b/sidekick-agent-probe/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent diff --git a/sidekick-agent-tracepoint/pom.xml b/sidekick-agent-tracepoint/pom.xml index 3a43951..ec7e46a 100644 --- a/sidekick-agent-tracepoint/pom.xml +++ b/sidekick-agent-tracepoint/pom.xml @@ -5,7 +5,7 @@ com.runsidekick.agent sidekick-agent-parent - 0.0.18-SNAPSHOT + 0.0.19-SNAPSHOT com.runsidekick.agent