Update SNAPSHOT to 5.0.0-M4

* Configures maven-compiler-plugin for jspecify

Fixes gh-561

* Adds exports/open to jvm.config

Fixes gh-561

* Moves jspecify behind profile

Activate with java25 and jspecify.enabled=true

See gh-561

* Updates ant to ignore securitymanager exceptions

See gh-561

* Adds JSpecifyMode=true

Fixes some javadoc warnings

See gh-561

.github/dependabot.yml

@@ -13,12 +13,12 @@ updates:
       interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "4.2.x"
+    target-branch: "4.3.x"
     schedule:
       interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "4.1.x"
+    target-branch: "4.2.x"
     schedule:
       interval: "weekly"
   - package-ecosystem: maven
@@ -39,12 +39,13 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: 4.1.x
+    target-branch: 4.3.x
     ignore:
       # IDE specific dependency
       - dependency-name: "org.eclipse.m2e:lifecycle-mapping"
       # JRuby updates are causing docs generation to fail
       - dependency-name: "org.jruby:jruby-complete"  
+      # only upgrade by minor or patch
       - dependency-name: "*"
         update-types:
           - version-update:semver-major
@@ -58,7 +59,7 @@ updates:
       # IDE specific dependency
       - dependency-name: "org.eclipse.m2e:lifecycle-mapping"
       # JRuby updates are causing docs generation to fail
-      - dependency-name: "org.jruby:jruby-complete"  
+      - dependency-name: "org.jruby:jruby-complete"
       # only upgrade by minor or patch
       - dependency-name: "*"
         update-types:
@@ -75,12 +76,12 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 4.2.x
+    target-branch: 4.3.x
     directory: /docs
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 4.1.x
+    target-branch: 4.2.x
     directory: /docs
     schedule:
       interval: weekly

.github/workflows/maven.yml

@@ -7,7 +7,7 @@ on:
   push:
     branches: [ main, 4.3.x, 4.2.x]
   pull_request:
-    branches: [ main, 4.3.x, 4.2.x ]
+    branches: [ main, 4.3.x, 4.2.x]
 
 jobs:
   build:

.mvn/jvm.config

@@ -1 +1,11 @@
--Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
+-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

docs/modules/ROOT/partials/building.adoc

@@ -26,7 +26,7 @@ build succeed, please raise a ticket to get the settings added to
 source control.
 
 The projects that require middleware (i.e. Redis) for testing generally
-require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+require that a local instance of https://www.docker.com/get-started[Docker] is installed and running.
 
 [[documentation]]
 == Documentation
@@ -45,7 +45,7 @@ a modified file in the correct place. Just commit it and push the change.
 [[working-with-the-code]]
 == Working with the code
 If you don't have an IDE preference we would recommend that you use
-https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://spring.io/tools[Spring Tools Suite] or
 https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.

docs/modules/ROOT/partials/contributing.adoc

@@ -109,7 +109,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
@@ -123,10 +123,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

docs/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "antora": "3.2.0-alpha.9",
-    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "antora": "3.2.0-alpha.10",
+    "@antora/atlas-extension": "1.0.0-alpha.5",
     "@antora/collector-extension": "1.0.2",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/antora-extensions": "1.14.7",

docs/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-M4</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-M4</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.5.6-SNAPSHOT</spring-boot.version>
-		<spring-cloud-build.version>4.3.1-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>4.0.0-M3</spring-boot.version>
+		<spring-cloud-build.version>5.0.0-M4</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>
@@ -41,6 +41,8 @@
 		<revision>${project.version}</revision>
 		<asciidoctorj.version>2.5.13</asciidoctorj.version>
 		<jruby-complete.version>9.4.9.0</jruby-complete.version>
+		<error-prone.version>2.42.0</error-prone.version>
+		<nullaway.version>0.12.10</nullaway.version>
 
 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -50,31 +52,31 @@
 		<sonar.language>java</sonar.language>
 
 		<!-- Plugins -->
-		<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- 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.47</spring-javaformat.version>
-		<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version>
+		<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
+		<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
 		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
 		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
 		<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
 		<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-		<exec-maven-plugin.version>3.5.1</exec-maven-plugin.version>
+		<exec-maven-plugin.version>3.6.1</exec-maven-plugin.version>
 		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
 		<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-shade-plugin.version>3.6.1</maven-shade-plugin.version>
+		<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
 		<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
-		<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
+		<maven-dependency-plugin.version>3.9.0</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.5.0</license-maven-plugin.version>
+		<license-maven-plugin.version>2.7.0</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.47</spring-javaformat-checkstyle.version>
 		<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
 		<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
@@ -99,7 +101,7 @@
 		<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
 		<disable.nohttp.checks>true</disable.nohttp.checks>
 		<antelopetasks.version>3.2.10</antelopetasks.version>
-		<ant-nodeps.version>1.8.1</ant-nodeps.version>
+		<ant.version>1.10.15</ant.version>
 		<configprops.path>${project.basedir}/modules/ROOT/partials/_configprops.adoc</configprops.path>
 		<configprops.inclusionPattern>.*</configprops.inclusionPattern>
 		<maven-dependency-plugin-for-docs.phase>generate-resources</maven-dependency-plugin-for-docs.phase>
