From d199d43e54980de3d01825707225efd4a654bc18 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <r.zwitserloot@projectlombok.org>
Date: Fri, 23 May 2025 00:53:48 +0200
Subject: [PATCH] [build] Deal with the migration from mavencentral OSSRH to
 Central. (untested; we'll need to wait for a release to test this!)

---
 buildScripts/maven.ant.xml | 16 ++++++++--------
 buildScripts/setup.ant.xml |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml
index 52b395c0..e257304c 100644
--- a/buildScripts/maven.ant.xml
+++ b/buildScripts/maven.ant.xml
@@ -67,9 +67,9 @@ This buildfile is part of projectlombok.org. It makes maven-compatible repositor
 		<maven.make version-name="${lombok.version}" />
 	</target>
 	
-	<target name="maven.publish" depends="maven, -setup.ossrh">
+	<target name="maven.publish" depends="maven, -setup.mavenCentral">
 		<fail>
-			Your lombok clone does not include the OSSRH deployment keys. Contact the core maintainers for these keys;
+			Your lombok clone does not include the central.sonatype.org deployment keys. Contact the core maintainers for these keys;
 			place them in ${gpg.keyrings} to continue.
 			
 			<condition>
@@ -77,8 +77,8 @@ This buildfile is part of projectlombok.org. It makes maven-compatible repositor
 			</condition>
 		</fail>
 		
-		<fail unless="ossrh.password">
-			Your lombok clone does not include the OSSRH (sonatype maven central) password, needed to upload and deploy to maven central. Contact the core maintainers.
+		<fail unless="mavencentral.authToken">
+			Your lombok clone does not include an central.sonatype.org authToken, needed to upload and deploy to maven central. Contact the core maintainers.
 		</fail>
 		
 		<delete quiet="true" dir="build/maven-publish" />
@@ -113,13 +113,13 @@ This buildfile is part of projectlombok.org. It makes maven-compatible repositor
 		</jar>
 		
 		<exec executable="${exe.curl}" failifexecutionfails="false" resultproperty="curl.result">
-			<arg value="-u" />
-			<arg value="${ossrh.username}:${ossrh.password}" />
+			<arg value="--header" />
+			<arg value="Authorization: Bearer ${mavencentral.authToken}" />
 			<arg value="-F" />
 			<arg value="file=@build/maven-publish/lombok-bundle.jar;type=application/java-archive" />
-			<arg value="https://oss.sonatype.org/service/local/staging/bundle_upload" />
+			<arg value="https://central.sonatype.org/api/v1/publisher/upload" />
 		</exec>
-		<echo>The artifact has been published to staging. Now go to https://oss.sonatype.org/ and log in as Reinier, then doublecheck if all is well and 'release' it.</echo>
+		<echo>The artifact has been published to staging. Now go to https://central.sonatype.org/, log in, then doublecheck if all is well and 'release' it.</echo>
 	</target>
 	
 	<target name="maven.edge" depends="version, dist, javadoc.build" description="Create a maven repo for the current snapshot into a build dir. The intent is for you to put that on a server someplace. Will invoke your local mvn installation.">
diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml
index 7c7667bc..639c7203 100644
--- a/buildScripts/setup.ant.xml
+++ b/buildScripts/setup.ant.xml
@@ -248,13 +248,12 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		<ivy:cachepath pathid="cp.test" conf="test" />
 	</target>
 	
-	<target name="-setup.ossrh">
-		<loadfile quiet="true" failonerror="false" encoding="UTF-8" property="ossrh.password" srcfile="${gpg.keyrings}/ossrh.password">
+	<target name="-setup.mavenCentral">
+		<loadfile quiet="true" failonerror="false" encoding="UTF-8" property="mavencentral.authToken" srcfile="${gpg.keyrings}/mavenCentral.authToken">
 			<filterchain>
 				<striplinebreaks />
 			</filterchain>
 		</loadfile>
-		<property name="ossrh.username" value="rzwitserloot" />
 	</target>
 	
 	<target name="test.release.version" depends="-test.release.version" />