Merge branch 'main' into refactor/StringFormatted

Signed-off-by: Tim te Beek <[email protected]>

Author: timtebeek

Jenkinsfile

@@ -1,5 +1,6 @@
 def p = [:]
 node {
+	label 'data-release'
 	checkout scm
 	p = readProperties interpolate: true, file: 'ci/release.properties'
 }
@@ -28,7 +29,7 @@ pipeline {
 
 			steps {
 				script {
-					def image = docker.build("springci/spring-data-release-tools:0.23", "ci")
+					def image = docker.build("springci/spring-data-release-tools:0.24", "ci")
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 						image.push()
 					}
@@ -59,14 +60,17 @@ pipeline {
 				MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase')
 				GIT_SIGNING_KEY = credentials('spring-gpg-github-private-key-jenkins')
 				GIT_SIGNING_KEY_PASSWORD = credentials('spring-gpg-github-passphrase-jenkins')
-				SONATYPE = credentials('oss-s01-token')
+				CENTRAL_TOKEN = credentials('central-token')
 			}
 
 			steps {
 				script {
-					docker.image("springci/spring-data-release-tools:0.23").inside() {
-						sh "ci/build-spring-data-release-cli.bash"
-						sh "ci/build-and-distribute.bash ${p['release.version']}"
+
+					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+						docker.image("springci/spring-data-release-tools:0.24").inside() {
+							sh "ci/build-spring-data-release-cli.bash"
+							sh "ci/build-and-distribute.bash ${p['release.version']}"
+						}
 					}
 				}
 			}

ci/build-and-distribute.bash

@@ -11,11 +11,13 @@ export PATH="$MAVEN_HOME/bin:$JAVA_HOME/bin:$PATH"
 
 export JENKINS_HOME=/tmp/jenkins-home
 export RELEASE_TOOLS_MAVEN_REPOSITORY=$(pwd)/maven-repository
+export WORK_DIR=$(pwd)/work
 export LOGS_DIR=$(pwd)/logs
 export SETTINGS_XML=$(pwd)/ci/settings.xml
 
 mkdir -p ${RELEASE_TOOLS_MAVEN_REPOSITORY}
 mkdir -p ${LOGS_DIR}
+mkdir -p ${WORK_DIR}
 
 export GNUPGHOME=~/.gnupg
 mkdir -p ${GNUPGHOME}

ci/java-tools.properties

@@ -1,4 +1,7 @@
 # Tool requirements
 # Version listed last will be used as default
+# JVM versions are candidates. Selection is made by the build system based on ci.properties of each project.
 jdks=8.0.382,24.0.1,17.0.15
-maven=3.9.9
+
+# Maven version is authoritative.
+maven=3.9.10

smoke-tests/pom.xml

@@ -18,7 +18,7 @@
 
 	<properties>
 		<spring-data-bom.version>2023.0.0-M1</spring-data-bom.version>
-		<stagingRepository>orgspringframework-2453</stagingRepository>
+		<stagingRepository>deploymentId</stagingRepository>
 		<mongodb.version>5.3.1</mongodb.version>
 	</properties>
 
@@ -73,9 +73,9 @@
 
 			<repositories>
 				<repository>
-					<id>s01.oss.sonatype.org</id>
+					<id>central-publisher-api</id>
 					<url>
-						https://s01.oss.sonatype.org/service/local/repositories/${stagingRepository}/content/
+						https://central.sonatype.com/api/v1/publisher/deployment/${deploymentId}/download/
 					</url>
 				</repository>
 			</repositories>

smoke-tests/settings.xml

@@ -29,6 +29,18 @@
 			<username>${env.COMMERCIAL_USR}</username>
 			<password>${env.COMMERCIAL_PSW}</password>
 		</server>
+
+		<server>
+			<id>central-publisher-api</id>
+			<configuration>
+				<httpHeaders>
+					<property>
+						<name>Authorization</name>
+						<value>Bearer ${CENTRAL_BEARER}</value>
+					</property>
+				</httpHeaders>
+			</configuration>
+		</server>
 	</servers>
 
 </settings>

src/main/java/org/springframework/data/release/CustomShellComponent.java

@@ -65,8 +65,8 @@ public Object execute(ParseResult parseResult) throws RuntimeException {
 			synchronized (mutex) {
 				Assert.isTrue(isReadyForCommands(), "SimpleExecutionStrategy not yet ready for commands");
 				Object target = parseResult.getInstance();
-				if (target instanceof ExecutionProcessor) {
-					ExecutionProcessor processor = ((ExecutionProcessor) target);
+				if (target instanceof ExecutionProcessor executionProcessor) {
+					ExecutionProcessor processor = executionProcessor;
 					parseResult = processor.beforeInvocation(parseResult);
 					try {
 						Object result = invoke(parseResult);
@@ -94,11 +94,11 @@ private Object invoke(ParseResult parseResult) {
 		}
 
 		private Object handleThrowable(Throwable th) {
-			if (th instanceof Error) {
-				throw ((Error) th);
+			if (th instanceof Error error) {
+				throw error;
 			}
-			if (th instanceof RuntimeException) {
-				throw ((RuntimeException) th);
+			if (th instanceof RuntimeException exception) {
+				throw exception;
 			}
 			throw new RuntimeException(th);
 		}

src/main/java/org/springframework/data/release/build/BuildCommands.java

@@ -80,7 +80,7 @@ public void build(@CliOption(key = "", mandatory = true) TrainIteration iteratio
 
 		project.ifPresent(it -> build.triggerBuild(iteration.getModule(it)));
 
-		if (!project.isPresent()) {
+		if (project.isEmpty()) {
 			build.build(iteration);
 		}
 	}

src/main/java/org/springframework/data/release/build/BuildConfiguration.java

@@ -21,6 +21,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.release.model.SupportedProject;
 import org.springframework.plugin.core.PluginRegistry;
+
 import org.xmlbeam.XBProjector;
 import org.xmlbeam.XBProjector.Flags;
 import org.xmlbeam.config.DefaultXMLFactoriesConfig;