Version changes for 3.0.0.M1 release

Downgraded Groovy to 2.5.10
Added missing ; at the end of type in the maven-deploy
2026-09-17 21:09:00 +00:00 · 2020-04-06 10:41:30 -04:00 · 2020-04-06 12:39:31 +02:00 · 2020-04-06 08:40:15 +02:00 · 2020-04-04 07:12:35 +00:00 · 2020-04-03 10:25:24 -04:00
12 changed files with 173 additions and 39 deletions
@@ -282,6 +282,10 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId> <6>
 					</plugin>
+                                        <plugin>
+                                                <groupId>org.codehaus.mojo</groupId>
+                                                <artifactId>build-helper-maven-plugin</artifactId> <7>
+                                        </plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -293,6 +297,7 @@ approach of generating documentation just add these plugins to your `docs` modul
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<7> This plugin ensures that the generated zip docs are attached as an artifact and will get published

 IMPORTANT: The order of plugin declaration is important!

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.M1</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -18,7 +18,7 @@
 		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
-		<groovy.version>2.5.9</groovy.version>
+		<groovy.version>2.5.10</groovy.version>
 		<!-- For the Groovy plugin -->
 		<groovyVersion>${groovy.version}</groovyVersion>
 		<!-- We don't want to downloaded sources of our own project-->
