From ca3bf4e18058acee8a51cf2ca6993695865908c6 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Fri, 20 Jun 2025 18:45:27 -0400
Subject: [PATCH] Fix maven central plugin

---
 .settings.xml                            |  5 -----
 settings.xml                             | 26 ------------------------
 spring-cloud-build-dependencies/pom.xml  | 13 ++++++------
 spring-cloud-dependencies-parent/pom.xml | 13 ++++++------
 4 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 settings.xml

diff --git a/.settings.xml b/.settings.xml
index 3e214f23..f6b8b3a8 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -22,11 +22,6 @@
 			<username>${env.CI_DEPLOY_USERNAME}</username>
 			<password>${env.CI_DEPLOY_PASSWORD}</password>
 		</server>
-		<server>
-			<id>central</id>
-			<username>${env.CENTRAL_USER}</username>
-			<password>${env.CENTRAL_PASSWORD}</password>
-		</server>
 	</servers>
 	<profiles>
 		<profile>
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index d980f520..00000000
--- a/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2013-2018 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<settings>
-	<servers>
-		<server>
-			<id>central</id>
-			<username>${env.CENTRAL_USER}</username>
-			<password>${env.CENTRAL_PASSWORD}</password>
-		</server>
-	</servers>
-</settings>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index 1182bddf..28e89499 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/spring-cloud-build-dependencies/pom.xml
@@ -21,6 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-boot.version>3.3.13</spring-boot.version>
 		<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+		<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
 	</properties>
 	<build>
 		<plugins>
@@ -96,12 +97,6 @@
 					<name>Sonatype Nexus Snapshots</name>
 					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
-				<repository>
-					<id>sonatype-nexus-staging</id>
-					<name>Nexus Release Repository</name>
-					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-					</url>
-				</repository>
 			</distributionManagement>
 			<build>
 				<plugins>
@@ -125,6 +120,12 @@
 							</gpgArguments>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>${central-publishing-maven-plugin.version}</version>
+						<extensions>true</extensions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml
index 16cfd7ed..0762d406 100644
--- a/spring-cloud-dependencies-parent/pom.xml
+++ b/spring-cloud-dependencies-parent/pom.xml
@@ -70,6 +70,7 @@
 	</developers>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
 	</properties>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
@@ -109,12 +110,6 @@
 					<name>Sonatype Nexus Snapshots</name>
 					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
-				<repository>
-					<id>sonatype-nexus-staging</id>
-					<name>Nexus Release Repository</name>
-					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-					</url>
-				</repository>
 			</distributionManagement>
 			<build>
 				<plugins>
@@ -171,6 +166,12 @@
 							</gpgArguments>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>${central-publishing-maven-plugin.version}</version>
+						<extensions>true</extensions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>