diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bc6a1124f..6b118cbe40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,8 +60,8 @@ jobs: - name: Release Prepare run: | git checkout -b 'automated-release-${{ github.event.inputs.releaseVersion }}' - mvn --batch-mode \ - release:prepare \ + ./mvnw --batch-mode \ + org.apache.maven.plugins:maven-release-plugin:prepare \ -Dtag=v${{ github.event.inputs.releaseVersion }} \ -DconnectionUrl=https://${{ github.token }}@github.com/${{ github.repository }}.git \ -DreleaseVersion=${{ github.event.inputs.releaseVersion }} \ @@ -76,7 +76,7 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }} run: | # The tests are already executed in the prepare, skipping - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests release:perform + ./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests org.apache.maven.plugins:maven-release-plugin:perform git push https://${{ github.token }}@github.com/${{ github.repository }}.git \ automated-release-${{ github.event.inputs.releaseVersion }}:automated-release-${{ github.event.inputs.releaseVersion }} git push https://${{ github.token }}@github.com/${{ github.repository }}.git v${{ github.event.inputs.releaseVersion }} diff --git a/client-java-contrib/admissionreview/pom.xml b/client-java-contrib/admissionreview/pom.xml index da09c7c5b1..d50afd74e5 100644 --- a/client-java-contrib/admissionreview/pom.xml +++ b/client-java-contrib/admissionreview/pom.xml @@ -34,14 +34,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - true - - com.diffplug.spotless spotless-maven-plugin diff --git a/client-java-contrib/cert-manager/pom.xml b/client-java-contrib/cert-manager/pom.xml index de20af640d..221801b06d 100644 --- a/client-java-contrib/cert-manager/pom.xml +++ b/client-java-contrib/cert-manager/pom.xml @@ -22,11 +22,10 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - true + com.diffplug.spotless + spotless-maven-plugin - true + true diff --git a/client-java-contrib/prometheus-operator/pom.xml b/client-java-contrib/prometheus-operator/pom.xml index 1fb0fd5f58..b30b538375 100644 --- a/client-java-contrib/prometheus-operator/pom.xml +++ b/client-java-contrib/prometheus-operator/pom.xml @@ -21,11 +21,10 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - true + com.diffplug.spotless + spotless-maven-plugin - true + true diff --git a/examples/examples-release-19/pom.xml b/examples/examples-release-19/pom.xml index 1e015e666f..26665d69ca 100644 --- a/examples/examples-release-19/pom.xml +++ b/examples/examples-release-19/pom.xml @@ -98,25 +98,4 @@ - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.4 - - true - - - - - - \ No newline at end of file + diff --git a/examples/pom.xml b/examples/pom.xml index ecca481a65..18d70e1a26 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -30,13 +30,6 @@ maven-bundle-plugin true - - org.apache.maven.plugins - maven-deploy-plugin - - true - - diff --git a/pom.xml b/pom.xml index a84e92f88a..b513b992f1 100644 --- a/pom.xml +++ b/pom.xml @@ -398,11 +398,6 @@ maven-compiler-plugin 3.14.1 - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - org.codehaus.mojo build-helper-maven-plugin @@ -421,11 +416,6 @@ false - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.4 - org.codehaus.gmavenplus gmavenplus-plugin @@ -473,25 +463,6 @@ true - - org.sonatype.central - central-publishing-maven-plugin - 0.9.0 - true - - ossrh - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://ossrh-staging-api.central.sonatype.com/ - true - - com.diffplug.spotless spotless-maven-plugin