From 53fd3a14c843b333fc93221b8ead7e1a18d716ae Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 30 Jul 2020 10:06:50 -0400 Subject: [PATCH 1/8] Bumps boot to version to 2.3.2.RELEASE --- .../gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- .../gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- .../gs-contract-rest/initial/contract-rest-client/pom.xml | 2 +- .../gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) 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 ba1b2c3c..9b5cdcc5 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.3.0.RELEASE + 2.3.2.RELEASE 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 367cb537..3e61e0b1 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,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE 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 ba1b2c3c..9b5cdcc5 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.3.0.RELEASE + 2.3.2.RELEASE 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 57fbacfa..3f5f5698 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,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE diff --git a/pom.xml b/pom.xml index c6c9800b..bf24bfdf 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.3.0.RELEASE + 2.3.2.RELEASE 2.3.1.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 20596d43..299bc57d 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.3.0.RELEASE + 2.3.2.RELEASE UTF-8 - 2.3.0.RELEASE + 2.3.2.RELEASE From e296686584d70b49e2fb012bcdf55064dfbfb557 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 30 Jul 2020 10:28:32 -0400 Subject: [PATCH 2/8] Revert "Changing to https://repo.spring.io/snapshot" This reverts commit d4a54620b8a2c3f6115b5962da90e45c98f2f0a6. --- spring-cloud-build-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 299bc57d..ccefbaf6 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -139,7 +139,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true @@ -165,7 +165,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true From c08320254e3431a70c3d6d3e6fedee741cb02f01 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 30 Jul 2020 10:29:22 -0400 Subject: [PATCH 3/8] Revert "Use https://repo.spring.io/snapshot" This reverts commit fc232982402428760d8036f051f38b1a767595bd. --- .settings.xml | 4 ++-- pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.settings.xml b/.settings.xml index 9ddadef0..03645e8c 100644 --- a/.settings.xml +++ b/.settings.xml @@ -23,7 +23,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true @@ -49,7 +49,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true diff --git a/pom.xml b/pom.xml index bf24bfdf..bbea1f62 100644 --- a/pom.xml +++ b/pom.xml @@ -691,7 +691,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true @@ -725,7 +725,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 52c61d99..8c0177fa 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -186,7 +186,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true @@ -212,7 +212,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/snapshot + https://repo.spring.io/libs-snapshot-local true From a247cbcfaee71ee4ac153b6442d989515e7a7d02 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jul 2020 16:47:53 +0000 Subject: [PATCH 4/8] Update SNAPSHOT to 2.3.1.RELEASE --- README.adoc | 1 + docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.adoc b/README.adoc index 03c4d3ad..3bf3f86b 100644 --- a/README.adoc +++ b/README.adoc @@ -321,6 +321,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you ${maven.multiModuleProjectDirectory}@ ${docs.main}@ + https://github.com/spring-cloud/${docs.main}@ https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@ diff --git a/docs/pom.xml b/docs/pom.xml index 76ba278b..d44aa125 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-build diff --git a/pom.xml b/pom.xml index bbea1f62..9f72d838 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 2.3.2.RELEASE - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ccefbaf6..49cd9af4 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index cbfbcdfe..fd275ff1 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 8c0177fa..c15a721c 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From c2ef62de73bb10bcc0089e3d67e2c766ba968195 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jul 2020 16:56:04 +0000 Subject: [PATCH 5/8] Going back to snapshots --- README.adoc | 1 - docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.adoc b/README.adoc index 3bf3f86b..03c4d3ad 100644 --- a/README.adoc +++ b/README.adoc @@ -321,7 +321,6 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you ${maven.multiModuleProjectDirectory}@ ${docs.main}@ - https://github.com/spring-cloud/${docs.main}@ https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@ diff --git a/docs/pom.xml b/docs/pom.xml index d44aa125..76ba278b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 9f72d838..bbea1f62 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 2.3.2.RELEASE - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 49cd9af4..ccefbaf6 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index fd275ff1..cbfbcdfe 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index c15a721c..8c0177fa 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 2631bd9e4ffb91ffa3359910e761b28e4fa0d150 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jul 2020 16:56:05 +0000 Subject: [PATCH 6/8] Bumping versions to 2.3.2.SNAPSHOT after release --- docs/pom.xml | 2 +- .../gs-contract-rest/complete/contract-rest-service/pom.xml | 4 ++-- .../gs-contract-rest/initial/contract-rest-service/pom.xml | 4 ++-- .../src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml | 2 +- docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml | 6 +++--- .../spring-cloud-stream-binder-test/pom.xml | 2 +- .../spring-cloud-stream-integration-tests/pom.xml | 2 +- .../spring-cloud-stream-reactive/pom.xml | 2 +- .../spring-cloud-stream-schema-server/pom.xml | 2 +- .../spring-cloud-stream/spring-cloud-stream-schema/pom.xml | 2 +- .../spring-cloud-stream-test-support-internal/pom.xml | 2 +- .../spring-cloud-stream-test-support/pom.xml | 2 +- .../spring-cloud-stream/spring-cloud-stream-tools/pom.xml | 4 ++-- .../spring-cloud-stream/spring-cloud-stream/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 76ba278b..9c5d82f7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT spring-cloud-build 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 3e61e0b1..f1df31bc 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 @@ -18,8 +18,8 @@ UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + Hoxton.SNAPSHOT + 2.2.4.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 3f5f5698..05c714f2 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 @@ -18,8 +18,8 @@ UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + Hoxton.SNAPSHOT + 2.2.4.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 120a49da..1d0c6e31 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 - Horsham.RELEASE + Horsham.SR6 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 434ba6ec..47142ae8 100644 --- a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml +++ b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-stream-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT @@ -28,7 +28,7 @@ Californium-SR5 3.0.3 2.1 - 3.0.7.BUILD-SNAPSHOT + 3.0.9.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 7dd697e1..4209f69c 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 - Horsham.RELEASE + Horsham.SR6 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 6e5a4bb0..739b0b1f 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 - Horsham.RELEASE + Horsham.SR6 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 611a7a6f..d76a13ab 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 - Horsham.RELEASE + Horsham.SR6 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 28bfbdea..61c35068 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 - Horsham.RELEASE + Horsham.SR6 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 37924b53..08894523 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 - Horsham.RELEASE + Horsham.SR6 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 c936f18a..206ef80b 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 - Horsham.RELEASE + Horsham.SR6 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 122044ca..ec5b3159 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 - Horsham.RELEASE + Horsham.SR6 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 29ce4fd3..81ffab25 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 @@ -1,11 +1,11 @@ 4.0.0 - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.2.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 39e95c85..f1c969b9 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 - Horsham.RELEASE + Horsham.SR6 diff --git a/pom.xml b/pom.xml index bbea1f62..f1a81bfe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 2.3.2.RELEASE - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ccefbaf6..afd0221e 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index cbfbcdfe..e3b6167c 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 8c0177fa..d05bf671 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.3.1.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 09bc053a02d8394d6c92997f20f0220b1284818b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 3 Aug 2020 12:09:35 +0200 Subject: [PATCH 7/8] Fix artifact version. --- docs/pom.xml | 2 +- docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml | 4 ++-- .../spring-cloud-stream/spring-cloud-stream-tools/pom.xml | 4 ++-- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9c5d82f7..d490a8d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-build 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 47142ae8..08bb7f84 100644 --- a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml +++ b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-stream-parent - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT 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 81ffab25..a9de9b41 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 @@ -1,11 +1,11 @@ 4.0.0 - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT diff --git a/pom.xml b/pom.xml index f1a81bfe..28d681d3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 2.3.2.RELEASE - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index afd0221e..16f3a0d6 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index e3b6167c..987ca17e 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index d05bf671..f43722b7 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 80b1c9a66195825ecaeea1524e83da2f3fffc81c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 16 Nov 2020 14:14:49 +0100 Subject: [PATCH 8/8] Code for the default value --- docs/src/main/java/org/springframework/cloud/internal/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/java/org/springframework/cloud/internal/Main.java b/docs/src/main/java/org/springframework/cloud/internal/Main.java index 995f36f5..a41f2f5e 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/Main.java +++ b/docs/src/main/java/org/springframework/cloud/internal/Main.java @@ -143,7 +143,7 @@ public class Main { } public String toString() { - return "|" + name + " | " + defaultValue + " | " + description; + return "|" + name + " | `" + defaultValue + "` | " + description; } }