Merge branch 'master' into multi_pages

2019-07-23 18:13:57 +02:00
parent 6176fb3ba7 d885a49ddd
commit 3f2eb50c74
18 changed files with 23 additions and 38 deletions
--- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
-		<spring-cloud-contract.version>2.0.2.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
-		<spring-cloud-contract.version>2.0.2.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.4.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,8 +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>2.1.0.M1
-		</spring-cloud-function.version>
+		<spring-cloud-function.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-function.version>

 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.1.4.BUILD-SNAPSHOT</version>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
        <relativePath />
    </parent>

--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/docs/src/test/bats/ghpages.bats
+++ b/docs/src/test/bats/ghpages.bats
@@ -293,20 +293,6 @@ export -f stubbed_git
 	assert_output --partial "clean install"
 }

-@test "should retrieve maven properties for docs" {
-	export WHITELIST_PROPERTY="spring-doc-resources.version"
-	export MAVEN_EXEC="./mvnw"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	retrieve_doc_properties
-
-	assert_success
-	assert [ "${WHITELISTED_BRANCHES_VALUE}" == "0.1.1.RELEASE" ]
-}
-
@test "should stash changes if dirty" {
 	export GIT_BIN="printing_git_failing_with_diff_index"
 	cd "${TEMP_DIR}/spring-cloud-stream/"
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.2.0.M4</spring-boot.version>
+		<spring-boot.version>2.2.0.BUILD-SNAPSHOT</spring-boot.version>
 		<spring-cloud-build.version>2.2.0.BUILD-SNAPSHOT</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>
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/spring-cloud-build-dependencies/pom.xml
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.0.M4</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.0.M4</spring-boot.version>
+		<spring-boot.version>2.2.0.BUILD-SNAPSHOT</spring-boot.version>
 	</properties>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>