Update SNAPSHOT to 4.1.6

This reverts commit e7363a48a0.

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main, 3.1.x ]
+    branches: [ main, 4.1.x, 3.1.x ]
   pull_request:
-    branches: [ main, 3.1.x ]
+    branches: [ main, 4.1.x, 3.1.x ]
 
 jobs:
   build:
@@ -29,4 +29,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Build with Maven
-        run: ./mvnw clean install -B -U -Pspring
+        run: ./mvnw clean install -Pdocs -B -U -Pspring

README.adoc

@@ -148,7 +148,7 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju
 
 If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
 
-.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+.projectRoot/src/checkstyle/checkstyle-suppressions.xml
 ----
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
@@ -162,10 +162,11 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
 
 It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
 
-```bash
+[source,bash]
+----
 $ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig
 $ touch .springformat
-```
+----
 
 [[ide-setup]]
 == IDE setup
@@ -229,7 +230,7 @@ Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, th
 [[duplicate-finder-configuration]]
 === Duplicate Finder configuration
 
-Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
+Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`.
 
 .pom.xml
 [source,xml]

docs/package.json

@@ -4,7 +4,7 @@
     "@antora/atlas-extension": "1.0.0-alpha.2",
     "@antora/collector-extension": "1.0.1",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/antora-extensions": "1.14.2",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.14"
+    "@springio/antora-extensions": "1.14.4",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
   }
 }

docs/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.6-SNAPSHOT</version>
+		<version>4.1.6</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.3.4</version>
+			<version>1.3.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.1.6-SNAPSHOT</version>
+	<version>4.1.6</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>3.2.12</spring-boot.version>
-		<spring-cloud-build.version>4.1.6-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>3.3.13</spring-boot.version>
+		<spring-cloud-build.version>4.1.6</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
@@ -40,7 +40,7 @@
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
 		<asciidoctorj.version>2.5.13</asciidoctorj.version>
-		<jruby-complete.version>9.4.8.0</jruby-complete.version>
+		<jruby-complete.version>9.4.9.0</jruby-complete.version>
 
 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -55,7 +55,7 @@
 		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
 		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
 		<puppycrawl-tools-checkstyle.version>9.3</puppycrawl-tools-checkstyle.version>
-		<spring-javaformat.version>0.0.43</spring-javaformat.version>
+		<spring-javaformat.version>0.0.46</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
 		<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -69,13 +69,13 @@
 		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
 		<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
 		<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
-		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+		<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
 		<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
 		<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
 		<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
 		<artifactory-maven-plugin.version>3.2.3</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
-		<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
+		<spring-javaformat-checkstyle.version>0.0.46</spring-javaformat-checkstyle.version>
 		<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
 		<pitest-maven.version>1.16.3</pitest-maven.version>
 		<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
@@ -139,11 +139,12 @@
 		<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
 		<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
 		<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
-		<org-antora-maven-plugin.version>1.0.0-alpha.4</org-antora-maven-plugin.version>
+		<org-antora-maven-plugin.version>1.0.0-alpha.5</org-antora-maven-plugin.version>
 		<node.version>v16.20.2</node.version>
 		<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
 		<generate-readme.phase>prepare-package</generate-readme.phase>
 		<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
+		<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -700,7 +701,12 @@
 					<includePomProjects>${duplicate-finder-maven-plugin.includePomProjects}</includePomProjects>
 					</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>
 		</pluginManagement>
 	</build>
@@ -749,11 +755,6 @@
 				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
 			</url>
 		</site>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Nexus Release Repository</name>
-			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
 		<snapshotRepository>
 			<id>repo.spring.io</id>
 			<name>Spring Snapshot Repository</name>
@@ -849,6 +850,19 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<configuration>
+							<publishingServerId>central</publishingServerId>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
@@ -1297,7 +1311,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.12</version>
+						<version>0.8.13</version>
 						<configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
 							<append>true</append>

scripts/build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-./mvnw clean install -B -Pdocs ${@}
+./mvnw clean install -s .settings.xml -B -Pdocs ${@}
 #./mvnw clean install -B -DskipTests ${@}

spring-cloud-build-dependencies/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.1.6-SNAPSHOT</version>
+	<version>4.1.6</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,13 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>3.2.12</version>
+		<version>3.3.13</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.2.12</spring-boot.version>
-		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+		<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>
@@ -118,6 +113,18 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</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>

spring-cloud-build-tools/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.6-SNAPSHOT</version>
+		<version>4.1.6</version>
 	</parent>
 	<dependencies>
 		<dependency>

spring-cloud-build-tools/src/main/resources/checkstyle.xml

@@ -167,7 +167,7 @@
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="maximum" value="0"/>
 			<property name="format"
-					  value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert"/>
+					  value="org\.junit\.(Assert|jupiter\.api\.Assertions)"/>
 			<property name="message"
 					  value="Please use AssertJ imports."/>
 			<property name="ignoreComments" value="true"/>

spring-cloud-dependencies-parent/pom.xml

@@ -4,7 +4,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>4.1.6-SNAPSHOT</version>
+	<version>4.1.6</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -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>
@@ -154,7 +149,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>3.2.7</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -164,6 +159,18 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</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>