Upgrade plugin versions.

Use boot 3.1.x
Merge branch '3.1.x'
2026-09-17 21:09:00 +00:00 · 2023-05-12 14:27:58 +02:00 · 2023-05-12 13:05:16 +02:00 · 2023-05-04 17:12:43 +02:00 · 2023-05-04 17:12:35 +02:00 · 2023-05-04 17:07:47 +02:00
5 changed files with 37 additions and 21 deletions
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.0</version>
+		<version>4.0.3-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.0.0</version>
+	<version>4.0.3-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.0.0</spring-boot.version>
-		<spring-cloud-build.version>4.0.0</spring-cloud-build.version>
+		<spring-boot.version>3.1.0-SNAPSHOT</spring-boot.version>
+		<spring-cloud-build.version>4.0.3-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>
@@ -50,29 +50,29 @@
 		<sonar.language>java</sonar.language>

 		<!-- Plugins -->
-		<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.11.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.2.1</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.35</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+		<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-		<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
-		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-		<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
+		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
+		<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+		<maven-surefire-report-plugin.version>3.1.0</maven-surefire-report-plugin.version>
 		<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
 		<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
 		<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
 		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-		<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-		<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
+		<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
+		<maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-		<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
+		<maven-dependency-plugin.version>3.5.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>
+		<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
 		<artifactory-maven-plugin.version>3.2.3</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
@@ -111,7 +111,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>2.8.2</maven-deploy-plugin.version>
+		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
 		<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
 		<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
 		<upload-docs-zip.phase>none</upload-docs-zip.phase>
@@ -136,6 +136,7 @@
 		<duplicate-finder-maven-plugin.bootClasspathProperty>sun.boot.class.path</duplicate-finder-maven-plugin.bootClasspathProperty>
 		<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
 		<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
+		<maven-gpg-plugin.phase>verify</maven-gpg-plugin.phase>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -837,7 +838,7 @@
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
-								<phase>verify</phase>
+								<phase>${maven-gpg-plugin.phase}</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
@@ -1358,6 +1359,21 @@
 										</target>
 									</configuration>
 								</execution>
+								<execution>
+									<id>copy-missing-html-files</id>
+									<phase>package</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<failOnError>false</failOnError>
+										<target>
+											<copy tofile="${project.build.directory}/generated-docs/reference/htmlsingle/index.html">
+												<fileset dir="${project.build.directory}/generated-docs/reference/htmlsingle" includes="${docs.main}.html" />
+											</copy>
+										</target>
+									</configuration>
+								</execution>
 								<execution>
 									<id>package-and-attach-docs-zip</id>
 									<phase>package</phase>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.0.0</version>
