Merge pull request #487 from wind57/upgrade_surefire_failsafe

upgrade failsafe and surefire plugins
Merge pull request #497 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/antora-extensions-1.14.6
2026-09-17 21:09:00 +00:00 · 2025-07-14 12:49:43 -07:00 · 2025-07-14 12:12:31 -07:00 · 2025-07-14 11:57:37 +00:00 · 2025-07-01 15:29:03 +03:00 · 2025-06-24 21:46:45 +00:00
12 changed files with 37 additions and 65 deletions
@@ -17,7 +17,7 @@ given the ability to merge pull requests.

 ## Code of Conduct
 This project adheres to the Contributor Covenant [code of
-conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
 unacceptable behavior to spring-code-of-conduct@pivotal.io.

 ## Code Conventions and Housekeeping
@@ -20,17 +20,6 @@ updates:
      - dependency-name: "*"
        update-types:
          - version-update:semver-major
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 4.1.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,8 +30,3 @@ updates:
    directory: /docs
    schedule:
      interval: weekly
-  - package-ecosystem: npm
-    target-branch: 4.1.x
-    directory: /docs
-    schedule:
-      interval: weekly
@@ -17,7 +17,7 @@ jobs:
    # if: github.repository_owner == 'spring-projects'
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
        with:
          ref: docs-build
          fetch-depth: 1
@@ -5,9 +5,9 @@ name: Build

 on:
  push:
-    branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
+    branches: [ main, 4.1.x, 3.1.x ]
  pull_request:
-    branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
+    branches: [ main, 4.1.x, 3.1.x ]

 jobs:
  build:
@@ -15,9 +15,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          java-version: 17
          distribution: 'temurin'
@@ -14,9 +14,9 @@ For additional details, please refer to the blog post https://spring.io/blog/202

 [[code-of-conduct]]
 == Code of Conduct
-This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc[code of
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of
 conduct]. By participating, you  are expected to uphold this code. Please report
-unacceptable behavior to code-of-conduct@spring.io.
+unacceptable behavior to spring-code-of-conduct@pivotal.io.

 [[code-conventions-and-housekeeping]]
 == Code Conventions and Housekeeping
@@ -1,10 +1,10 @@
 {
  "dependencies": {
-    "antora": "3.2.0-alpha.10",
-    "@antora/atlas-extension": "1.0.0-alpha.5",
-    "@antora/collector-extension": "1.0.2",
+    "antora": "3.2.0-alpha.8",
+    "@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.7",
+    "@springio/antora-extensions": "1.14.6",
    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
  }
 }
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.2.3</version>
+		<version>4.1.7-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.2.3</version>
+	<version>4.1.7-SNAPSHOT</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.4.7</spring-boot.version>
-		<spring-cloud-build.version>4.2.3</spring-cloud-build.version>
+		<spring-boot.version>3.3.13</spring-boot.version>
+		<spring-cloud-build.version>4.1.7-SNAPSHOT</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>
@@ -56,27 +56,28 @@
 		<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-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version>
+		<maven-failsafe-plugin.version>3.5.3</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>
 		<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-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
+		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+		<maven-surefire-report-plugin.version>3.5.3</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.3.0</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-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.2.8</maven-gpg-plugin.version>
-		<maven-dependency-plugin.version>3.8.1</maven-dependency-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.5.0</license-maven-plugin.version>
+		<license-maven-plugin.version>2.4.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>
+		<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>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
@@ -111,7 +112,7 @@
 		<javadoc.failOnError>false</javadoc.failOnError>
 		<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
 		<maven-deploy-plugin-default.phase>deploy</maven-deploy-plugin-default.phase>
-		<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
+		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 		<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>
@@ -1310,7 +1311,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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.2.3</version>
+	<version>4.1.7-SNAPSHOT</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,28 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>3.4.7</version>
+		<version>3.3.13</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.4.7</spring-boot.version>
-		<okhttp.version>4.12.0</okhttp.version>
-		<maven-gpg-plugin.version>3.2.8</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>
-	<dependencyManagement>
-		<dependencies>
-			<!-- removed from spring-boot-dependencies in 3.4.0 -->
-			<dependency>
-				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>okhttp-bom</artifactId>
-				<version>${okhttp.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<build>
 		<plugins>
 			<plugin>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.2.3</version>
+		<version>4.1.7-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -1,5 +1,5 @@
 ^\Q/*\E$
-^\Q * Copyright \E20\d\d\-present\Q the original author or authors.\E$
+^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
 ^\Q *\E$
 ^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
 ^\Q * you may not use this file except in compliance with the License.\E$
@@ -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.2.3</version>
+	<version>4.1.7-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -149,7 +149,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.8</version>
+						<version>3.2.7</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
Author	SHA1	Message	Date
Ryan Baxter	7b37a7c34e	Merge pull request #487 from wind57/upgrade_surefire_failsafe upgrade failsafe and surefire plugins	2025-07-14 12:49:43 -07:00
Ryan Baxter	0e36a97cf6	Merge pull request #497 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/antora-extensions-1.14.6 Bump @springio/antora-extensions from 1.14.4 to 1.14.6 in /docs	2025-07-14 12:12:31 -07:00
dependabot[bot]	5062db4973	Bump @springio/antora-extensions from 1.14.4 to 1.14.6 in /docs Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.4 to 1.14.6. - [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.4...v1.14.6) --- updated-dependencies: - dependency-name: "@springio/antora-extensions" dependency-version: 1.14.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-14 11:57:37 +00:00
wind57	795d0e12cc	upgrade Signed-off-by: wind57 <eugen.rabii@gmail.com>	2025-07-01 15:29:03 +03:00
spring-builds	6acf9cddeb	Bumping versions	2025-06-24 21:46:45 +00:00
spring-builds	ae99b53766	Bumping versions	2025-06-23 21:46:12 +00:00
Ryan Baxter	ec8e13c07a	Merge pull request #474 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-maven-plugin-0.0.47 Bump io.spring.javaformat:spring-javaformat-maven-plugin from 0.0.46 to 0.0.47	2025-06-23 13:18:08 -04:00
Ryan Baxter	1b0431df76	Merge pull request #475 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-checkstyle-0.0.47 Bump io.spring.javaformat:spring-javaformat-checkstyle from 0.0.46 to 0.0.47	2025-06-23 10:59:07 -04:00
spring-builds	98385179d9	Bumping versions	2025-06-23 14:32:37 +00:00
dependabot[bot]	1e87d66752	Bump io.spring.javaformat:spring-javaformat-checkstyle Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.46 to 0.0.47. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.46...v0.0.47) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.47 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-23 11:12:41 +00:00
dependabot[bot]	5947140d5f	Bump io.spring.javaformat:spring-javaformat-maven-plugin Bumps [io.spring.javaformat:spring-javaformat-maven-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.46 to 0.0.47. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.46...v0.0.47) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-maven-plugin dependency-version: 0.0.47 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-23 10:44:43 +00:00
spring-builds	33d8cff618	Bumping versions	2025-06-21 21:46:00 +00:00