From 095fa0d72699b97c28a2245c1923da16f0411091 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Wed, 24 Feb 2021 10:29:56 -0600
Subject: [PATCH] Migrate to new Sonatype infrastructure.

Resolves #1180.
---
 Jenkinsfile | 7 ++++++-
 pom.xml     | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 61f9fb9a..1a56eb50 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -110,7 +110,7 @@ pipeline {
 
 			environment {
 				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-				SONATYPE = credentials('oss-token')
+				SONATYPE = credentials('oss-login')
 				KEYRING = credentials('spring-signing-secring.gpg')
 				PASSPHRASE = credentials('spring-gpg-passphrase')
 			}
@@ -134,6 +134,11 @@ pipeline {
 
 					if (RELEASE_TYPE == 'release') {
 						sh "PROFILE=distribute,central USERNAME=${SONATYPE_USR} PASSWORD=${SONATYPE_PSW} ci/build-and-deploy-to-maven-central.sh ${PROJECT_VERSION}"
+
+						slackSend(
+                                color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
+                                channel: '#spring-ws',
+                                message: "@here Spring WS ${PROJECT_VERSION} is staged on Sonatype awaiting closure and release.")
 					} else {
 						sh "PROFILE=distribute,${RELEASE_TYPE} ci/build-and-deploy-to-artifactory.sh"
 					}
diff --git a/pom.xml b/pom.xml
index af5772f8..1d832ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,10 +476,10 @@
 							<extensions>true</extensions>
 							<configuration>
 								<serverId>sonatype</serverId>
-								<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-								<autoReleaseAfterClose>true</autoReleaseAfterClose>
+								<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+								<autoReleaseAfterClose>false</autoReleaseAfterClose>
 								<keepStagingRepositoryOnFailure>true</keepStagingRepositoryOnFailure>
-								<skipStagingRepositoryClose>false</skipStagingRepositoryClose>
+								<skipStagingRepositoryClose>true</skipStagingRepositoryClose>
 							</configuration>
 						</plugin>
 					</plugins>
@@ -505,7 +505,7 @@
 			<distributionManagement>
 				<repository>
 					<id>sonatype</id>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+					<url>https://s01.oss.sonatype.org//service/local/staging/deploy/maven2/</url>
 				</repository>
 			</distributionManagement>