From 7a5a804a907bd6f0610282eb38439b94454db934 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:04:32 +0000 Subject: [PATCH 01/22] Update SNAPSHOT to Hoxton.SR6 --- README.adoc | 3 +- docs/pom.xml | 2 +- pom.xml | 4 +- spring-cloud-dependencies/pom.xml | 46 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 44 ++++++++++----------- 7 files changed, 53 insertions(+), 54 deletions(-) diff --git a/README.adoc b/README.adoc index 0f8f65a..2c73e76 100644 --- a/README.adoc +++ b/README.adoc @@ -4,7 +4,6 @@ Manual changes to this file will be lost when it is generated again. Edit the files in the src/main/asciidoc/ directory instead. //// - Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or @@ -236,4 +235,4 @@ and for Maven Central use $ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2 ---- -(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). +(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index ce174fd..f708a10 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 16dcbde..eb3ec63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.0.RELEASE diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c1d3d8c..11d72b2 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.0.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.7.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.2.3.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - Horsham.SR5 + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.3.0.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + 1.0.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 3.0.8.RELEASE + 2.2.3.RELEASE + 1.2.3.RELEASE + 1.1.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + Horsham.SR6 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.1.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index cb3ca11..f90481c 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.1.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 90c2362..75f7574 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index cc367cd..b85b868 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,36 +5,36 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.0.0-SNAPSHOT + 2.3.0.RELEASE spring-cloud-dependencies - 2020.0.0-SNAPSHOT + Hoxton.SR6 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 1.2.3-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 2.3.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT + 2.2.2.RELEASE + 2.3.0.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + 1.0.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 3.0.8.RELEASE + 2.2.3.RELEASE + 1.1.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + Horsham.SR6 + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.1.RELEASE From d89a8c3021906786aeea475dd02e267d64edc550 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:07:15 +0000 Subject: [PATCH 02/22] Going back to snapshots --- README.adoc | 3 +- docs/pom.xml | 2 +- pom.xml | 4 +- spring-cloud-dependencies/pom.xml | 46 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 44 ++++++++++----------- 7 files changed, 54 insertions(+), 53 deletions(-) diff --git a/README.adoc b/README.adoc index 2c73e76..0f8f65a 100644 --- a/README.adoc +++ b/README.adoc @@ -4,6 +4,7 @@ Manual changes to this file will be lost when it is generated again. Edit the files in the src/main/asciidoc/ directory instead. //// + Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or @@ -235,4 +236,4 @@ and for Maven Central use $ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2 ---- -(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). \ No newline at end of file +(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). diff --git a/docs/pom.xml b/docs/pom.xml index f708a10..ce174fd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index eb3ec63..16dcbde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 11d72b2..c1d3d8c 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.2.RELEASE - 2.2.2.RELEASE - 2.3.0.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - 1.0.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 3.0.8.RELEASE - 2.2.3.RELEASE - 1.2.3.RELEASE - 1.1.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - Horsham.SR6 + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 3.0.7.RELEASE + 2.2.4.BUILD-SNAPSHOT + 1.2.3.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + Horsham.SR5 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.1.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index f90481c..cb3ca11 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.3.0.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 75f7574..90c2362 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index b85b868..cc367cd 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,36 +5,36 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.0.RELEASE + 3.0.0-SNAPSHOT spring-cloud-dependencies - Hoxton.SR6 + 2020.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.2.RELEASE - 2.3.0.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - 1.0.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 3.0.8.RELEASE - 2.2.3.RELEASE - 1.1.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - Horsham.SR6 - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.1.RELEASE + 1.2.3-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 2.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT + 3.0.0-SNAPSHOT + 2.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT + 2.3.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT From f290394a0931edd451b07847db456007ec1e1d97 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:07:15 +0000 Subject: [PATCH 03/22] Bumping versions to Hoxton.SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 +- spring-cloud-dependencies/pom.xml | 46 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 44 ++++++++++----------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ce174fd..b9577b0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 16dcbde..ec06819 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c1d3d8c..79f0af7 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.1.SNAPSHOT spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.7.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.2.3.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - Horsham.SR5 + 2.2.3.SNAPSHOT + 2.2.3.SNAPSHOT + 2.3.1.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.4.SNAPSHOT + 1.0.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 3.0.8.RELEASE + 2.2.4.SNAPSHOT + 1.2.4.SNAPSHOT + 1.1.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.4.SNAPSHOT + Horsham.SR6 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.1.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index cb3ca11..cc0b6b9 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.1.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 90c2362..132cdf6 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index cc367cd..fae5550 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,36 +5,36 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.0.0-SNAPSHOT + 2.3.1.SNAPSHOT spring-cloud-dependencies - 2020.0.0-SNAPSHOT + Hoxton.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 1.2.3-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 2.3.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT + 2.2.3.SNAPSHOT + 2.3.1.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.4.SNAPSHOT + 1.0.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 3.0.8.RELEASE + 2.2.4.SNAPSHOT + 1.1.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.4.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.4.SNAPSHOT + Horsham.SR6 + 2.2.3.RELEASE + 2.2.4.SNAPSHOT + 2.2.3.SNAPSHOT + 2.2.1.RELEASE From 1f07f91319821058bc3f62a1daab4ccf000c24f0 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 23 Jun 2020 14:17:52 -0400 Subject: [PATCH 04/22] fixes snapshot suffixes --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 42 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 36 +++++++++---------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b9577b0..ce174fd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index ec06819..16dcbde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.SNAPSHOT + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 79f0af7..67de29f 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.SNAPSHOT + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.SNAPSHOT - 2.2.3.SNAPSHOT - 2.3.1.SNAPSHOT - 2.2.3.SNAPSHOT - 2.2.4.SNAPSHOT - 1.0.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 3.0.8.RELEASE - 2.2.4.SNAPSHOT - 1.2.4.SNAPSHOT - 1.1.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.3.SNAPSHOT - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT Horsham.SR6 2.2.3.RELEASE - 2.2.4.SNAPSHOT - 2.2.3.SNAPSHOT - 2.2.1.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index cc0b6b9..71b9b88 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-starter-parent - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 132cdf6..90c2362 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index fae5550..fc3f97c 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.SNAPSHOT + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.SNAPSHOT - 2.3.1.SNAPSHOT - 2.2.3.SNAPSHOT - 2.2.4.SNAPSHOT - 1.0.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 3.0.8.RELEASE - 2.2.4.SNAPSHOT - 1.1.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.4.SNAPSHOT - 2.2.3.SNAPSHOT - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT Horsham.SR6 2.2.3.RELEASE - 2.2.4.SNAPSHOT - 2.2.3.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT 2.2.1.RELEASE From 79bdd888aaed320f45a5694661e08134eeaad035 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:33:06 +0000 Subject: [PATCH 05/22] Update SNAPSHOT to Hoxton.SR6 --- README.adoc | 3 +- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 42 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 36 +++++++++---------- 7 files changed, 46 insertions(+), 47 deletions(-) diff --git a/README.adoc b/README.adoc index 0f8f65a..2c73e76 100644 --- a/README.adoc +++ b/README.adoc @@ -4,7 +4,6 @@ Manual changes to this file will be lost when it is generated again. Edit the files in the src/main/asciidoc/ directory instead. //// - Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or @@ -236,4 +235,4 @@ and for Maven Central use $ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2 ---- -(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). +(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index ce174fd..f708a10 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 16dcbde..eb3ec63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.0.RELEASE diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 67de29f..11d72b2 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.0.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.3.0.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + 1.0.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.3.RELEASE + 1.2.3.RELEASE + 1.1.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE Horsham.SR6 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.1.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 71b9b88..f90481c 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 90c2362..75f7574 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index fc3f97c..b85b868 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.0.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.2.RELEASE + 2.3.0.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE + 1.0.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.3.RELEASE + 1.1.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.3.RELEASE Horsham.SR6 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE 2.2.1.RELEASE From ebf2e098c87a08ae5c9793c56b658681358cb271 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:33:52 +0000 Subject: [PATCH 06/22] Going back to snapshots --- README.adoc | 3 +- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 42 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 36 +++++++++---------- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/README.adoc b/README.adoc index 2c73e76..0f8f65a 100644 --- a/README.adoc +++ b/README.adoc @@ -4,6 +4,7 @@ Manual changes to this file will be lost when it is generated again. Edit the files in the src/main/asciidoc/ directory instead. //// + Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or @@ -235,4 +236,4 @@ and for Maven Central use $ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2 ---- -(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). \ No newline at end of file +(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent). diff --git a/docs/pom.xml b/docs/pom.xml index f708a10..ce174fd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index eb3ec63..16dcbde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 11d72b2..67de29f 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.2.RELEASE - 2.2.2.RELEASE - 2.3.0.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - 1.0.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 3.0.8.RELEASE - 2.2.3.RELEASE - 1.2.3.RELEASE - 1.1.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE + 2.2.4.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT Horsham.SR6 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.1.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index f90481c..71b9b88 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-starter-parent - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 75f7574..90c2362 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index b85b868..fc3f97c 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR6 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.2.RELEASE - 2.3.0.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE - 1.0.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 3.0.8.RELEASE - 2.2.3.RELEASE - 1.1.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.3.RELEASE + 2.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT Horsham.SR6 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT 2.2.1.RELEASE From 8e3bed69aea50b5467c3f5a0d10e0667e0f390af Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jun 2020 18:33:52 +0000 Subject: [PATCH 07/22] Bumping versions to Hoxton.BUILD-SNAPSHOT after release --- spring-cloud-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 67de29f..d667b3b 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -36,7 +36,7 @@ 2.2.3.RELEASE 2.2.4.BUILD-SNAPSHOT 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.1.RELEASE From 6d60e974c9f0e454e6c11da99a61bd4cdcfcdea9 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 24 Jun 2020 10:24:01 -0400 Subject: [PATCH 08/22] Changes packaging to pom --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index ce174fd..fcd5fcb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ spring-cloud-starter-build Hoxton.BUILD-SNAPSHOT - jar + pom Spring Cloud Starter Docs Spring Cloud Docs From cb5a191fe0ec25d7138f1cd8acb5366fac88c1bf Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 25 Jun 2020 12:50:43 +0200 Subject: [PATCH 09/22] Fixed broken tests --- .../GenerateReleaseTrainDocsTests.java | 26 +++++++------ train-docs/src/test/resources/test/pom.xml | 39 +++++++++---------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index 1abe59c..da697a3 100644 --- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -38,16 +38,19 @@ public class GenerateReleaseTrainDocsTests { List projects = new GenerateReleaseTrainDocs() .mavenPropertiesToDocsProjects(testPom); - BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-bus", - "spring-cloud-build", "spring-cloud-cloudfoundry", "spring-cloud-commons", - "spring-cloud-circuitbreaker", "spring-cloud-config", - "spring-cloud-consul", "spring-cloud-contract", "spring-cloud-function", - "spring-cloud-gateway", "spring-cloud-kubernetes", "spring-cloud-netflix", - "spring-cloud-openfeign", "spring-cloud-security", "spring-cloud-sleuth", - "spring-cloud-task", "spring-cloud-vault", "spring-cloud-zookeeper", - "spring-cloud-cli"); + BDDAssertions.then(projects).extracting("name").containsOnly( + "spring-cloud-foo-bus", "spring-cloud-foo-build", + "spring-cloud-foo-cloudfoundry", "spring-cloud-foo-commons", + "spring-cloud-foo-circuitbreaker", "spring-cloud-foo-config", + "spring-cloud-foo-consul", "spring-cloud-foo-contract", + "spring-cloud-foo-function", "spring-cloud-foo-gateway", + "spring-cloud-foo-kubernetes", "spring-cloud-foo-netflix", + "spring-cloud-foo-openfeign", "spring-cloud-foo-security", + "spring-cloud-foo-sleuth", "spring-cloud-foo-task", + "spring-cloud-foo-vault", "spring-cloud-foo-zookeeper", + "spring-cloud-foo-cli"); BDDAssertions.then(projects) - .contains(new Project("spring-cloud-bus", "1.2.3-SNAPSHOT")); + .contains(new Project("spring-cloud-foo-bus", "2.2.3.BUILD-SNAPSHOT")); } @Test @@ -68,8 +71,9 @@ public class GenerateReleaseTrainDocsTests { void should_generate_adocs_from_templates() { File file = new File("target/test-train-docs"); FileSystemUtils.deleteRecursively(file); - List projects = Arrays.asList(new Project("spring-cloud-foo", "1.0.0"), - new Project("spring-cloud-bar", "2.0.0"), + List projects = Arrays.asList( + new Project("spring-cloud-foo-foo", "1.0.0"), + new Project("spring-cloud-foo-bar", "2.0.0"), new Project("spring-boot", "3.0.0"), new Project("spring-cloud", "4.0.0")); List configurationProperties = Arrays.asList( diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index fc3f97c..e7c3257 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -15,26 +15,25 @@ pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - Horsham.SR6 - 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.1.RELEASE + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 3.0.8.RELEASE + 2.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.1.RELEASE From 3ca35675bcc70854524aa4494f433df9627f797b Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 20 Jul 2020 10:41:51 -0400 Subject: [PATCH 10/22] Bumping to Horsham.BUILD-SNAPSHOT --- spring-cloud-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index d667b3b..346eaa9 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -32,7 +32,7 @@ 2.2.4.BUILD-SNAPSHOT 2.2.3.BUILD-SNAPSHOT 2.2.4.BUILD-SNAPSHOT - Horsham.SR6 + Horsham.BUILD-SNAPSHOT 2.2.3.RELEASE 2.2.4.BUILD-SNAPSHOT 2.2.3.BUILD-SNAPSHOT From 058ad089c3eac5074d5073af84cc36abee1bcb51 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 31 Jul 2020 16:42:27 +0200 Subject: [PATCH 11/22] Removed the dep --- train-docs/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 90c2362..a3cb769 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -42,12 +42,6 @@ ${commons-io.version} - - org.springframework.cloud - spring-cloud-starter-docs - ${project.version} - test - org.springframework.boot spring-boot-starter-test From 494b157af83816b1d954e363d5b307d4d5a0000b Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 31 Jul 2020 18:28:07 -0400 Subject: [PATCH 12/22] Changes test pom to release versions --- .../GenerateReleaseTrainDocsTests.java | 2 +- train-docs/src/test/resources/test/pom.xml | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index da697a3..e00e3f5 100644 --- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -50,7 +50,7 @@ public class GenerateReleaseTrainDocsTests { "spring-cloud-foo-vault", "spring-cloud-foo-zookeeper", "spring-cloud-foo-cli"); BDDAssertions.then(projects) - .contains(new Project("spring-cloud-foo-bus", "2.2.3.BUILD-SNAPSHOT")); + .contains(new Project("spring-cloud-foo-bus", "2.2.3.RELEASE")); } @Test diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index e7c3257..2241fc9 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,34 +5,34 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.RELEASE spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.3.1.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE + 1.0.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE + 1.1.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.4.RELEASE + 2.2.3.RELEASE 2.2.1.RELEASE From 19dd46f650cec1a16ab26869b627393ab1da84d5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 22:30:10 +0000 Subject: [PATCH 13/22] Update SNAPSHOT to Hoxton.SR7 --- docs/pom.xml | 2 +- pom.xml | 4 +- spring-cloud-dependencies/pom.xml | 46 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fcd5fcb..343e833 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 16dcbde..5485fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 346eaa9..9985e6d 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.3.1.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE + 1.0.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.9.RELEASE + 2.2.4.RELEASE + 1.2.4.RELEASE + 1.1.5.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + Horsham.SR7 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.1.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 71b9b88..ced817a 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.3.2.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index a3cb769..9acb36f 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 2241fc9..0d8d223 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -9,7 +9,7 @@ spring-cloud-dependencies - Hoxton.RELEASE + Hoxton.SR7 spring-cloud-dependencies Spring Cloud Dependencies pom From 29b3c6d869644de821fe1a34d23c60584c0b4aa6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 22:30:58 +0000 Subject: [PATCH 14/22] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 +- spring-cloud-dependencies/pom.xml | 46 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 343e833..fcd5fcb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 5485fe7..16dcbde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 9985e6d..346eaa9 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.3.1.RELEASE - 2.2.3.RELEASE - 2.2.4.RELEASE - 1.0.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 3.0.9.RELEASE - 2.2.4.RELEASE - 1.2.4.RELEASE - 1.1.5.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - Horsham.SR7 + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 3.0.8.RELEASE + 2.2.4.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT + 1.1.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT 2.2.3.RELEASE - 2.2.4.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.1.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index ced817a..71b9b88 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.1.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 9acb36f..a3cb769 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 0d8d223..2241fc9 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -9,7 +9,7 @@ spring-cloud-dependencies - Hoxton.SR7 + Hoxton.RELEASE spring-cloud-dependencies Spring Cloud Dependencies pom From e5ad0d3851b4862df6423256b67646308646319d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 22:30:58 +0000 Subject: [PATCH 15/22] Bumping versions to Hoxton.BUILD-SNAPSHOT after release --- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 44 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 16dcbde..e4384b5 100644 --- a/pom.xml +++ b/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/pom.xml b/spring-cloud-dependencies/pom.xml index 346eaa9..458ce45 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.BUILD-SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies @@ -15,28 +15,28 @@ pom ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 1.0.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.8.RELEASE - 2.2.4.BUILD-SNAPSHOT - 1.2.4.BUILD-SNAPSHOT - 1.1.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.3.1.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 1.0.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 3.0.9.RELEASE + 2.2.5.BUILD-SNAPSHOT + 1.2.5.BUILD-SNAPSHOT + 1.1.6.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + Horsham.SR7 2.2.3.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.1.RELEASE + 2.2.5.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 71b9b88..a918c0f 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.3.2.RELEASE org.springframework.cloud spring-cloud-starter-parent diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 2241fc9..c5957f4 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.RELEASE + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 8db24efe4b54ed1c56bc6c43bf7f8bfb2a8dca8e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:41:07 +0000 Subject: [PATCH 16/22] Update SNAPSHOT to Hoxton.SR8 --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 44 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fcd5fcb..e876ade 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index e4384b5..da2ea2c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 458ce45..a65c554 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE + 2.2.3.RELEASE 2.3.1.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 1.0.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 3.0.9.RELEASE - 2.2.5.BUILD-SNAPSHOT - 1.2.5.BUILD-SNAPSHOT - 1.1.6.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.3.RELEASE + 2.2.5.RELEASE + 1.0.4.RELEASE + 2.2.5.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.10.RELEASE + 2.2.5.RELEASE + 1.2.5.RELEASE + 1.1.6.RELEASE + 2.2.5.RELEASE + 2.2.5.RELEASE + 2.2.4.RELEASE + 2.2.5.RELEASE + Horsham.SR8 2.2.3.RELEASE - 2.2.5.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.5.RELEASE + 2.2.3.RELEASE + 2.2.2.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index a918c0f..0dd50c1 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.3.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index a3cb769..45a4788 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index c5957f4..9d72d73 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR8 spring-cloud-dependencies Spring Cloud Dependencies pom From 0843d59d2302c30bce08837a3fa595b57c61163a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:41:57 +0000 Subject: [PATCH 17/22] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 44 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e876ade..fcd5fcb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index da2ea2c..e4384b5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a65c554..458ce45 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.4.RELEASE - 2.2.3.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 2.3.1.RELEASE - 2.2.3.RELEASE - 2.2.5.RELEASE - 1.0.4.RELEASE - 2.2.5.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 3.0.10.RELEASE - 2.2.5.RELEASE - 1.2.5.RELEASE - 1.1.6.RELEASE - 2.2.5.RELEASE - 2.2.5.RELEASE - 2.2.4.RELEASE - 2.2.5.RELEASE - Horsham.SR8 + 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 1.0.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 3.0.9.RELEASE + 2.2.5.BUILD-SNAPSHOT + 1.2.5.BUILD-SNAPSHOT + 1.1.6.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + Horsham.SR7 2.2.3.RELEASE - 2.2.5.RELEASE - 2.2.3.RELEASE - 2.2.2.RELEASE + 2.2.5.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 0dd50c1..a918c0f 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.3.RELEASE + 2.3.2.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 45a4788..a3cb769 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 9d72d73..c5957f4 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR8 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 09ad21636aba594cb2dbe08cd864031432ce1802 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:41:57 +0000 Subject: [PATCH 18/22] Bumping versions to Hoxton.BUILD-SNAPSHOT after release --- spring-cloud-dependencies/pom.xml | 40 ++++++++++++++--------------- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 458ce45..8d86d30 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -15,28 +15,28 @@ pom ${basedir}/../.. - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.3.RELEASE 2.3.1.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 1.0.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 3.0.9.RELEASE - 2.2.5.BUILD-SNAPSHOT - 1.2.5.BUILD-SNAPSHOT - 1.1.6.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.3.RELEASE + 2.2.6.BUILD-SNAPSHOT + 1.0.4.RELEASE + 2.2.6.BUILD-SNAPSHOT + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.10.RELEASE + 2.2.6.BUILD-SNAPSHOT + 1.2.6.BUILD-SNAPSHOT + 1.1.7.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.4.RELEASE + 2.2.6.BUILD-SNAPSHOT + Horsham.SR8 2.2.3.RELEASE - 2.2.5.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index a918c0f..90d5e8c 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.3.RELEASE org.springframework.cloud spring-cloud-starter-parent From 2c91c04d3d296e237ec48f7cb99c1eaf5589b58a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:55:33 +0000 Subject: [PATCH 19/22] Update SNAPSHOT to Hoxton.SR9 --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 36 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 ++-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fcd5fcb..312c4a6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index e4384b5..eb19c95 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 8d86d30..e7f6518 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE 2.2.3.RELEASE 2.3.1.RELEASE 2.2.3.RELEASE - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE 1.0.4.RELEASE - 2.2.6.BUILD-SNAPSHOT - 2.2.4.RELEASE - 2.2.4.RELEASE - 3.0.10.RELEASE - 2.2.6.BUILD-SNAPSHOT - 1.2.6.BUILD-SNAPSHOT - 1.1.7.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE + 2.2.5.RELEASE + 2.2.5.RELEASE + 3.0.11.RELEASE + 2.2.6.RELEASE + 1.2.6.RELEASE + 1.1.7.RELEASE + 2.2.6.RELEASE + 2.2.6.RELEASE 2.2.4.RELEASE - 2.2.6.BUILD-SNAPSHOT - Horsham.SR8 + 2.2.6.RELEASE + Horsham.SR9 2.2.3.RELEASE - 2.2.6.BUILD-SNAPSHOT - 2.2.3.RELEASE - 2.2.2.RELEASE + 2.2.6.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 90d5e8c..146badb 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.3.RELEASE + 2.3.5.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index a3cb769..507fef5 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index c5957f4..331ee3b 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-dependencies - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 spring-cloud-dependencies Spring Cloud Dependencies pom From 79050a7b0f65093eb74ff6c08efc89fe06e36590 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:56:42 +0000 Subject: [PATCH 20/22] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 36 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 ++-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 312c4a6..fcd5fcb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index eb19c95..e4384b5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index e7f6518..8d86d30 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,38 +5,38 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT 2.2.3.RELEASE 2.3.1.RELEASE 2.2.3.RELEASE - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT 1.0.4.RELEASE - 2.2.6.RELEASE - 2.2.5.RELEASE - 2.2.5.RELEASE - 3.0.11.RELEASE - 2.2.6.RELEASE - 1.2.6.RELEASE - 1.1.7.RELEASE - 2.2.6.RELEASE - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.10.RELEASE + 2.2.6.BUILD-SNAPSHOT + 1.2.6.BUILD-SNAPSHOT + 1.1.7.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 2.2.4.RELEASE - 2.2.6.RELEASE - Horsham.SR9 + 2.2.6.BUILD-SNAPSHOT + Horsham.SR8 2.2.3.RELEASE - 2.2.6.RELEASE - 2.2.4.RELEASE - 2.2.3.RELEASE + 2.2.6.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 146badb..90d5e8c 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,11 +5,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.3.RELEASE org.springframework.cloud spring-cloud-starter-parent - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 507fef5..a3cb769 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT jar Spring Cloud Release Train Docs diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 331ee3b..c5957f4 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-dependencies - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 17aa219a0d2300c3b0ae938279cfb66dd8673086 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:56:42 +0000 Subject: [PATCH 21/22] Bumping versions to Hoxton.BUILD-SNAPSHOT after release --- spring-cloud-dependencies/pom.xml | 32 ++++++++++++++--------------- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 8d86d30..caf348e 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -15,28 +15,28 @@ pom ${basedir}/../.. - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 2.2.3.RELEASE 2.3.1.RELEASE 2.2.3.RELEASE - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT 1.0.4.RELEASE - 2.2.6.BUILD-SNAPSHOT - 2.2.4.RELEASE - 2.2.4.RELEASE - 3.0.10.RELEASE - 2.2.6.BUILD-SNAPSHOT - 1.2.6.BUILD-SNAPSHOT - 1.1.7.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 3.0.11.RELEASE + 2.2.7.BUILD-SNAPSHOT + 1.2.7.BUILD-SNAPSHOT + 1.1.8.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT 2.2.4.RELEASE - 2.2.6.BUILD-SNAPSHOT - Horsham.SR8 + 2.2.7.BUILD-SNAPSHOT + Horsham.SR9 2.2.3.RELEASE - 2.2.6.BUILD-SNAPSHOT - 2.2.3.RELEASE - 2.2.2.RELEASE + 2.2.7.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 90d5e8c..863b5b2 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.3.RELEASE + 2.3.5.RELEASE org.springframework.cloud spring-cloud-starter-parent From ac966b7be5a68cfdb1fdfce3b36c41a707f5a596 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 16 Nov 2020 14:08:52 +0100 Subject: [PATCH 22/22] Added guards on config splitting and default value is now code --- .../internal/ConfigurationPropertiesAggregator.java | 13 +++++++++++-- .../templates/spring-cloud/configprops.hbs | 2 +- .../internal/GenerateReleaseTrainDocsTests.java | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java b/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java index b4f3b8a..04006f0 100644 --- a/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java +++ b/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java @@ -43,9 +43,18 @@ class ConfigurationPropertiesAggregator { // |foo|bar|baz -> foo|bar|baz -> split -> // foo,bar,baz String[] strings = s.substring(1).split("\\|"); + if (strings.length == 3) { + return new ConfigurationProperty( + strings[0].trim(), strings[1].trim(), + strings[2].trim()); + } + else if (strings.length == 2) { + return new ConfigurationProperty( + strings[0].trim(), strings[1].trim(), + ""); + } return new ConfigurationProperty( - strings[0].trim(), strings[1].trim(), - strings[2].trim()); + strings[0].trim(), "", ""); }); } catch (IOException e) { diff --git a/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs b/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs index 267b519..c292132 100644 --- a/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs +++ b/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs @@ -1,7 +1,7 @@ |=== |Name | Default | Description -{{#each properties}} |{{name}} | {{defaultValue}} | {{description}} +{{#each properties}} |{{name}} | `{{defaultValue}}` | {{description}} {{/each}} |=== \ No newline at end of file diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index e00e3f5..9a50f32 100644 --- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -104,7 +104,7 @@ public class GenerateReleaseTrainDocsTests { BDDAssertions.then(generatedAdocs).isNotEmptyDirectory(); BDDAssertions.then(configProps(generatedAdocs)).contains( - "|spring.sleuth.async.configurer.enabled | true | Enable default AsyncConfigurer."); + "|spring.sleuth.async.configurer.enabled | `true` | Enable default AsyncConfigurer."); } private String configProps(File file) throws IOException {