Update SNAPSHOT to 5.0.0-M2

Bump actions/setup-java from 4 to 5

.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/ci.yaml

@@ -1,34 +0,0 @@
-name: Spring Cloud Build CI Job
-
-on:
-  push:
-    branches:
-      - main
-      - 4.3.x
-      - 4.2.x
-
-  # Scheduled builds run daily at midnight UTC
-  schedule:
-    - cron: '0 0 * * *'
-
-  # Manual trigger with optional branch override
-  workflow_dispatch:
-    inputs:
-      branches:
-        description: "Which branch should be built (can be a comma-separated list of branches)"
-        required: true
-        default: '4.3.x'
-        type: string
-
-jobs:
-  deploy:
-    uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@main
-    with:
-      branches: ${{ inputs.branches }}
-    secrets:
-      ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-      ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-      COMMERCIAL_ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
-      COMMERCIAL_ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/deploy-docs.yml

@@ -17,7 +17,7 @@ jobs:
     # if: github.repository_owner == 'spring-projects'
     steps:
       - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           ref: docs-build
           fetch-depth: 1

.github/workflows/maven.yml

@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ main, 4.3.x, 4.2.x]
+  pull_request:
+    branches: [ main, 4.3.x, 4.2.x]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw clean install -Pdocs -B -U -Pspring

.github/workflows/pr.yml

@@ -1,9 +0,0 @@
-name: PR
-
-on:
-  pull_request:
-    branches: [ 4.3.x ]
-
-jobs:
-  build:
-    uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@main

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
@@ -42,17 +42,10 @@ parsing or rendering it, just copying it to `${main.basedir}`
 any changes in the README it will then show up after a Maven build as
 a modified file in the correct place. Just commit it and push the change.
 
-You can generate the docs site using the following command:
-
-[indent=0]
-----
-	./mvnw -pl docs -P docs antora:antora
-----
-
 [[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,10 +1,10 @@
 {
   "dependencies": {
-    "antora": "3.2.0-alpha.12",
-    "@antora/atlas-extension": "1.0.0-alpha.5",
-    "@antora/collector-extension": "1.0.3",
+    "antora": "3.2.0-alpha.9",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.2",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/antora-extensions": "1.14.12",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.18"
+    "@springio/antora-extensions": "1.14.7",
+    "@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.3.5-SNAPSHOT</version>
+		<version>5.0.0-M2</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.5-SNAPSHOT</version>
+	<version>5.0.0-M2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,9 +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.15</spring-boot.version>
-		<spring-cloud-build.version>4.3.5-SNAPSHOT</spring-cloud-build.version>
-		<kotlin.version>1.9.25</kotlin.version>
+		<spring-boot.version>4.0.0-M2</spring-boot.version>
+		<spring-cloud-build.version>5.0.0-M2</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>
@@ -51,31 +50,31 @@
 		<sonar.language>java</sonar.language>
 
 		<!-- Plugins -->
-		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.14.0</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.4</maven-failsafe-plugin.version>
+		<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
 		<maven-javadoc-plugin.version>3.11.3</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.4</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.5.3</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>
 		<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.1</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.0</maven-shade-plugin.version>
+		<maven-enforcer-plugin.version>3.6.1</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>
 		<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.6.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>
@@ -140,12 +139,11 @@
 		<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.5</org-antora-maven-plugin.version>
-		<node.version>v22.22.0</node.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>
-		<node-download-url>https://nodejs.org/dist</node-download-url>
+		<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -299,46 +297,6 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<!-- Based on instructions here - https://kotlinlang.org/docs/reference/using-maven.html -->
-					<groupId>org.jetbrains.kotlin</groupId>
-					<artifactId>kotlin-maven-plugin</artifactId>
-					<version>${kotlin.version}</version>
-					<configuration>
-						<!-- https://github.com/spring-projects/spring-framework/blob/6.2.x/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java#L38-L39 -->
-						<apiVersion>1.7</apiVersion>
-						<languageVersion>1.7</languageVersion>
-						<jvmTarget>17</jvmTarget>
-						<javaParameters>true</javaParameters>
-						<args>-Xjsr305=strict -opt-in=kotlin.RequiresOptIn</args>
-					</configuration>
-					<executions>
-						<execution>
-							<id>compile</id>
-							<goals>
-								<goal>compile</goal>
-							</goals>
-							<configuration>
-								<sourceDirs>
-									<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-									<sourceDir>${project.basedir}/src/main/java</sourceDir>
-								</sourceDirs>
-							</configuration>
-						</execution>
-						<execution>
-							<id>test-compile</id>
-							<goals>
-								<goal>test-compile</goal>
-							</goals>
-							<configuration>
-								<sourceDirs>
-									<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-									<sourceDir>${project.basedir}/src/test/java</sourceDir>
-								</sourceDirs>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>flatten-maven-plugin</artifactId>
@@ -784,7 +742,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>
@@ -864,16 +822,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>
@@ -1130,12 +1078,6 @@
 							<configuration>
 								<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
 								<nodeVersion>${node.version}</nodeVersion>
-								<!-- The default value for node-download-url is set in the properties of this POM -->
-								<!-- This can be overriden in the Maven settings.xml or via the command line -->
-								<!-- On Jenkins we override this property in Maven settings.xml to point to USW1 to download Node -->
-								<!-- When pointing to USW1 we use the serverId spring-commercial-release in settings.xml to authenticate with USW1 -->
-								<nodeDownloadUrl>${node-download-url}</nodeDownloadUrl>
-								<nodeDownloadServerId>spring-commercial-release</nodeDownloadServerId>
 								<options>
 									<option>--to-dir=target/antora/site</option>
 									<option>--stacktrace</option>
@@ -1358,7 +1300,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.14</version>
+						<version>0.8.13</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.5-SNAPSHOT</version>
+	<version>5.0.0-M2</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.15</version>
+		<version>4.0.0-M2</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.5.15</spring-boot.version>
+		<spring-boot.version>4.0.0-M2</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.8.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.5-SNAPSHOT</version>
+		<version>5.0.0-M2</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.5-SNAPSHOT</version>
+	<version>5.0.0-M2</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.8.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>