Merge branch '5.0.x'

Bump org.codehaus.mojo:exec-maven-plugin from 3.6.3 to 3.6.4

.github/dependabot.yml

@@ -38,3 +38,31 @@ updates:
     directory: /docs
     schedule:
       interval: weekly
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "5.0.x"
+    exclude-paths:
+      - ".github/workflows/release-train-test.yml"
+      - ".github/workflows/release-train-build.yml"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 5.0.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
+          - version-update:semver-minor
+  - package-ecosystem: npm
+    target-branch: 5.0.x
+    directory: /docs
+    schedule:
+      interval: weekly

.github/workflows/ci.yaml

@@ -1,21 +1,25 @@
 name: Spring Cloud Build CI Job
+
 on:
   workflow_call:
   push:
     branches:
-      - 5.0.x
+      - main
       - 4.3.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: '5.0.x'
+        default: 'main'
         type: string
+
 jobs:
   deploy:
     uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1

.github/workflows/deploy-docs.yml

@@ -5,6 +5,7 @@
 # there and re-run the rollout, otherwise your change will be overwritten.
 
 name: Deploy Docs
+
 on:
   push:
     # Allow-list of exactly this branch. A topic or Dependabot branch cut from
@@ -12,14 +13,16 @@ on:
     # those would dispatch a full docs build for a ref that is not in the
     # Antora playbook.
     branches:
-      - 5.0.x
+      - main
     tags: '**'
   repository_dispatch:
     types: request-build-reference # legacy
   workflow_dispatch:
+
 permissions:
-  contents: read # required to check out private commercial repositories
-  actions: write # required to dispatch the docs build
+  contents: read   # required to check out private commercial repositories
+  actions: write   # required to dispatch the docs build
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -29,6 +32,7 @@ jobs:
         with:
           ref: docs-build
           fetch-depth: 1
+
       # A branch push rebuilds just that branch's docs; a tag push rebuilds
       # everything so the new version appears in the version dropdown.
       - name: Dispatch (partial build)
@@ -36,6 +40,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
+
       - name: Dispatch (full build)
         if: github.ref_type == 'tag'
         env:

.github/workflows/pr.yml

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

docs/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>5.0.4-SNAPSHOT</version>
+		<version>5.1.0-SNAPSHOT</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>5.0.4-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -32,9 +32,9 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>4.0.9-SNAPSHOT</spring-boot.version>
-		<spring-cloud-build.version>5.0.4-SNAPSHOT</spring-cloud-build.version>
-		<kotlin.version>2.2.21</kotlin.version>
+		<spring-boot.version>4.2.0-SNAPSHOT</spring-boot.version>
+		<spring-cloud-build.version>5.1.0-SNAPSHOT</spring-cloud-build.version>
+		<kotlin.version>2.4.10</kotlin.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>

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>5.0.4-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>4.0.9-SNAPSHOT</version>
+		<version>4.2.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>4.0.9-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>4.2.0-SNAPSHOT</spring-boot.version>
 		<!-- Reproducible builds. This module does not inherit from spring-cloud-build,
 	 so the property has to be repeated here. Keep in sync with the parent pom. -->
 		<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>

spring-cloud-build-tools/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>5.0.4-SNAPSHOT</version>
+		<version>5.1.0-SNAPSHOT</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>5.0.4-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>