+	<version>4.0.3-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>3.0.0</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.0.0</spring-boot.version>
+		<spring-boot.version>3.1.0-SNAPSHOT</spring-boot.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 	<build>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.0</version>
+		<version>4.0.3-SNAPSHOT</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.0.0</version>
+	<version>4.0.3-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
Olga MaciaszekSharma	3539937d24	Upgrade plugin versions.	2023-05-12 14:27:58 +02:00
Olga MaciaszekSharma	a3f1bf3eba	Use boot 3.1.x	2023-05-12 13:05:16 +02:00
Marcin Grzejszczak	737a871aae	Merge branch '3.1.x'	2023-05-04 17:12:43 +02:00
Marcin Grzejszczak	240995fa09	Created a separate task; related to gh-221	2023-05-04 17:12:35 +02:00
Marcin Grzejszczak	6aa7ce8922	Merge branch '3.1.x'	2023-05-04 17:07:47 +02:00
Marcin Grzejszczak	661a4ccb61	Don't fail on error; related to gh-221	2023-05-04 17:07:32 +02:00
Marcin Grzejszczak	753c1e78db	Merge branch '3.1.x'	2023-05-04 17:03:08 +02:00
Marcin Grzejszczak	983d743cd6	Adds a conditional on folder; related to gh-221	2023-05-04 17:03:02 +02:00
Marcin Grzejszczak	d94e0350a3	Merge branch '3.1.x'	2023-05-04 16:46:07 +02:00
Marcin Grzejszczak	04b16bd386	Fixes htmlsingleadoc by copying the index file; gh-221	2023-05-04 16:44:58 +02:00
buildmaster	c34d045a87	Bumping versions to 3.1.8-SNAPSHOT after release	2023-04-27 14:07:42 +00:00
buildmaster	5e60d0ba3b	Going back to snapshots	2023-04-27 14:07:42 +00:00
buildmaster	754ac21e0c	Update SNAPSHOT to 3.1.7	2023-04-27 14:06:04 +00:00
buildmaster	0c8a004022	Bumping versions	2023-03-29 14:58:01 +00:00
buildmaster	2ddad64197	Bumping versions	2023-03-28 14:57:34 +00:00
buildmaster	b39ddf77cd	Bumping versions to 4.0.3-SNAPSHOT after release	2023-03-28 13:31:40 +00:00
buildmaster	aa945db6ba	Going back to snapshots	2023-03-28 13:31:40 +00:00
buildmaster	df48f5dd5f	Update SNAPSHOT to 4.0.2	2023-03-28 13:30:08 +00:00
buildmaster	2742082c21	Bumping versions to 3.1.7-SNAPSHOT after release	2023-02-23 21:59:17 +00:00
buildmaster	4965414a99	Going back to snapshots	2023-02-23 21:59:17 +00:00
buildmaster	63c0f70252	Update SNAPSHOT to 3.1.6	2023-02-23 21:57:59 +00:00
Marcin Grzejszczak	9aad646584	Merge branch '3.1.x'	2023-02-07 16:20:31 +01:00
Marcin Grzejszczak	4f137c8551	Parametrizes the gpg phase so that projects can opt out of it	2023-02-07 16:19:17 +01:00
buildmaster	fe397f39b3	Bumping versions	2023-01-26 14:57:34 +00:00
buildmaster	7af9936776	Bumping versions	2023-01-25 14:57:26 +00:00
buildmaster	802459a94d	Bumping versions to 4.0.2-SNAPSHOT after release	2023-01-25 13:55:43 +00:00
buildmaster	2da5576afc	Going back to snapshots	2023-01-25 13:55:43 +00:00
buildmaster	fec1fd6592	Update SNAPSHOT to 4.0.1	2023-01-25 13:54:12 +00:00
buildmaster	fee3542395	Bumping versions	2022-12-20 14:57:23 +00:00
buildmaster	389e806ab4	Bumping versions	2022-12-17 14:57:20 +00:00
buildmaster	7db0179851	Bumping versions	2022-12-16 14:57:20 +00:00
buildmaster	60fd117a72	Bumping versions to 4.0.1-SNAPSHOT after release	2022-12-15 19:46:06 +00:00
buildmaster	9ba1bd0004	Going back to snapshots	2022-12-15 19:46:05 +00:00
buildmaster	9fa4d632f5	Bumping versions to 3.1.6-SNAPSHOT after release	2022-11-03 14:26:50 +00:00
buildmaster	62bcecf8ba	Going back to snapshots	2022-11-03 14:26:50 +00:00
buildmaster	08179ab430	Update SNAPSHOT to 3.1.5	2022-11-03 14:25:27 +00:00
buildmaster	9e17a7fc8d	Going back to snapshots	2022-09-06 19:00:11 +00:00
buildmaster	71ee1e08f7	Update SNAPSHOT to 3.1.4	2022-09-06 18:58:55 +00:00
buildmaster	480c02c009	Bumping versions	2022-09-03 21:35:00 +00:00
buildmaster	f59d853039	Bumping versions	2022-09-02 21:35:02 +00:00
buildmaster	c344ca06b8	Bumping versions to 3.1.5-SNAPSHOT after release	2022-09-02 20:32:28 +00:00
buildmaster	a38b36105b	Going back to snapshots	2022-09-02 20:32:28 +00:00
buildmaster	b103fbd43f	Update SNAPSHOT to 3.1.4	2022-09-02 20:31:14 +00:00
buildmaster	71103bacea	Bumping versions	2022-08-31 21:35:06 +00:00
Ryan Baxter	528b03b71f	Moving to boot 2.6.11	2022-08-31 10:43:16 -04:00
buildmaster	8cf0076cfc	Bumping versions	2022-08-22 21:35:16 +00:00