Update SNAPSHOT to 4.3.0-M2

Merge pull request #419 from spring-cloud/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.14.0
Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0
2026-09-17 21:09:00 +00:00 · 2025-02-27 14:55:05 +00:00 · 2025-02-21 08:57:01 -05:00 · 2025-02-21 08:56:08 -05:00 · 2025-02-21 09:43:58 +00:00 · 2025-02-21 09:35:46 +00:00
8 changed files with 51 additions and 17 deletions
@@ -4,12 +4,30 @@
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

 version: 2
+
 updates:
  - package-ecosystem: "github-actions"
    directory: "/"
    target-branch: "main"
    schedule:
      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "4.2.x"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "4.1.x"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    ignore:
+      # JRuby updates are causing docs generation to fail
+      - dependency-name: "org.jruby:jruby-complete"    
  - package-ecosystem: maven
    directory: /
    schedule:
@@ -31,6 +49,17 @@ updates:
        update-types:
          - version-update:semver-major
          - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 4.2.x
+    ignore:
+      # only upgrade by minor or patch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
  - package-ecosystem: npm
    target-branch: docs-build
    directory: /
@@ -41,6 +70,11 @@ updates:
    directory: /docs
    schedule:
      interval: weekly
+  - package-ecosystem: npm
+    target-branch: 4.2.x
+    directory: /docs
+    schedule:
+      interval: weekly
  - package-ecosystem: npm
    target-branch: 4.1.x
    directory: /docs
@@ -5,9 +5,9 @@ name: Build

 on:
  push:
-    branches: [ main, 4.1.x, 3.1.x ]
+    branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
  pull_request:
-    branches: [ main, 4.1.x, 3.1.x ]
+    branches: [ main, 4.2.x, 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
@@ -5,6 +5,6 @@
    "@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/asciidoctor-extensions": "1.0.0-alpha.16"
  }
 }
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.0-M1</version>
+		<version>4.3.0-M2</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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.3.0-M1</version>
+	<version>4.3.0-M2</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.0-M1</spring-boot.version>
-		<spring-cloud-build.version>4.3.0-M1</spring-cloud-build.version>
+		<spring-boot.version>3.5.0-M2</spring-boot.version>
+		<spring-cloud-build.version>4.3.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>
@@ -50,7 +50,7 @@
 		<sonar.language>java</sonar.language>

 		<!-- Plugins -->
-		<maven-compiler-plugin.version>3.13.0</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>
@@ -115,7 +115,7 @@
 		<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
 		<readme.class.path>readme.class.path</readme.class.path>
 		<sonar-jacoco-listeners.version>5.14.0.18788</sonar-jacoco-listeners.version>
-		<duplicate-finder-maven-plugin.version>1.5.1</duplicate-finder-maven-plugin.version>
+		<duplicate-finder-maven-plugin.version>2.0.1</duplicate-finder-maven-plugin.version>
 		<duplicate-finder-maven-plugin.printEqualFiles>false</duplicate-finder-maven-plugin.printEqualFiles>
 		<duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>
 		<duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>
@@ -138,7 +138,7 @@
 		<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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.3.0-M1</version>
+	<version>4.3.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,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>3.5.0-M1</version>
+		<version>3.5.0-M2</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.5.0-M1</spring-boot.version>
+		<spring-boot.version>3.5.0-M2</spring-boot.version>
 		<okhttp.version>4.12.0</okhttp.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.0-M1</version>
