From cf950edf293172256a0fa560f76406ace7083732 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 28 Jan 2022 13:17:35 -0500 Subject: [PATCH 1/9] Adds .sdkmanrc --- .gitignore | 1 - .sdkmanrc | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .sdkmanrc diff --git a/.gitignore b/.gitignore index 6eb02e3..4bb61be 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ target/ *.iws .factorypath .flattened-pom.xml -.sdkmanrc diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..4db8676 --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1,3 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=8.0.292.hs-adpt From 5ee3029e444fe46245c41d5aaf598aa8ea74e9bd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 19:23:27 +0000 Subject: [PATCH 2/9] Update SNAPSHOT to 2021.0.1 --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 42 +++++++++++----------- 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 1b5c396..eb6698b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1-SNAPSHOT + 2021.0.1 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 063fefc..5cee2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.1-SNAPSHOT + 2021.0.1 org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index ec9b7fe..f44e4b9 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.0 + 3.1.1 spring-cloud-dependencies - 2021.0.1-SNAPSHOT + 2021.0.1 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 2.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.2.1 - 3.1.1-SNAPSHOT - 2.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.2.1 - 2.4.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.0 + 3.1.1 + 3.1.0 + 3.1.1 + 2.1.1 + 3.1.1 + 3.1.0 + 3.1.1 + 3.2.2 + 3.1.1 + 2.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.2.2 + 2.4.1 + 3.1.0 + 3.1.1 + 3.1.0 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 6b544df..e66de35 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.6.1 + 2.6.3 org.springframework.cloud spring-cloud-starter-parent - 2021.0.1-SNAPSHOT + 2021.0.1 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.1-SNAPSHOT + 2021.0.1 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index e2e7d45..46656ac 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1-SNAPSHOT + 2021.0.1 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 27fc7ff..2d39358 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 - 3.1.0 + 3.1.1 spring-cloud-dependencies - 2021.0.1-SNAPSHOT + 2021.0.1 spring-cloud-dependencies Spring Cloud Dependencies pom From 8cd7082686f72fca80dd3d8b7f45a9fb9f6e92ba Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 19:24:09 +0000 Subject: [PATCH 3/9] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 42 +++++++++++----------- 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 eb6698b..1b5c396 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1 + 2021.0.1-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 5cee2ae..063fefc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.1 + 2021.0.1-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.1-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index f44e4b9..ec9b7fe 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.1 + 3.1.0 spring-cloud-dependencies - 2021.0.1 + 2021.0.1-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.0 - 3.1.1 - 3.1.0 - 3.1.1 - 2.1.1 - 3.1.1 - 3.1.0 - 3.1.1 - 3.2.2 - 3.1.1 - 2.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.2.2 - 2.4.1 - 3.1.0 - 3.1.1 - 3.1.0 + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 2.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.2.1 + 3.1.1-SNAPSHOT + 2.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.2.1 + 2.4.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index e66de35..6b544df 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.6.3 + 2.6.1 org.springframework.cloud spring-cloud-starter-parent - 2021.0.1 + 2021.0.1-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.1 + 2021.0.1-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 46656ac..e2e7d45 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1 + 2021.0.1-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 2d39358..27fc7ff 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 - 3.1.1 + 3.1.0 spring-cloud-dependencies - 2021.0.1 + 2021.0.1-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 2c1f12e05aace27e02e2678c8f29a132c1767f32 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 19:24:09 +0000 Subject: [PATCH 4/9] Bumping versions to 2021.0.1.SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 40 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 6 ++-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1b5c396..d3481a8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 063fefc..5443a28 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index ec9b7fe..58244f4 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,35 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.0 + 3.1.2-SNAPSHOT spring-cloud-dependencies - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 2.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.2.1 - 3.1.1-SNAPSHOT - 2.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.2.1 - 2.4.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.1 + 3.1.0 + 3.1.2-SNAPSHOT + 2.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.0 + 3.1.2-SNAPSHOT + 3.2.2 + 3.1.2-SNAPSHOT + 2.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.2.2 + 2.4.2-SNAPSHOT + 3.1.0 + 3.1.2-SNAPSHOT + 3.1.0 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 6b544df..b2f262e 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.6.1 + 2.6.3 org.springframework.cloud spring-cloud-starter-parent - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index e2e7d45..fd885ca 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1-SNAPSHOT + 2021.0.1.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 27fc7ff..9f2f2e3 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 - 3.1.0 + 3.1.2-SNAPSHOT spring-cloud-dependencies - 2021.0.1-SNAPSHOT + 2021.0.1.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 18 Feb 2022 13:58:06 +0000 Subject: [PATCH 5/9] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-dependencies/pom.xml | 16 ++++++++-------- spring-cloud-starter-parent/pom.xml | 4 ++-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d3481a8..cc8d3aa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 5443a28..4fc50bc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 58244f4..c2a5a7a 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -9,31 +9,31 @@ spring-cloud-dependencies - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.1-SNAPSHOT - 3.1.1 - 3.1.0 + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT 3.1.2-SNAPSHOT 2.1.2-SNAPSHOT 3.1.2-SNAPSHOT - 3.1.0 + 3.1.1-SNAPSHOT 3.1.2-SNAPSHOT - 3.2.2 + 3.2.3-SNAPSHOT 3.1.2-SNAPSHOT 2.1.2-SNAPSHOT 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT - 3.2.2 + 3.2.3-SNAPSHOT 2.4.2-SNAPSHOT - 3.1.0 + 3.1.1-SNAPSHOT 3.1.2-SNAPSHOT - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index b2f262e..6033f23 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 - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index fd885ca..bc15f7c 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.1.SNAPSHOT + 2021.0.2-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 9f2f2e3..8072afa 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 - 2021.0.1.SNAPSHOT + 2021.0.2-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 1afd865c144737764f64776e82c1f73558f72193 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 31 Mar 2022 17:02:06 -0400 Subject: [PATCH 6/9] Updates boot to 2.6.6 --- spring-cloud-starter-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 6033f23..f76ba18 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.6.3 + 2.6.6 org.springframework.cloud spring-cloud-starter-parent From 8cd69a1a5e450a59eca7f1a411faa173ee2ea03f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 15 Apr 2022 10:12:15 -0400 Subject: [PATCH 7/9] Remove GPG configuration for docs profile so javadoc jars get signed --- train-docs/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/train-docs/pom.xml b/train-docs/pom.xml index bc15f7c..4ce31f0 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -119,9 +119,6 @@ org.apache.maven.plugins maven-gpg-plugin - - true - From 0cee0b1b487479d6a0c35f6020db5cefffa080de Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Apr 2022 10:38:55 -0400 Subject: [PATCH 8/9] Bumping Boot version to 2.6.7 --- spring-cloud-starter-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index f76ba18..02f6ff9 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.6.6 + 2.6.7 org.springframework.cloud spring-cloud-starter-parent From a9144c26b6f2216ceacef51a7866e36ed4a5434b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 27 Apr 2022 14:22:03 +0200 Subject: [PATCH 9/9] Bumped train-docs versions --- train-docs/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 4ce31f0..e699d6e 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -16,10 +16,10 @@ ${basedir}/.. deploy - 3.6.3 - 4.2.0 - 2.1.0 - 2.7 + 3.8.5 + 4.3.0 + 2.5.3 + 2.11.0