@@ -143,7 +145,7 @@
 		<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>
+		<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -742,7 +744,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.6.0</version>
 			</plugin>
 		</plugins>
 	</reporting>
@@ -822,16 +824,6 @@
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
-		<profile>
-			<id>milestone</id>
-			<distributionManagement>
-				<repository>
-					<id>repo.spring.io</id>
-					<name>Spring Milestone Repository</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<build>
@@ -861,6 +853,7 @@
 						<artifactId>central-publishing-maven-plugin</artifactId>
 						<configuration>
 							<publishingServerId>central</publishingServerId>
+							<deploymentName>${project.artifactId}-${project.version}</deploymentName>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -926,36 +919,76 @@
 			</build>
 		</profile>
 		<profile>
-			<id>java8</id>
+			<id>java17</id>
 			<activation>
-				<jdk>[1.8,)</jdk>
+				<jdk>[17,)</jdk>
 			</activation>
 			<build>
 				<plugins>
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<configuration>
-							<additionalparam>-Xdoclint:none</additionalparam>
+							<doclint>none</doclint>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 		<profile>
-			<id>java11</id>
+			<id>jspecify</id>
 			<activation>
-				<jdk>[1.11,)</jdk>
+				<jdk>[25,)</jdk>
+				<property>
+					<name>jspecify.enabled</name>
+					<value>true</value>
+				</property>
 			</activation>
 			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<configuration>
-							<!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8212233 -->
-							<source>8</source>
-						</configuration>
-					</plugin>
-				</plugins>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-compiler-plugin</artifactId>
+							<version>${maven-compiler-plugin.version}</version>
+							<configuration>
+								<source>${maven.compiler.source}</source>
+								<target>${maven.compiler.target}</target>
+								<release>${java.version}</release>
+								<compilerArgs>
+									<compilerArg>-parameters</compilerArg>
+									<!-- https://errorprone.info/docs/installation#maven -->
+									<compilerArg>-XDcompilePolicy=simple</compilerArg>
+									<compilerArg>--should-stop=ifError=FLOW</compilerArg>
+									<compilerArg>
+										-Xplugin:ErrorProne
+										<!-- JSpecify mode https://github.com/uber/NullAway/wiki/JSpecify-Support -->
+										-XepOpt:NullAway:JSpecifyMode=true
+										<!-- Check JSpecify annotations -->
+										-Xep:NullAway:ERROR
+										-XepOpt:NullAway:OnlyNullMarked
+										<!-- FIXME Remove once https://github.com/uber/NullAway/pull/1295 is released -->
+										-XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract
+										-XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
+										<!-- https://github.com/uber/NullAway/issues/162 -->
+										-XepExcludedPaths:.*/src/test/java/.*
+									</compilerArg>
+								</compilerArgs>
+								<annotationProcessorPaths>
+									<path>
+										<groupId>com.google.errorprone</groupId>
+										<artifactId>error_prone_core</artifactId>
+										<version>${error-prone.version}</version>
+									</path>
+									<path>
+										<groupId>com.uber.nullaway</groupId>
+										<artifactId>nullaway</artifactId>
+										<version>${nullaway.version}</version>
+									</path>
+								</annotationProcessorPaths>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
 			</build>
 		</profile>
 		<profile>
@@ -1157,8 +1190,8 @@
 								</dependency>
 								<dependency>
 									<groupId>org.apache.ant</groupId>
-									<artifactId>ant-nodeps</artifactId>
-									<version>${ant-nodeps.version}</version>
+									<artifactId>ant</artifactId>
+									<version>${ant.version}</version>
 								</dependency>
 								<dependency>
 									<groupId>org.tigris.antelope</groupId>
@@ -1310,7 +1343,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.13</version>
+						<version>0.8.14</version>
 						<configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
 							<append>true</append>

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.3.1-SNAPSHOT</version>
+	<version>5.0.0-M4</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>3.5.6-SNAPSHOT</version>
+		<version>4.0.0-M3</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.5.6-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>4.0.0-M3</spring-boot.version>
 		<okhttp.version>4.12.0</okhttp.version>
 		<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
-		<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
+		<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -92,16 +92,6 @@
 		</snapshotRepository>
 	</distributionManagement>
 	<profiles>
-		<profile>
-			<id>milestone</id>
-			<distributionManagement>
-				<repository>
-					<id>repo.spring.io</id>
-					<name>Spring Milestone Repository</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<distributionManagement>

spring-cloud-build-tools/pom.xml

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

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.3.1-SNAPSHOT</version>
+	<version>5.0.0-M4</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -70,7 +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>
+		<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
 	</properties>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
@@ -92,16 +92,6 @@
 		</snapshotRepository>
 	</distributionManagement>
 	<profiles>
-		<profile>
-			<id>milestone</id>
-			<distributionManagement>
-				<repository>
-					<id>repo.spring.io</id>
-					<name>Spring Milestone Repository</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<distributionManagement>