@@ -98,6 +98,84 @@
 			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-cli-picocli</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-ant</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- <dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-astbuilder</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency> -->
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-console</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-docgenerator</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-groovydoc</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-groovysh</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-jmx</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-servlet</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-templates</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-test</artifactId>
+			<version>${groovy.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-test-junit5</artifactId>
+			<version>${groovy.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-testng</artifactId>
+			<version>${groovy.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -148,6 +226,16 @@
 						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-all</artifactId>
+						<!-- any version of Groovy \>= 1.5.0 should work here -->
+						<version>${groovy.version}</version>
+						<scope>runtime</scope>
+						<type>pom</type>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -98,6 +98,10 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId> <6>
 					</plugin>
+                                        <plugin>
+                                                <groupId>org.codehaus.mojo</groupId>
+                                                <artifactId>build-helper-maven-plugin</artifactId> <7>
+                                        </plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -109,6 +113,7 @@ approach of generating documentation just add these plugins to your `docs` modul
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<7> This plugin ensures that the generated zip docs are attached as an artifact and will get published

 IMPORTANT: The order of plugin declaration is important!

@@ -152,4 +157,4 @@ what will happen is that for GA project versions, we will clone `gs-guide1`, `gs

 You can skip this by either not adding the `guides` profile, or passing the `-DskipGuides` system property when the profile is turned on.

-You can configure the project version passed to guides via the `guides-project.version` (defaults to `${project.version}`). The phase at which guides get updated can be configured by `guides-update.phase` (defaults to `deploy`).
+You can configure the project version passed to guides via the `guides-project.version` (defaults to `${project.version}`). The phase at which guides get updated can be configured by `guides-update.phase` (defaults to `deploy`).
@@ -4,12 +4,12 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-parent</artifactId>
-	<version>2.2.2.BUILD-SNAPSHOT</version>
+	<version>3.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.2.BUILD-SNAPSHOT</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>2.2.2.BUILD-SNAPSHOT</version>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.2.BUILD-SNAPSHOT</version>
+        <version>3.0.0.BUILD-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0.M1</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -29,11 +29,11 @@
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
 		<spring-boot.version>2.3.0.M4</spring-boot.version>
-		<spring-cloud-build.version>2.3.0.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-build.version>3.0.0.M1</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
-		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
+		<spring-doc-resources.version>0.2.0.RELEASE</spring-doc-resources.version>
+		<spring-asciidoctor-extensions.version>0.2.0.RELEASE
 		</spring-asciidoctor-extensions.version>
 		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>1.5.18</asciidoctorj-diagram.version>
@@ -55,7 +55,7 @@
 		<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>8.18</puppycrawl-tools-checkstyle.version>
+		<puppycrawl-tools-checkstyle.version>8.29</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
 		<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
@@ -76,7 +76,9 @@
 		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
-		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+		<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+		<pitest-maven.version>1.5.0</pitest-maven.version>
+		<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true
@@ -105,6 +107,8 @@
 		<generated-docs-multipage-output.dir>${project.build.directory}/generated-docs/reference/html</generated-docs-multipage-output.dir>
 		<generated-docs-singlepage-output.dir>${project.build.directory}/generated-docs/reference/htmlsingle</generated-docs-singlepage-output.dir>
 		<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
+		<javadoc.failOnError>false</javadoc.failOnError>
+		<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -238,9 +242,8 @@
 					</execution>
 				</executions>
 				<configuration>
-					<!-- TODO: We need to patch the javadocs instead of disabling this -->
-					<failOnError>false</failOnError>
-					<quiet>true</quiet>
+					<failOnError>${javadoc.failOnError}</failOnError>
+					<failOnWarnings>${javadoc.failOnWarnings}</failOnWarnings>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -437,7 +440,6 @@
 									checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
 								</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
-								<!-- TODO: Start fixing the errors -->
 								<includeTestSourceDirectory>
 									${maven-checkstyle-plugin.includeTestSourceDirectory}
 								</includeTestSourceDirectory>
@@ -1107,6 +1109,8 @@
 									<project-version>${project.version}@</project-version>
 									<github-tag>${github-tag}@</github-tag>
 									<version-type>${version-type}@</version-type>
+									<!-- Once we go to docs.spring.io should be changed to -->
+									<!-- https://docs.spring.io/${docs.main}/${project.version} -->
 									<docs-url>${docs-url}@</docs-url>
 									<raw-docs-url>${raw-docs-url}@</raw-docs-url>
 									<project-version>${project.version}@</project-version>
@@ -1135,13 +1139,14 @@
 										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
+											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
 											<stylesheet>spring.css</stylesheet>
+											<linkcss>true</linkcss>
+											<icons>font</icons>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>github</highlightjs-theme>
+											<imagesdir>./images</imagesdir>
 											<attribute-missing>warn</attribute-missing>
 										</attributes>
 										<logHandler>
@@ -1169,13 +1174,14 @@
 										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
+											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
 											<stylesheet>spring.css</stylesheet>
+											<linkcss>true</linkcss>
+											<icons>font</icons>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>github</highlightjs-theme>
+											<imagesdir>./images</imagesdir>
 										</attributes>
 									</configuration>
 								</execution>
@@ -1371,10 +1377,10 @@
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>build-helper-maven-plugin</artifactId>
 							<version>${build-helper-maven-plugin.version}</version>
-							<inherited>false</inherited>
 							<executions>
 								<execution>
 									<id>attach-zip</id>
+									<phase>package</phase>
 									<goals>
 										<goal>attach-artifact</goal>
 									</goals>
@@ -1384,7 +1390,7 @@
 												<file>
 													${project.build.directory}/${project.artifactId}-${project.version}.zip
 												</file>
-												<type>zip</type>
+												<type>zip;zip.type=docs;zip.deployed=false;</type>
 											</artifact>
 										</artifacts>
 									</configuration>
@@ -1498,5 +1504,42 @@
 				<checkstyle.skip>true</checkstyle.skip>
 			</properties>
 		</profile>
+		<profile>
+			<id>mutation</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.pitest</groupId>
+						<artifactId>pitest-maven</artifactId>
+						<version>${pitest-maven.version}</version>
+						<configuration>
+							<!-- generate line coverage -->
+							<exportLineCoverage>true</exportLineCoverage>
+							<!-- in the "right" format -->
+							<outputFormats><value>XML</value></outputFormats>
+							<!-- and write reports where report-aggregate-module expects to find it -->
+							<timestampedReports>false</timestampedReports>
+							<!-- There are modules that don't have tests -->
+							<failWhenNoMutations>false</failWhenNoMutations>
+						</configuration>
+						<executions>
+							<execution>
+								<id>mutationCoverage</id>
+								<goals>
+									<goal>mutationCoverage</goal>
+								</goals>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.pitest</groupId>
+								<artifactId>pitest-junit5-plugin</artifactId>
+								<version>${pitest-junit5-plugin.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0.M1</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.M1</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -122,11 +122,6 @@
 			<property name="excludeScope" value="package"/>
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-			<property name="scope" value="public"/>
-			<property name="excludeScope" value="package"/>
-			<property name="allowMissingJavadoc" value="true"/>
-		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>
 		</module>
@@ -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>2.3.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0.M1</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
Ryan Baxter	d2c32c296f	Version changes for 3.0.0.M1 release	2020-04-06 10:41:30 -04:00
Marcin Grzejszczak	cf97faac76	Downgraded Groovy to 2.5.10	2020-04-06 12:39:31 +02:00
Marcin Grzejszczak	7e0af58be1	Added missing ; at the end of type in the maven-deploy	2020-04-06 08:40:15 +02:00
buildmaster	af64b39551	Bumping versions	2020-04-04 07:12:35 +00:00
Spencer Gibb	cb4e0f2e1f	Merge branch '2.3.x'	2020-04-03 10:25:24 -04:00
Marcin Grzejszczak	14829d4e67	Bumped Groovy for jdk14 to work	2020-04-02 14:38:23 +02:00
Marcin Grzejszczak	c91c5d3146	Updated docs theme to github	2020-04-02 09:44:01 +02:00
Marcin Grzejszczak	62708fe5b0	Upgraded doc libraries	2020-04-01 18:42:16 +02:00
Marcin Grzejszczak	126d39dd11	Added one more prop for the .md5 extension to be added to that one instead of docs.deployed	2020-04-01 18:21:15 +02:00
Marcin Grzejszczak	21f60d469e	Updated type with zip	2020-04-01 12:34:22 +02:00
Marcin Grzejszczak	aa8e68f719	Describes how to attach the zip with docs	2020-04-01 10:18:50 +02:00
Marcin Grzejszczak	3b444ac772	Fixed the failure flag	2020-03-30 16:03:02 +02:00
Marcin Grzejszczak	57ee494b9d	Fixed setup for failing on errors / warnings with javadocs	2020-03-30 09:57:13 +02:00
Marcin Grzejszczak	199c1405bf	Externalized javadoc.failOnError	2020-03-30 08:40:54 +02:00
Marcin Grzejszczak	423db03218	Don't fail the build if there are no mutations	2020-03-27 10:42:48 +01:00
Marcin Grzejszczak	c271a4eb9f	Added pitest integration; fixes gh-154 (#155 )	2020-03-26 13:41:00 +01:00
Olga Maciaszek-Sharma	6920b32ef7	Remove deprecated checkstyle property.	2020-02-07 13:52:28 +01:00
Dave Syer	fb26806aa8	Update versions for checkstyle and puppy thing (#152 ) Avoid nag by github security alert	2020-02-07 06:24:24 -05:00
buildmaster	7132df33e9	Bumping versions	2020-01-30 07:12:20 +00:00
Marcin Grzejszczak	a12aafd666	Fixing Groovy	2020-01-29 21:23:30 +01:00
Marcin Grzejszczak	1e1a69d5e7	Merge branch '2.2.x'	2020-01-29 21:04:44 +01:00
buildmaster	2d6fba3980	Bumping versions	2020-01-21 17:56:12 +00:00
buildmaster	b17c65538a	Bumping versions	2020-01-21 07:12:29 +00:00
buildmaster	5c90e0fae5	Bumping versions	2020-01-20 13:08:57 +00:00
buildmaster	3ed6df3056	Bumping versions	2020-01-18 07:12:34 +00:00
Spencer Gibb	e512de74b8	Updates to 3.0.0.BUILD-SNAPSHOT Bumps boot to 2.3.0.BUILD-SNAPSHOT	2020-01-17 14:46:06 -05:00