From dceba7f05e12a2b37f46f55e310f5bf8b56b37dc Mon Sep 17 00:00:00 2001
From: Min Jin <minkimzz@amazon.com>
Date: Thu, 23 Oct 2025 11:50:55 -0700
Subject: [PATCH 1/2] remove all release plugins other than
 maven-release-plugin

Signed-off-by: Min Jin <minkimzz@amazon.com>
---
 client-java-contrib/admissionreview/pom.xml   |  8 -----
 client-java-contrib/cert-manager/pom.xml      |  8 -----
 .../prometheus-operator/pom.xml               |  8 -----
 examples/examples-release-17/pom.xml          | 15 ----------
 examples/examples-release-18/pom.xml          | 15 ----------
 examples/examples-release-19/pom.xml          | 15 ----------
 examples/examples-release-20/pom.xml          | 15 ----------
 examples/examples-release-latest/pom.xml      | 20 -------------
 examples/pom.xml                              |  7 -----
 pom.xml                                       | 29 -------------------
 10 files changed, 140 deletions(-)

diff --git a/client-java-contrib/admissionreview/pom.xml b/client-java-contrib/admissionreview/pom.xml
index 9316e17b29..9d21ab2373 100644
--- a/client-java-contrib/admissionreview/pom.xml
+++ b/client-java-contrib/admissionreview/pom.xml
@@ -33,14 +33,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
diff --git a/client-java-contrib/cert-manager/pom.xml b/client-java-contrib/cert-manager/pom.xml
index 7e89dcd5de..23d0eb3363 100644
--- a/client-java-contrib/cert-manager/pom.xml
+++ b/client-java-contrib/cert-manager/pom.xml
@@ -21,14 +21,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
diff --git a/client-java-contrib/prometheus-operator/pom.xml b/client-java-contrib/prometheus-operator/pom.xml
index 5d9f384f43..c2c70ea788 100644
--- a/client-java-contrib/prometheus-operator/pom.xml
+++ b/client-java-contrib/prometheus-operator/pom.xml
@@ -20,14 +20,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
diff --git a/examples/examples-release-17/pom.xml b/examples/examples-release-17/pom.xml
index 47e293465d..b0b028b136 100644
--- a/examples/examples-release-17/pom.xml
+++ b/examples/examples-release-17/pom.xml
@@ -69,21 +69,6 @@
         		<artifactId>spotless-maven-plugin</artifactId>
         		<version>2.46.1</version>
         	</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<properties>
diff --git a/examples/examples-release-18/pom.xml b/examples/examples-release-18/pom.xml
index 44c76a7f75..bc0c20e56c 100644
--- a/examples/examples-release-18/pom.xml
+++ b/examples/examples-release-18/pom.xml
@@ -70,21 +70,6 @@
         		<artifactId>spotless-maven-plugin</artifactId>
         		<version>2.46.1</version>
         	</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
     <properties>
diff --git a/examples/examples-release-19/pom.xml b/examples/examples-release-19/pom.xml
index 65a70dbea7..8cecf57bd3 100644
--- a/examples/examples-release-19/pom.xml
+++ b/examples/examples-release-19/pom.xml
@@ -69,21 +69,6 @@
         		<artifactId>spotless-maven-plugin</artifactId>
         		<version>2.46.1</version>
         	</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
     <properties>
diff --git a/examples/examples-release-20/pom.xml b/examples/examples-release-20/pom.xml
index 2dbf5cbb1c..7f61c09484 100644
--- a/examples/examples-release-20/pom.xml
+++ b/examples/examples-release-20/pom.xml
@@ -75,21 +75,6 @@
         		<artifactId>spotless-maven-plugin</artifactId>
         		<version>2.46.1</version>
         	</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
     <properties>
diff --git a/examples/examples-release-latest/pom.xml b/examples/examples-release-latest/pom.xml
index 3c81b91b0a..3958f2648e 100644
--- a/examples/examples-release-latest/pom.xml
+++ b/examples/examples-release-latest/pom.xml
@@ -69,24 +69,4 @@
 
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/examples/pom.xml b/examples/pom.xml
index cb7b2cf019..eee39ae170 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -29,13 +29,6 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<extensions>true</extensions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pom.xml b/pom.xml
index 606340baf6..1a9d35fe61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -379,11 +379,6 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.14.1</version>
         </plugin>
-        <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>1.7.0</version>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
@@ -402,11 +397,6 @@
             <trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1226 workaround -->
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.4</version>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.gmavenplus</groupId>
           <artifactId>gmavenplus-plugin</artifactId>
@@ -454,25 +444,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.central</groupId>
-        <artifactId>central-publishing-maven-plugin</artifactId>
-        <version>0.9.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <publishingServerId>ossrh</publishingServerId>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://ossrh-staging-api.central.sonatype.com/</nexusUrl>
-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>

From 6a3018189784bee9312921bab3677fb293614185 Mon Sep 17 00:00:00 2001
From: Min Jin <minkimzz@amazon.com>
Date: Wed, 8 Oct 2025 09:29:14 -0700
Subject: [PATCH 2/2] explicit maven release plugin name

Signed-off-by: Min Jin <minkimzz@amazon.com>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c444c22c34..2511447b74 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,7 @@ jobs:
         run: |
           git checkout -b 'automated-release-${{ github.event.inputs.releaseVersion }}'
           ./mvnw --batch-mode \
-            release:prepare \
+            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 }} \
@@ -78,7 +78,7 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}
         run: |
           # The tests are already executed in the prepare, skipping
-          ./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests release:perform
+          ./mvnw -s /home/runner/.m2/settings.xml -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 }}