diff --git 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 index 77f7e96a..ea3072a7 100644 --- 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 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git 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 index 432772db..e14670bc 100644 --- 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 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - Finchley.SR2 - 2.0.2.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git 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 index 77f7e96a..ea3072a7 100644 --- 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 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git 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 index 5e796e3d..b475c99b 100644 --- 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 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - Finchley.SR2 - 2.0.2.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml index 39d84f49..0f5e1cf4 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT pom spring-cloud-stream-core-docs diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml index 8696ff67..7c9595ca 100644 --- 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 @@ org.springframework.cloud spring-cloud-build - 2.1.4.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT @@ -28,8 +28,7 @@ Californium-SR5 3.0.3 2.1 - 2.1.0.M1 - + 2.1.1.BUILD-SNAPSHOT true true diff --git 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 index 154ed845..29112435 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT diff --git 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 index afa33f28..e2154bbc 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT diff --git 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 index 4566fbcb..a8e673a6 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT 4.0.0 diff --git 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 index 24906e09..1384f6e9 100644 --- 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 @@ spring-cloud-stream-parent org.springframework.cloud - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT diff --git 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 index 84f04ba5..3754c95f 100644 --- 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 @@ spring-cloud-stream-parent org.springframework.cloud - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT 4.0.0 diff --git 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 index db2c08e2..2daf716a 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT spring-cloud-stream-test-support-internal Set of classes and utility code that may assist in testing both diff --git 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 index ddcf23c5..a0688bae 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT spring-cloud-stream-test-support A set of classes to ease testing of Spring Cloud Stream modules. diff --git 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 index d371cd7e..d2b13807 100644 --- 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 @@ org.springframework.cloud spring-cloud-build - 2.1.4.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git 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 index b1c5dc0d..6c7f66db 100644 --- 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 @@ org.springframework.cloud spring-cloud-stream-parent - 2.2.0.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index cb4053bc..87b54b55 100644 --- 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/" diff --git a/pom.xml b/pom.xml index 42474c4b..daf606d5 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.2.0.M4 + 2.2.0.BUILD-SNAPSHOT 2.2.0.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index fd9cfd42..6973b120 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.M4 + 2.2.0.BUILD-SNAPSHOT UTF-8 - 2.2.0.M4 + 2.2.0.BUILD-SNAPSHOT https://github.com/spring-cloud