From 399d0fd21671ed7e66bd5ce74ca309ab1393faae Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Thu, 6 Nov 2025 07:53:02 +0100
Subject: [PATCH 1/2] Adjust publication to Maven repository to use
 central-publishing-maven-plugin (#1513)

* Release attempt

* ..

* credentials

* ..

* ..

* ..

* ..

* ..

* ..

* ..

* disable deploy

* polish

* cleanup 1

* cleanup 2

* bring back original release.yml
---
 .github/workflows/release.yml         |  9 +++++----
 .settings.xml                         |  6 +++---
 pom.xml                               | 22 ++++++++++++++--------
 spring-cloud-aws-dependencies/pom.xml | 16 +++++++++-------
 spring-cloud-aws-samples/pom.xml      |  8 ++++++++
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b190fb96c..c3c215598 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,9 +33,9 @@ jobs:
           distribution: temurin
           java-version: ${{ matrix.version }}
           cache: maven
-          server-id: ossrh-awspring
-          server-username: OSSRH_USERNAME
-          server-password: OSSRH_PASSWORD
+          server-id: central
+          server-username: CENTRAL_TOKEN_USERNAME
+          server-password: CENTRAL_TOKEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Run tests
@@ -43,7 +43,8 @@ jobs:
       - name: Deploy to Sonatype
         run: ./mvnw -V -Prelease,spring deploy -DskipTests
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       - name: Upload to S3
diff --git a/.settings.xml b/.settings.xml
index a729ede1b..2aede4925 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -2,9 +2,9 @@
 <settings>
 	<servers>
 		<server>
-			<id>repo.spring.io</id>
-			<username>${env.CI_DEPLOY_USERNAME}</username>
-			<password>${env.CI_DEPLOY_PASSWORD}</password>
+			<id>central</id>
+			<username>${env.CENTRAL_TOKEN_USERNAME}</username>
+			<password>${env.CENTRAL_TOKEN_PASSWORD}</password>
 		</server>
 	</servers>
 	<profiles>
diff --git a/pom.xml b/pom.xml
index 19932388b..16a2bff87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,15 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.sonatype.central</groupId>
+					<artifactId>central-publishing-maven-plugin</artifactId>
+					<version>0.9.0</version>
+					<extensions>true</extensions>
+					<configuration>
+						<publishingServerId>central</publishingServerId>
+					</configuration>
+				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
@@ -122,7 +131,7 @@
 					<version>${spotless.version}</version>
 					<configuration>
 						<java>
-							<importOrder />
+							<importOrder/>
 							<eclipse>
 								<file>${maven.multiModuleProjectDirectory}/eclipse-code-formatter.xml</file>
 							</eclipse>
@@ -169,6 +178,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -316,13 +329,6 @@
 		</profile>
 	</profiles>
 
-	<distributionManagement>
-		<repository>
-			<id>ossrh-awspring</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-
 	<licenses>
 		<license>
 			<name>Apache License, Version 2.0</name>
diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml
index f2b8355a6..87d82548f 100644
--- a/spring-cloud-aws-dependencies/pom.xml
+++ b/spring-cloud-aws-dependencies/pom.xml
@@ -353,6 +353,15 @@
 			<id>release</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>0.9.0</version>
+						<extensions>true</extensions>
+						<configuration>
+							<publishingServerId>central</publishingServerId>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
@@ -378,11 +387,4 @@
 			</build>
 		</profile>
 	</profiles>
-
-	<distributionManagement>
-		<repository>
-			<id>ossrh-awspring</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
 </project>
diff --git a/spring-cloud-aws-samples/pom.xml b/spring-cloud-aws-samples/pom.xml
index 0a791fecc..8ba5d14a8 100644
--- a/spring-cloud-aws-samples/pom.xml
+++ b/spring-cloud-aws-samples/pom.xml
@@ -49,6 +49,14 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<skipPublishing>true</skipPublishing>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>

From d5db4749c8a0863a064a589b099f8893338e51ed Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Mon, 10 Nov 2025 23:32:57 +0100
Subject: [PATCH 2/2] release branch for testing purposes

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c3c215598..24ab0aced 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,6 +2,7 @@ name: Release
 
 on:
   push:
+    branches: [ maven-central-publishing ]
     tags:
       - v2.3.*
       - v2.4.*