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
29 changed files with 346 additions and 101 deletions
@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. 
+
+**Sample**
+If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -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!

@@ -311,36 +316,36 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 	<toc>left</toc>
 	<toc-levels>4</toc-levels>
 	<sectlinks>true</sectlinks>
-	<sources-root>${project.basedir}/src</sources-root>
-	<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-	<generated-resources-root>${project.basedir}/target/generated-resources
+	<sources-root>${project.basedir}/src@</sources-root>
+	<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
+	<generated-resources-root>${project.basedir}/target/generated-resources@
 	</generated-resources-root>
 	<!-- Use this attribute the reference code from another module -->
 	<!-- Note the @ at the end, lowering the precedence of the attribute -->
 	<project-root>${maven.multiModuleProjectDirectory}@</project-root>
 	<!-- It's mandatory for you to pass the docs.main property -->
-	<github-repo>${docs.main}</github-repo>
+	<github-repo>${docs.main}@</github-repo>
 	<github-raw>
-		https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
+		https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
 	</github-raw>
-	<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
+	<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
 	</github-code>
-	<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-	<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-	<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
+	<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
+	<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
+	<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
 	</github-master-code>
-	<index-link>${index-link}</index-link>
+	<index-link>${index-link}@</index-link>

 	<!-- Spring Cloud specific -->
 	<!-- for backward compatibility -->
-	<spring-cloud-version>${project.version}</spring-cloud-version>
-	<project-version>${project.version}</project-version>
-	<github-tag>${github-tag}</github-tag>
-	<version-type>${version-type}</version-type>
-	<docs-url>${docs-url}</docs-url>
-	<raw-docs-url>${raw-docs-url}</raw-docs-url>
-	<project-version>${project.version}</project-version>
-	<project-name>${docs.main}</project-name>
+	<spring-cloud-version>${project.version}@</spring-cloud-version>
+	<project-version>${project.version}@</project-version>
+	<github-tag>${github-tag}@</github-tag>
+	<version-type>${version-type}@</version-type>
+	<docs-url>${docs-url}@</docs-url>
+	<raw-docs-url>${raw-docs-url}@</raw-docs-url>
+	<project-version>${project.version}@</project-version>
+	<project-name>${docs.main}@</project-name>
 </attributes>
 ----

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -10,14 +10,17 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RC2</version>
+		<version>3.0.0.M1</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
-		<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x,2.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
-		<gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version>
+		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.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-->
 		<maven-dependency-plugin-for-docs.phase>none</maven-dependency-plugin-for-docs.phase>
 		<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
@@ -35,26 +38,144 @@
 			<artifactId>spring-core</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>${groovy.version}</version>
+			<type>pom</type>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-xml</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-datetime</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-nio</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-json</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-jsr223</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-macro</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-sql</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-swing</artifactId>
+			<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>
@@ -99,9 +220,22 @@
 						<goals>
 							<goal>compile</goal>
 							<goal>addSources</goal>
+							<goal>generateStubs</goal>
+							<goal>generateTestStubs</goal>
+							<goal>groovydoc-jar</goal>
 						</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>
@@ -163,7 +297,7 @@
 								</goals>
 								<configuration>
 									<skip>${skipTests}</skip>
-									<!-- <skip>true</skip> -->
+									<skip>true</skip>
 									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
 								</configuration>
 							</execution>