+		<version>4.3.0-M2</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -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.0-M1</version>
+	<version>4.3.0-M2</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
spring-builds	7b0e25f496	Update SNAPSHOT to 4.3.0-M2	2025-02-27 14:55:05 +00:00
Ryan Baxter	b7b60f501d	Merge pull request #419 from spring-cloud/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.14.0 Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0	2025-02-21 08:57:01 -05:00
Ryan Baxter	5e943a0c19	Merge pull request #417 from spring-cloud/dependabot/maven/main/org.apache.maven.plugins-maven-compiler-plugin-3.14.0 Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0	2025-02-21 08:56:08 -05:00
dependabot[bot]	c4f7cc95ef	Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-21 09:43:58 +00:00
dependabot[bot]	2a39690e07	Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-21 09:35:46 +00:00
spring-builds	4864371dae	Bumping versions	2025-02-20 21:53:19 +00:00
Ryan Baxter	b61f7fdc06	Merge pull request #411 from spring-cloud/dependabot/maven/main/commons-logging-commons-logging-1.3.5 Bump commons-logging:commons-logging from 1.3.4 to 1.3.5	2025-02-10 08:49:11 -05:00
Ryan Baxter	f312b07b43	Merge pull request #413 from spring-cloud/dependabot/maven/commons-logging-commons-logging-1.3.5 Bump commons-logging:commons-logging from 1.3.4 to 1.3.5	2025-02-10 08:48:21 -05:00
dependabot[bot]	5e41be9a4c	Bump commons-logging:commons-logging from 1.3.4 to 1.3.5 Bumps commons-logging:commons-logging from 1.3.4 to 1.3.5. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-10 10:11:14 +00:00
dependabot[bot]	78dd3edf84	Bump commons-logging:commons-logging from 1.3.4 to 1.3.5 Bumps commons-logging:commons-logging from 1.3.4 to 1.3.5. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-10 10:09:20 +00:00
Olga Maciaszek-Sharma	b474d4b7e6	Revert "Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2" This reverts commit `4afcd4d4aa`.	2025-02-07 13:46:25 +01:00
Ryan Baxter	f61ef611fa	Merge pull request #408 from spring-cloud/dependabot/maven/com.puppycrawl.tools-checkstyle-10.21.2 Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2	2025-02-06 09:51:42 -05:00
Ryan Baxter	7054f5ff50	Merge pull request #407 from spring-cloud/dependabot/maven/org.basepom.maven-duplicate-finder-maven-plugin-2.0.1 Bump org.basepom.maven:duplicate-finder-maven-plugin from 1.5.1 to 2.0.1	2025-02-06 09:50:54 -05:00
dependabot[bot]	4afcd4d4aa	Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2 --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-06 10:05:08 +00:00
dependabot[bot]	894245c23a	Bump org.basepom.maven:duplicate-finder-maven-plugin from 1.5.1 to 2.0.1 --- updated-dependencies: - dependency-name: org.basepom.maven:duplicate-finder-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-06 10:03:45 +00:00
Ryan Baxter	0252056b88	Merge pull request #406 from spring-cloud/dependabot/maven/org.antora-antora-maven-plugin-1.0.0-alpha.5 Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5	2025-02-05 09:31:12 -05:00
Ryan Baxter	de8683d8f3	Merge pull request #396 from spring-cloud/dependabot/maven/main/org.antora-antora-maven-plugin-1.0.0-alpha.5 Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5	2025-02-05 09:24:17 -05:00
dependabot[bot]	68caf4d247	Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5 --- updated-dependencies: - dependency-name: org.antora:antora-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-05 14:16:31 +00:00
Ryan Baxter	6717ccd44d	Ignore JRuby updates Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-05 09:15:20 -05:00
Ryan Baxter	ff88b313db	Update dependabot.yml Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-05 09:10:52 -05:00
Ryan Baxter	948ce73e57	Ignore JRuby updates Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-05 09:09:23 -05:00
dependabot[bot]	73b68369bd	Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5 --- updated-dependencies: - dependency-name: org.antora:antora-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-05 09:15:18 +00:00
Ryan Baxter	d46ea503d3	Revert JRuby upgrade	2025-02-04 11:16:01 -05:00
Ryan Baxter	ec92da3602	Merge branch '4.2.x'	2025-02-04 10:57:17 -05:00
Ryan Baxter	033c2726b0	Merge branch '4.1.x' into 4.2.x	2025-02-04 10:56:43 -05:00
Ryan Baxter	fbc2042e0e	Reverting JRuby upgrade	2025-02-04 10:26:24 -05:00
Ryan Baxter	ebc2d5ce9f	Merge pull request #393 from spring-cloud/dependabot/maven/4.2.x/org.jruby-jruby-complete-9.4.11.0 Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0	2025-02-03 10:45:54 -05:00
dependabot[bot]	9f35118c53	Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0 Bumps org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0. --- updated-dependencies: - dependency-name: org.jruby:jruby-complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 15:42:29 +00:00
Ryan Baxter	8afa797a2e	Merge pull request #392 from spring-cloud/dependabot/maven/4.1.x/org.jruby-jruby-complete-9.4.11.0 Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0	2025-02-03 10:42:16 -05:00
Ryan Baxter	4283d3a061	Merge pull request #395 from spring-cloud/dependabot/npm_and_yarn/docs/4.2.x/springio/asciidoctor-extensions-1.0.0-alpha.16 Bump @springio/asciidoctor-extensions from 1.0.0-alpha.14 to 1.0.0-alpha.16 in /docs	2025-02-03 10:40:49 -05:00
dependabot[bot]	6d41d203ee	Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0 Bumps org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0. --- updated-dependencies: - dependency-name: org.jruby:jruby-complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 15:40:24 +00:00
Ryan Baxter	9cbdae28e9	Merge pull request #394 from spring-cloud/dependabot/maven/main/org.jruby-jruby-complete-9.4.11.0 Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0	2025-02-03 10:40:22 -05:00
Ryan Baxter	d1a1bfc46d	Update maven.yml Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-03 10:38:33 -05:00
Ryan Baxter	0663022a86	Update maven.yml Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-03 10:38:05 -05:00
Ryan Baxter	0dd547bbb4	Update maven.yml Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-03 10:37:51 -05:00
Ryan Baxter	53a38463c3	Merge pull request #391 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/asciidoctor-extensions-1.0.0-alpha.16 Bump @springio/asciidoctor-extensions from 1.0.0-alpha.14 to 1.0.0-alpha.16 in /docs	2025-02-03 10:35:12 -05:00
Ryan Baxter	51759bb7eb	Merge pull request #390 from spring-cloud/dependabot/npm_and_yarn/docs/main/springio/asciidoctor-extensions-1.0.0-alpha.16 Bump @springio/asciidoctor-extensions from 1.0.0-alpha.14 to 1.0.0-alpha.16 in /docs	2025-02-03 10:34:32 -05:00
dependabot[bot]	d87ac2131f	Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 15:33:34 +00:00
dependabot[bot]	19ffe30a1c	Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0 Bumps org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0. --- updated-dependencies: - dependency-name: org.jruby:jruby-complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 15:33:29 +00:00
Ryan Baxter	9cab7d1471	Adding 4.2.x.branches Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-03 10:33:12 -05:00
Ryan Baxter	b3b37ee5ba	Adding 4.2.x branches Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>	2025-02-03 10:32:30 -05:00
dependabot[bot]	2ba1c83c53	Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 09:54:02 +00:00
dependabot[bot]	344a85014e	Bump @springio/asciidoctor-extensions in /docs Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-03 09:53:17 +00:00
spring-builds	4fc9d4d64d	Going back to snapshots	2025-01-30 02:05:57 +00:00
spring-builds	6f47843786	Bumping versions	2025-01-16 18:10:15 +00:00