@@ -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`).
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.0.M4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.0.M4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.0.M4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.0.M4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
@@ -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.0.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.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,7 +28,7 @@
 		<reactor.version>Californium-SR5</reactor.version>
 		<kryo-shaded.version>3.0.3</kryo-shaded.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.1.RELEASE</spring-cloud-function.version>

 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>

 	<dependencies>
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.
@@ -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.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.0.BUILD-SNAPSHOT</version>
+        <version>3.0.0.BUILD-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.2.0.RC2</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
@@ -28,12 +28,12 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.2.1.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.2.0.RC2</spring-cloud-build.version>
+		<spring-boot.version>2.3.0.M4</spring-boot.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
@@ -102,6 +104,11 @@
 		<configprops.inclusionPattern>.*</configprops.inclusionPattern>
 		<maven-dependency-plugin-for-docs.phase>generate-resources</maven-dependency-plugin-for-docs.phase>
 		<maven-dependency-plugin-for-guides.phase>generate-resources</maven-dependency-plugin-for-guides.phase>
+		<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>
@@ -235,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>
@@ -434,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>
@@ -858,6 +863,23 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java11</id>
+			<activation>
+				<jdk>[1.11,)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8212233 -->
+							<source>8</source>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<!-- TODO: remove this (it's covered with checkstyle, but not all projects use that yet -->
 			<id>imports</id>
@@ -1061,36 +1083,38 @@
 									<toc>left</toc>
 									<toc-levels>4</toc-levels>
 									<sectlinks>true</sectlinks>
-									<sources-root>${project.basedir}/src</sources-root>
-									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-									<generated-resources-root>${project.basedir}/target/generated-resources
+									<sources-root>${project.basedir}/src@</sources-root>
+									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
+									<generated-resources-root>${project.basedir}/target/generated-resources@
 									</generated-resources-root>
 									<!-- Use this attribute the reference code from another module -->
 									<!-- Note the @ at the end, lowering the precedence of the attribute -->
 									<project-root>${maven.multiModuleProjectDirectory}@</project-root>
 									<!-- It's mandatory for you to pass the docs.main property -->
-									<github-repo>${docs.main}</github-repo>
+									<github-repo>${docs.main}@</github-repo>
 									<github-raw>
-										https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
+										https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
 									</github-raw>
-									<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
+									<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
 									</github-code>
-									<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-									<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-									<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
+									<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
+									<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
+									<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
 									</github-master-code>
-									<index-link>${index-link}</index-link>
+									<index-link>${index-link}@</index-link>

 									<!-- Spring Cloud specific -->
 									<!-- for backward compatibility -->
-									<spring-cloud-version>${project.version}</spring-cloud-version>
-									<project-version>${project.version}</project-version>
-									<github-tag>${github-tag}</github-tag>
-									<version-type>${version-type}</version-type>
-									<docs-url>${docs-url}</docs-url>
-									<raw-docs-url>${raw-docs-url}</raw-docs-url>
-									<project-version>${project.version}</project-version>
-									<project-name>${docs.main}</project-name>
+									<spring-cloud-version>${project.version}@</spring-cloud-version>
+									<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>
+									<project-name>${docs.main}@</project-name>
 								</attributes>
 								<!-- end::attributes[] -->
 								<requires>
@@ -1110,18 +1134,19 @@
 											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
 											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/html
+										<outputDirectory>${generated-docs-multipage-output.dir}
 										</outputDirectory>
 										<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>
@@ -1144,18 +1169,19 @@
 											<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
 										<outputDirectory>
-											${project.build.directory}/generated-docs/reference/htmlsingle
+											${generated-docs-singlepage-output.dir}
 										</outputDirectory>
 										<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>
@@ -1170,7 +1196,7 @@
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
+										<outputDirectory>${generated-docs-pdf-output.dir}
 										</outputDirectory>
 										<resources>
 											<resource>
@@ -1351,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>
@@ -1364,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>
@@ -1478,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.2.0.RC2</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
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.3.0.M4</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.1.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.0.M4</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -119,6 +119,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RC2</version>
+		<version>3.0.0.M1</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -24,6 +24,6 @@
 	<!-- Configure checker to run on files with these extensions -->
 	<property name="fileExtensions" value=""/>
 	<!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
-	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
-	</module>
+	<!--<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+	</module>-->
 </module>
@@ -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.2.0.RC2</version>
+	<version>3.0.0.M1</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -150,6 +150,7 @@
 										<pluginManagement>keep</pluginManagement>
 										<properties>keep</properties>
 										<repositories>remove</repositories>
+										<profiles>keep</profiles>
 									</pomElements>
 								</configuration>
 							</execution>
@@ -165,6 +166,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
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
Spencer Gibb	efcd0f89f1	Bumps boot to version to 2.3.0.M4	2020-04-03 10:22:09 -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
Spencer Gibb	2257f255d6	Bumps version to 2.3.0	2020-03-19 10:28:53 -04:00
Marcin Grzejszczak	e8482b1134	Fixing Groovy	2020-03-18 17:38:08 -04:00
Spencer Gibb	2f67da3078	Bumps boot version to 2.3.0.M3 fixes gh-153	2020-03-18 16:44:03 -04:00
Spencer Gibb	9295fc30ef	Updates docs branches	2020-03-06 12:43:48 -05:00
Spencer Gibb	880cf63c2c	Updates remaining versions to 2.2.4.BUILD-SNAPSHOT.	2020-03-04 15:11:09 -05:00
Spencer Gibb	417d78533a	Merge remote-tracking branch 'origin/2.2.x' into 2.2.x # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-build-tools/pom.xml	2020-03-04 15:06:31 -05:00
Marcin Grzejszczak	2e5868c5bd	Bumping build	2020-03-04 14:14:07 +01:00
Spencer Gibb	5e53b18ddf	Update SNAPSHOT to 2.2.3.RELEASE	2020-02-27 11:18:33 -05:00
Spencer Gibb	06bad4e6af	Bumps boot version to 2.2.5	2020-02-27 11:03:50 -05:00
Ryan Baxter	048656e13a	Bumping versions to 2.2.3.BUILD-SNAPSHOT	2020-02-12 10:52:51 -05:00
Ryan Baxter	7c82700143	2.2.2.RELEASE version changes	2020-02-12 10:45:38 -05: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
Spencer Gibb	c6e0bc7a26	bumps groovy version	2020-01-27 12:28:43 -05:00
Spencer Gibb	a8313feea7	Bumps boot version to 2.2.4	2020-01-27 11:51:02 -05:00
Spencer Gibb	2caeaee319	Skips bats tests. See gh-150	2020-01-23 17:10:02 -05: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
Marcin Grzejszczak	a579b7fb03	Externalized generated docs location	2020-01-04 18:28:27 +01:00
buildmaster	19044131d0	Bumping versions	2019-12-21 07:13:31 +00:00
Spencer Gibb	a29ba7bc95	temporarily comment out nohttp-checkstyle.xml	2019-12-19 15:08:48 -05:00
buildmaster	0953f45189	Bumping versions	2019-12-19 07:12:42 +00:00
buildmaster	e082a147a1	Bumping versions to 2.2.2.BUILD-SNAPSHOT after release	2019-12-18 13:42:52 +00:00
buildmaster	c35c8b5742	Going back to snapshots	2019-12-18 13:42:51 +00:00
buildmaster	e5d3206eab	Update SNAPSHOT to 2.2.1.RELEASE	2019-12-18 13:41:17 +00:00
buildmaster	ce0e50c1d9	Bumping versions	2019-12-18 13:19:01 +00:00
Spencer Gibb	e2d73c63ad	javadoc for java 13	2019-12-12 21:07:34 -05:00
buildmaster	03175d3e66	Bumping versions	2019-12-07 07:13:32 +00:00
Marcin Grzejszczak	ac156c7c80	Made more attributes overridable	2019-12-06 10:12:59 +01:00
Ryan Baxter	5e5d2b67ac	Configuring flatten plugin to keep central profile	2019-11-26 15:25:44 -05:00
Ryan Baxter	6c98d80678	Update issue templates	2019-11-19 16:28:21 -05:00
Ryan Baxter	9728af1d93	Creating security.md	2019-11-19 16:27:41 -05:00
buildmaster	2cd4391e49	Bumping versions to 2.2.1.BUILD-SNAPSHOT after release	2019-11-19 13:57:25 +00:00
buildmaster	bb26542fc9	Going back to snapshots	2019-11-19 13:57:24 +00:00
buildmaster	70f7d413f3	Update SNAPSHOT to 2.2.0.RELEASE	2019-11-19 13:56:18 +00:00
Marcin Grzejszczak	94efa8767a	Added missing javadocs fixes gh-148	2019-11-19 13:57:47 +01:00
buildmaster	06f8a97e59	Bumping versions	2019-11-19 07:12:35 +00:00
Ryan Baxter	51c41e52f6	Bumping version to next release	2019-11-18 16:02:37 -05:00
Ryan Baxter	b1a8036d3f	Revert "Change versions for release" This reverts commit `a5be66e84f`.	2019-11-18 15:59:13 -05:00
Ryan Baxter	a5be66e84f	Change versions for release	2019-11-18 15:56:03 -05:00
Marcin Grzejszczak	941bba5970	Merge branch '2.1.x'	2019-11-18 15:02:51 +01:00
Marcin Grzejszczak	1235c2153a	Added gpg version	2019-11-18 15:02:17 +01:00
Marcin Grzejszczak	3312992760	Merge branch '2.1.x'	2019-11-18 14:50:59 +01:00
Marcin Grzejszczak	717978e9eb	Added gpg version	2019-11-18 14:48:27 +01:00
buildmaster	af4bc6f95c	Bumping versions	2019-11-13 07:13:23 +00:00
Marcin Grzejszczak	1afb77ea41	Making all the attributes overridable	2019-11-12 14:01:35 +01:00
Ryan Baxter	33b42d3a4b	Bumping version to 2.1.9	2019-11-11 11:39:54 -05:00
Ryan Baxter	079317a3fe	Revert "Preparing for 2.1.8.RELEASE" This reverts commit `5d8b1fa812`.	2019-11-11 11:38:09 -05:00
Ryan Baxter	5d8b1fa812	Preparing for 2.1.8.RELEASE	2019-11-11 11:22:49 -05:00
Ryan Baxter	c6a0a473ec	Bumping boot to 2.1.10.RELEASE	2019-11-11 11:15:54 -05:00
buildmaster	b167397c23	Going back to snapshots	2019-11-07 16:31:13 +00:00