From ac2d3d88234950b4c7307664b0957352dc3383fc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 20:52:20 +0000 Subject: [PATCH 01/33] Update SNAPSHOT to 2021.0.2 --- 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 | 4 +-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index cc8d3aa7..55a9b703 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2-SNAPSHOT + 2021.0.2 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 4fc50bcf..1523c848 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.2-SNAPSHOT + 2021.0.2 org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c2a5a7a7..8ce5b922 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.2-SNAPSHOT + 3.1.2 spring-cloud-dependencies - 2021.0.2-SNAPSHOT + 2021.0.2 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 2.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 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.3-SNAPSHOT - 2.4.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.0 + 3.1.2 + 3.1.0 + 3.1.2 + 2.1.2 + 3.1.2 + 3.1.0 + 3.1.2 + 3.2.4 + 3.1.2 + 2.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.2.3 + 2.4.2 + 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 02f6ff9f..6ad37e78 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.2-SNAPSHOT + 2021.0.2 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.2-SNAPSHOT + 2021.0.2 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index e699d6e8..d10fd228 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2-SNAPSHOT + 2021.0.2 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 8072afa4..f9677f30 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.2-SNAPSHOT + 3.1.2 spring-cloud-dependencies - 2021.0.2-SNAPSHOT + 2021.0.2 spring-cloud-dependencies Spring Cloud Dependencies pom From a789cc2f2f5cb6137201750925288b99c30f54dd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 20:53:04 +0000 Subject: [PATCH 02/33] Going back to snapshots --- 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 | 4 +-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 55a9b703..cc8d3aa7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2 + 2021.0.2-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 1523c848..4fc50bcf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.2 + 2021.0.2-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 8ce5b922..c2a5a7a7 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.2 + 3.1.2-SNAPSHOT spring-cloud-dependencies - 2021.0.2 + 2021.0.2-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.0 - 3.1.2 - 3.1.0 - 3.1.2 - 2.1.2 - 3.1.2 - 3.1.0 - 3.1.2 - 3.2.4 - 3.1.2 - 2.1.2 - 3.1.2 - 3.1.2 - 3.1.2 - 3.2.3 - 2.4.2 - 3.1.0 - 3.1.1 - 3.1.0 + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 2.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 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.3-SNAPSHOT + 2.4.2-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 6ad37e78..02f6ff9f 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.2 + 2021.0.2-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.2 + 2021.0.2-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index d10fd228..e699d6e8 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2 + 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 f9677f30..8072afa4 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.2 + 3.1.2-SNAPSHOT spring-cloud-dependencies - 2021.0.2 + 2021.0.2-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 9709a7f0eb15744bfb2b8a89369be35281c705ea Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 20:53:04 +0000 Subject: [PATCH 03/33] Bumping versions to 2021.0.2.SNAPSHOT after release --- 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 | 4 +-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index cc8d3aa7..3877edea 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 4fc50bcf..2a2c3ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c2a5a7a7..c8391616 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.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-dependencies - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 2.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 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.3-SNAPSHOT - 2.4.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.0 + 3.1.2 + 3.1.0 + 3.1.3-SNAPSHOT + 2.1.3-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.0 + 3.1.3-SNAPSHOT + 3.2.5-SNAPSHOT + 3.1.3-SNAPSHOT + 2.1.3-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.3-SNAPSHOT + 3.2.4-SNAPSHOT + 2.4.3-SNAPSHOT + 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 02f6ff9f..b143e8a4 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.2-SNAPSHOT + 2021.0.2.SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index e699d6e8..dd03d665 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2-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 8072afa4..25b6099e 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.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-dependencies - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From e5d27ba1bf078530af2601b075fcbd3d1018bd2c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 28 Apr 2022 17:11:58 +0200 Subject: [PATCH 04/33] Don't sign train docs --- train-docs/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/train-docs/pom.xml b/train-docs/pom.xml index dd03d665..41399210 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -119,6 +119,9 @@ org.apache.maven.plugins maven-gpg-plugin + + true + From d5fe235cfd1a6ef1c84606106d937113f58d2298 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 12:54:16 -0400 Subject: [PATCH 05/33] Updates versions --- spring-cloud-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c8391616..c1fe291e 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -28,9 +28,9 @@ 2.1.3-SNAPSHOT 3.1.3-SNAPSHOT 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT 3.2.4-SNAPSHOT - 2.4.3-SNAPSHOT + 2.4.2-SNAPSHOT 3.1.0 3.1.1 3.1.0 From 0db4d8cbf44e05d84c378de7c959a22284ab7287 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 12:58:11 -0400 Subject: [PATCH 06/33] Removes libs- prefix and -local suffix --- spring-cloud-dependencies/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c1fe291e..a60e73bd 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -202,7 +202,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -210,7 +210,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -228,7 +228,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -236,7 +236,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false From 658bb63bd3609afe5f9b64bddec1cedebc7f49d7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 12:58:30 -0400 Subject: [PATCH 07/33] Removes libs- prefix and -local suffix --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2a2c3ae1..29b764ce 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -134,7 +134,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -152,7 +152,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -163,7 +163,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -171,7 +171,7 @@ spring-releases Spring Releases - https://repo.spring.io/libs-release-local + https://repo.spring.io/release false From 6f8b8c919abbbd7515766df9e98bef326274ceca Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 13:04:57 -0400 Subject: [PATCH 08/33] Updates version to 2021.0.3-SNAPSHOT --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 2 +- spring-cloud-starter-parent/pom.xml | 4 ++-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3877edea..a9301d32 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 29b764ce..ed4f9e85 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a60e73bd..8ea23de4 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-dependencies - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index b143e8a4..99bb0179 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.2.SNAPSHOT + 2021.0.3-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 41399210..040afe01 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.2.SNAPSHOT + 2021.0.3-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 25b6099e..4c503a74 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.2.SNAPSHOT + 2021.0.3-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From d066a330de747f83c2848a675cf122c80f415ec0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 5 May 2022 02:48:23 +0000 Subject: [PATCH 09/33] Bumping versions --- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ed4f9e85..65484e95 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.3-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 8ea23de4..40601755 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -16,7 +16,7 @@ ${basedir}/../.. 3.1.0 - 3.1.2 + 3.1.3-SNAPSHOT 3.1.0 3.1.3-SNAPSHOT 2.1.3-SNAPSHOT From 224f5592065ed46d90a2f50df528dc553aaa40f4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 25 May 2022 15:26:52 +0200 Subject: [PATCH 10/33] Bumped Sleuth --- 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 40601755..d2853855 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -28,7 +28,7 @@ 2.1.3-SNAPSHOT 3.1.3-SNAPSHOT 3.1.3-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT 3.2.4-SNAPSHOT 2.4.2-SNAPSHOT 3.1.0 From edd26864f7d25e86bbbb135795b4ed39b03d0cc0 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 11:59:39 -0400 Subject: [PATCH 11/33] don't deploy docs --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index a9301d32..c231b8ec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,6 +15,8 @@ spring-cloud-starters ${basedir}/.. deploy + + none From accf3c1e77679f6400d576650883802959e08b65 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 26 May 2022 12:52:59 -0400 Subject: [PATCH 12/33] updates to snapshots --- spring-cloud-dependencies/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index d2853855..137db7ce 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -17,11 +17,11 @@ ${basedir}/../.. 3.1.0 3.1.3-SNAPSHOT - 3.1.0 + 3.1.1-SNAPSHOT 3.1.3-SNAPSHOT 2.1.3-SNAPSHOT 3.1.3-SNAPSHOT - 3.1.0 + 3.1.1-SNAPSHOT 3.1.3-SNAPSHOT 3.2.5-SNAPSHOT 3.1.3-SNAPSHOT @@ -31,9 +31,9 @@ 3.1.3-SNAPSHOT 3.2.4-SNAPSHOT 2.4.2-SNAPSHOT - 3.1.0 - 3.1.1 - 3.1.0 + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT From aa33294e96817a1720f181e49688004a455f989b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 27 May 2022 12:23:28 +0200 Subject: [PATCH 13/33] Updated versions after the release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 36 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c231b8ec..558caa7a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.3-SNAPSHOT + 2021.0.4-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 65484e95..71fb00b1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.3-SNAPSHOT + 2021.0.4-SNAPSHOT org.springframework.cloud spring-cloud-build diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 137db7ce..c443c134 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-dependencies - 2021.0.3-SNAPSHOT + 2021.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom @@ -17,23 +17,23 @@ ${basedir}/../.. 3.1.0 3.1.3-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.3-SNAPSHOT - 2.1.3-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.3-SNAPSHOT - 3.2.5-SNAPSHOT - 3.1.3-SNAPSHOT - 2.1.3-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT - 3.2.4-SNAPSHOT - 2.4.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT + 3.2.6-SNAPSHOT + 3.1.4-SNAPSHOT + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.2.5-SNAPSHOT + 2.4.3-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 99bb0179..7c8f5b3d 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.3-SNAPSHOT + 2021.0.4-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.3-SNAPSHOT + 2021.0.4-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 040afe01..4ade3e1c 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.3-SNAPSHOT + 2021.0.4-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 4c503a74..4188d755 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.3-SNAPSHOT + 2021.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From a7d8ad7a1164e0474028918a07d61595e46c2b46 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 14:47:19 -0400 Subject: [PATCH 14/33] Updates versions --- pom.xml | 2 +- spring-cloud-dependencies/pom.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 71fb00b1..8d8a5a30 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c443c134..b990e8a9 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-dependencies @@ -15,13 +15,13 @@ pom ${basedir}/../.. - 3.1.0 - 3.1.3-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.3-SNAPSHOT 3.1.4-SNAPSHOT 2.1.4-SNAPSHOT 3.1.4-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT 3.1.4-SNAPSHOT 3.2.6-SNAPSHOT 3.1.4-SNAPSHOT @@ -30,8 +30,8 @@ 3.1.4-SNAPSHOT 3.1.4-SNAPSHOT 3.2.5-SNAPSHOT - 2.4.3-SNAPSHOT - 3.1.2-SNAPSHOT + 2.4.4-SNAPSHOT + 3.1.3-SNAPSHOT 3.1.3-SNAPSHOT 3.1.2-SNAPSHOT From 1b55da1b3254bfc61c4a66ca2fa69cf7c880c468 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 14:48:55 -0400 Subject: [PATCH 15/33] Updates versions --- spring-cloud-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index b990e8a9..d4a65f8c 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -21,7 +21,7 @@ 3.1.4-SNAPSHOT 2.1.4-SNAPSHOT 3.1.4-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT 3.1.4-SNAPSHOT 3.2.6-SNAPSHOT 3.1.4-SNAPSHOT @@ -31,7 +31,7 @@ 3.1.4-SNAPSHOT 3.2.5-SNAPSHOT 2.4.4-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT 3.1.3-SNAPSHOT 3.1.2-SNAPSHOT From 2ef6e415e92a358f7ab644d2bc6a2534860b7635 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 May 2022 09:03:49 +0200 Subject: [PATCH 16/33] Update pom.xml --- 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 d4a65f8c..71e3d0fb 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -30,7 +30,7 @@ 3.1.4-SNAPSHOT 3.1.4-SNAPSHOT 3.2.5-SNAPSHOT - 2.4.4-SNAPSHOT + 2.4.3-SNAPSHOT 3.1.2-SNAPSHOT 3.1.3-SNAPSHOT 3.1.2-SNAPSHOT From 063650255846b01168f6397c7ccd341915e950d0 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 May 2022 09:12:09 +0200 Subject: [PATCH 17/33] Update pom.xml --- 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 71e3d0fb..d4a65f8c 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -30,7 +30,7 @@ 3.1.4-SNAPSHOT 3.1.4-SNAPSHOT 3.2.5-SNAPSHOT - 2.4.3-SNAPSHOT + 2.4.4-SNAPSHOT 3.1.2-SNAPSHOT 3.1.3-SNAPSHOT 3.1.2-SNAPSHOT From d865f69e38a292f1a31a4c1ef60f2d5247b4eeb6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 02:48:32 +0000 Subject: [PATCH 18/33] Bumping versions --- train-docs/src/test/resources/test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 4188d755..bdfd3dcf 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-dependencies From 164958c3e7ab9147b6eff2556eef65c3aeb29da9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 16 Aug 2022 12:11:16 +0200 Subject: [PATCH 19/33] Update pom.xml --- 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 d4a65f8c..9d8d7337 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -23,7 +23,7 @@ 3.1.4-SNAPSHOT 3.1.2-SNAPSHOT 3.1.4-SNAPSHOT - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT 3.1.4-SNAPSHOT 2.1.4-SNAPSHOT 3.1.4-SNAPSHOT From 790dd20d1945dd321f87167071a5ae089158e59f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 16 Aug 2022 16:15:01 +0200 Subject: [PATCH 20/33] Prevents unzipping files outside of the target folder --- .../cloud/internal/ZipCategory.java | 22 +++++-- .../cloud/internal/ZipCategoryTests.java | 58 ++++++++++++++++++ train-docs/src/test/resources/file.zip | Bin 0 -> 171 bytes .../resources/zip/zip-malicious-traversal.zip | Bin 0 -> 545 bytes 4 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 train-docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java create mode 100644 train-docs/src/test/resources/file.zip create mode 100644 train-docs/src/test/resources/zip/zip-malicious-traversal.zip diff --git a/train-docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java b/train-docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java index b7e19fed..dccf60b0 100644 --- a/train-docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java +++ b/train-docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.zip.ZipEntry; +import java.util.zip.ZipException; import java.util.zip.ZipInputStream; import org.springframework.util.StreamUtils; @@ -53,7 +54,7 @@ private ZipCategory() { * will be unzipped to. * @return a {@link Collection} of unzipped {@link File} objects. */ - static Collection unzipTo(File self, File destination) { + public static Collection unzipTo(File self, File destination) { checkUnzipDestination(destination); // if destination directory is not given, we'll fall back to the parent directory // of 'self' @@ -65,14 +66,23 @@ static Collection unzipTo(File self, File destination) { try (ZipInputStream zipInput = new ZipInputStream(fileInputStream)) { for (ZipEntry entry = zipInput.getNextEntry(); entry != null; entry = zipInput.getNextEntry()) { if (!entry.isDirectory()) { - final File file = new File(destination, entry.getName()); - if (file.getParentFile() != null) { - file.getParentFile().mkdirs(); + final File destinationFile = new File(destination, entry.getName()); + /* + * If we see the relative traversal string of ".." we need to make sure + * that the outputdir + name doesn't leave the outputdir. + */ + String zipEntryName = entry.getName(); + if (!destinationFile.toPath().normalize().startsWith(destination.toPath())) { + throw new ZipException("The file " + zipEntryName + + " is trying to leave the target output directory of " + destination); } - try (OutputStream output = Files.newOutputStream(file.toPath())) { + if (destinationFile.getParentFile() != null) { + destinationFile.getParentFile().mkdirs(); + } + try (OutputStream output = Files.newOutputStream(destinationFile.toPath())) { StreamUtils.copy(zipInput, output); } - unzippedFiles.add(file); + unzippedFiles.add(destinationFile); } else { final File dir = new File(destination, entry.getName()); diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java new file mode 100644 index 00000000..436de29b --- /dev/null +++ b/train-docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java @@ -0,0 +1,58 @@ +/* + * Copyright 2013-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.internal; + +import java.io.File; +import java.nio.file.Files; + +import org.assertj.core.api.BDDAssertions; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +class ZipCategoryTests { + + @Test + void should_unzip_a_file_to_the_specified_location() throws Exception { + // given: + File zipFile = new File(ZipCategoryTests.class.getClassLoader().getResource("file.zip").toURI()); + File tempDir = Files.createTempDirectory("foo").toFile(); + tempDir.deleteOnExit(); + // when: + ZipCategory.unzipTo(zipFile, tempDir); + // then: + BDDAssertions.then(tempDir.listFiles()) + .hasOnlyOneElementSatisfying(file -> { + BDDAssertions.then(file).hasName("file.txt") + .hasContent("test"); + }); + } + + @Test + void should_not_allow_malicious_traversal() throws Exception { + // given: + File zipFile = new File(ZipCategoryTests.class.getClassLoader().getResource("zip/zip-malicious-traversal.zip").toURI()); + File tempDir = Files.createTempDirectory("foo").toFile(); + tempDir.deleteOnExit(); + // when: + try { + ZipCategory.unzipTo(zipFile, tempDir); + Assertions.fail("Should throw exception"); + } catch (Exception e) { + BDDAssertions.then(e.getCause()).hasMessageContaining("is trying to leave the target output directory"); + } + } +} diff --git a/train-docs/src/test/resources/file.zip b/train-docs/src/test/resources/file.zip new file mode 100644 index 0000000000000000000000000000000000000000..3da3a912405f9967ebedebe02f41ce44b66ddd5e GIT binary patch literal 171 zcmWIWW@h1H0D)76LW?TkIfXruL1mY!)AQr+{R*11^Mh1AZvVqhw0-+y}b_a17 E0OX(`8~^|S literal 0 HcmV?d00001 diff --git a/train-docs/src/test/resources/zip/zip-malicious-traversal.zip b/train-docs/src/test/resources/zip/zip-malicious-traversal.zip new file mode 100644 index 0000000000000000000000000000000000000000..38b3f499de0163e62ca15ce18350a9d9a477a51b GIT binary patch literal 545 zcmWIWW@h1H0D=Au{XYEp{-1?`Y!K#PkYPyA&ri`SsVE5z;bdU8U359h4v0%DxEUB( zzA-W|u!sQFm1JZVD*#cV0!Xz&eqJh90MJm76a&LlprHwl)s`S02)6*So}T`Ippx7I z{nWC|9FT|Lj?Pm62|-=W$Rx*%D=;L0E@xl>dYWNLBZ!3v8dgZqpan~SHzSh>Gwx6T jnE?Vz8bg8PfCLE8QsgiR@MdKLxrhk}K_2A>d6oeH^pk5C literal 0 HcmV?d00001 From 21a37e2972febf57d405e0fcdae7aba559df70bc Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 17 Aug 2022 12:45:15 -0400 Subject: [PATCH 21/33] Update boot to 2.6.8 --- 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 7c8f5b3d..fb982cc7 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.7 + 2.6.8 org.springframework.cloud spring-cloud-starter-parent From 853c058313d2d990f6ac9a66fa43060b4eb29e89 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 3 Sep 2022 02:10:37 +0000 Subject: [PATCH 22/33] Update SNAPSHOT to 2021.0.4 --- 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 558caa7a..bfdebdf3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4-SNAPSHOT + 2021.0.4 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 8d8a5a30..f372ddea 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.4-SNAPSHOT + 2021.0.4 org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.4 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 9d8d7337..55bd6bb0 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.4-SNAPSHOT + 3.1.4 spring-cloud-dependencies - 2021.0.4-SNAPSHOT + 2021.0.4 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 2.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.4-SNAPSHOT - 3.2.7-SNAPSHOT - 3.1.4-SNAPSHOT - 2.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.2.5-SNAPSHOT - 2.4.4-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.4 + 3.1.2 + 3.1.4 + 2.1.4 + 3.1.4 + 3.1.2 + 3.1.4 + 3.2.7 + 3.1.4 + 2.1.4 + 3.1.4 + 3.1.4 + 3.1.4 + 3.2.5 + 2.4.4 + 3.1.1 + 3.1.3 + 3.1.1 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index fb982cc7..bcc39451 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.8 + 2.6.11 org.springframework.cloud spring-cloud-starter-parent - 2021.0.4-SNAPSHOT + 2021.0.4 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.4-SNAPSHOT + 2021.0.4 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 4ade3e1c..3ab309f5 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4-SNAPSHOT + 2021.0.4 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 bdfd3dcf..4ddd4ed4 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.4-SNAPSHOT + 3.1.4 spring-cloud-dependencies - 2021.0.4-SNAPSHOT + 2021.0.4 spring-cloud-dependencies Spring Cloud Dependencies pom From 0536f9bcbce08849eddddaa63139032e1af98c74 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 3 Sep 2022 02:11:21 +0000 Subject: [PATCH 23/33] 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 bfdebdf3..558caa7a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4 + 2021.0.4-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index f372ddea..8d8a5a30 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.4 + 2021.0.4-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 55bd6bb0..9d8d7337 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.4 + 3.1.4-SNAPSHOT spring-cloud-dependencies - 2021.0.4 + 2021.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.2 - 3.1.4 - 3.1.2 - 3.1.4 - 2.1.4 - 3.1.4 - 3.1.2 - 3.1.4 - 3.2.7 - 3.1.4 - 2.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.2.5 - 2.4.4 - 3.1.1 - 3.1.3 - 3.1.1 + 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT + 3.2.7-SNAPSHOT + 3.1.4-SNAPSHOT + 2.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT + 3.2.5-SNAPSHOT + 2.4.4-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index bcc39451..fb982cc7 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.11 + 2.6.8 org.springframework.cloud spring-cloud-starter-parent - 2021.0.4 + 2021.0.4-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.4 + 2021.0.4-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 3ab309f5..4ade3e1c 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4 + 2021.0.4-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 4ddd4ed4..bdfd3dcf 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.4 + 3.1.4-SNAPSHOT spring-cloud-dependencies - 2021.0.4 + 2021.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 0add8658876f4f3bc82943c1df2146a1a8565ea0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 3 Sep 2022 02:11:22 +0000 Subject: [PATCH 24/33] Bumping versions to 2021.0.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 +-- 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, 27 insertions(+), 27 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 558caa7a..eeffdc37 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 8d8a5a30..7659d5b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 9d8d7337..a0bd61c5 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,34 +5,34 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 2.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.4-SNAPSHOT - 3.2.7-SNAPSHOT - 3.1.4-SNAPSHOT - 2.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT - 3.2.5-SNAPSHOT - 2.4.4-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.2 + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.8-SNAPSHOT + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.6-SNAPSHOT + 2.4.5-SNAPSHOT 3.1.2-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT 3.1.2-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index fb982cc7..4b639dba 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.8 + 2.6.11 org.springframework.cloud spring-cloud-starter-parent - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 4ade3e1c..b267c64a 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4-SNAPSHOT + 2021.0.5-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 bdfd3dcf..237a7eb7 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.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.4-SNAPSHOT + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From b02302fb4b2aa185620d75af0c5093ff0db02470 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 23:08:45 +0000 Subject: [PATCH 25/33] Update SNAPSHOT to 2021.0.4 --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 40 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index eeffdc37..bfdebdf3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.4 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 7659d5b7..f372ddea 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.5-SNAPSHOT + 2021.0.4 org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a0bd61c5..55bd6bb0 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.5-SNAPSHOT + 3.1.4 spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.4 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.3-SNAPSHOT - 3.1.5-SNAPSHOT + 3.1.2 + 3.1.4 3.1.2 - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.8-SNAPSHOT - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.6-SNAPSHOT - 2.4.5-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.4 + 2.1.4 + 3.1.4 + 3.1.2 + 3.1.4 + 3.2.7 + 3.1.4 + 2.1.4 + 3.1.4 + 3.1.4 + 3.1.4 + 3.2.5 + 2.4.4 + 3.1.1 + 3.1.3 + 3.1.1 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 4b639dba..bcc39451 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.5-SNAPSHOT + 2021.0.4 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.5-SNAPSHOT + 2021.0.4 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index b267c64a..3ab309f5 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.4 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 237a7eb7..4ddd4ed4 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.5-SNAPSHOT + 3.1.4 spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.4 spring-cloud-dependencies Spring Cloud Dependencies pom From d4615b67e942c618ea60255b011378b33ebcacc1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 23:09:25 +0000 Subject: [PATCH 26/33] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 40 +++++++++++----------- spring-cloud-starter-parent/pom.xml | 4 +-- train-docs/pom.xml | 2 +- train-docs/src/test/resources/test/pom.xml | 4 +-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bfdebdf3..eeffdc37 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4 + 2021.0.5-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index f372ddea..7659d5b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.4 + 2021.0.5-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 55bd6bb0..a0bd61c5 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.4 + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.4 + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. - 3.1.2 - 3.1.4 + 3.1.3-SNAPSHOT + 3.1.5-SNAPSHOT 3.1.2 - 3.1.4 - 2.1.4 - 3.1.4 - 3.1.2 - 3.1.4 - 3.2.7 - 3.1.4 - 2.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.2.5 - 2.4.4 - 3.1.1 - 3.1.3 - 3.1.1 + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.8-SNAPSHOT + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.6-SNAPSHOT + 2.4.5-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index bcc39451..4b639dba 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.4 + 2021.0.5-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.4 + 2021.0.5-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 3ab309f5..b267c64a 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.4 + 2021.0.5-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 4ddd4ed4..237a7eb7 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.4 + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.4 + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 68cb09c7ca2ff0dfee218270f0e66aa6f6b02948 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 23:09:25 +0000 Subject: [PATCH 27/33] Bumping versions to 2021.0.5-SNAPSHOT after release --- spring-cloud-dependencies/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a0bd61c5..6250e9c7 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -15,7 +15,7 @@ pom ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 3.1.5-SNAPSHOT 3.1.2 3.1.5-SNAPSHOT @@ -31,9 +31,9 @@ 3.1.5-SNAPSHOT 3.2.6-SNAPSHOT 2.4.5-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.1 3.1.4-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.1 From 0e57818ec79894d338c3936459fb7834eeea5f50 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 17:33:22 +0000 Subject: [PATCH 28/33] Update SNAPSHOT to 2021.0.5 --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 34 +++++++++++----------- 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 eeffdc37..d8608936 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.5 pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 7659d5b7..b89c8f09 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.5-SNAPSHOT + 2021.0.5 org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.5 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 6250e9c7..7f0230b7 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,34 +5,34 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.5-SNAPSHOT + 3.1.5 spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.5 spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.2 - 3.1.5-SNAPSHOT + 3.1.5 3.1.2 - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.8-SNAPSHOT - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.6-SNAPSHOT - 2.4.5-SNAPSHOT + 3.1.5 + 2.1.5 + 3.1.5 + 3.1.2 + 3.1.5 + 3.2.8 + 3.1.4 + 2.1.5 + 3.1.4 + 3.1.5 + 3.1.5 + 3.2.6 + 2.4.5 3.1.1 - 3.1.4-SNAPSHOT + 3.1.3 3.1.1 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 4b639dba..83b692c5 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.11 + 2.6.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5-SNAPSHOT + 2021.0.5 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.5-SNAPSHOT + 2021.0.5 diff --git a/train-docs/pom.xml b/train-docs/pom.xml index b267c64a..3abe838e 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.5 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 237a7eb7..77ce44f0 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.5-SNAPSHOT + 3.1.5 spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.5 spring-cloud-dependencies Spring Cloud Dependencies pom From 333c0a11a8a96ba50a3bdd911feed094080ac09d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 17:34:04 +0000 Subject: [PATCH 29/33] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 34 +++++++++++----------- 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 d8608936..eeffdc37 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5 + 2021.0.5-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index b89c8f09..7659d5b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.5 + 2021.0.5-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.5 + 3.1.5-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 7f0230b7..6250e9c7 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,34 +5,34 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.5 + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.5 + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.2 - 3.1.5 + 3.1.5-SNAPSHOT 3.1.2 - 3.1.5 - 2.1.5 - 3.1.5 - 3.1.2 - 3.1.5 - 3.2.8 - 3.1.4 - 2.1.5 - 3.1.4 - 3.1.5 - 3.1.5 - 3.2.6 - 2.4.5 + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.8-SNAPSHOT + 3.1.5-SNAPSHOT + 2.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.6-SNAPSHOT + 2.4.5-SNAPSHOT 3.1.1 - 3.1.3 + 3.1.4-SNAPSHOT 3.1.1 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 83b692c5..4b639dba 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.13 + 2.6.11 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2021.0.5-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.5 + 2021.0.5-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index 3abe838e..b267c64a 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5 + 2021.0.5-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 77ce44f0..237a7eb7 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.5 + 3.1.5-SNAPSHOT spring-cloud-dependencies - 2021.0.5 + 2021.0.5-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 80510243b7e3833b72fa608b5661a48212bc0dc3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 17:34:04 +0000 Subject: [PATCH 30/33] Bumping versions to 2021.0.6-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 34 +++++++++++----------- 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 eeffdc37..fa4f8ccb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT pom Spring Cloud Starter Docs diff --git a/pom.xml b/pom.xml index 7659d5b7..32e20674 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 6250e9c7..c8ed01db 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,34 +5,34 @@ org.springframework.cloud spring-cloud-dependencies-parent - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom ${basedir}/../.. 3.1.2 - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT 3.1.2 - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.8-SNAPSHOT - 3.1.5-SNAPSHOT - 2.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT - 3.2.6-SNAPSHOT - 2.4.5-SNAPSHOT + 3.1.6-SNAPSHOT + 2.1.6-SNAPSHOT + 3.1.6-SNAPSHOT + 3.1.2 + 3.1.6-SNAPSHOT + 3.2.9-SNAPSHOT + 3.1.4 + 2.1.6-SNAPSHOT + 3.1.4 + 3.1.6-SNAPSHOT + 3.1.6-SNAPSHOT + 3.2.7-SNAPSHOT + 2.4.6-SNAPSHOT 3.1.1 - 3.1.4-SNAPSHOT + 3.1.3 3.1.1 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 4b639dba..2c2c4e96 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.11 + 2.6.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -20,7 +20,7 @@ ${basedir}/../.. - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT diff --git a/train-docs/pom.xml b/train-docs/pom.xml index b267c64a..de7ca70c 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2021.0.5-SNAPSHOT + 2021.0.6-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 237a7eb7..dea24bab 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.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-dependencies - 2021.0.5-SNAPSHOT + 2021.0.6-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom From 188ba673871eaa6291b27be62e58d042058e19a3 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 28 Nov 2022 12:07:51 -0500 Subject: [PATCH 31/33] Moves projects to snapshots --- spring-cloud-dependencies/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index c8ed01db..4cb15d68 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -15,25 +15,25 @@ pom ${basedir}/../.. - 3.1.2 + 3.1.3-SNAPSHOT 3.1.6-SNAPSHOT - 3.1.2 + 3.1.3-SNAPSHOT 3.1.6-SNAPSHOT 2.1.6-SNAPSHOT 3.1.6-SNAPSHOT - 3.1.2 + 3.1.3-SNAPSHOT 3.1.6-SNAPSHOT 3.2.9-SNAPSHOT - 3.1.4 + 3.1.5-SNAPSHOT 2.1.6-SNAPSHOT - 3.1.4 + 3.1.5-SNAPSHOT 3.1.6-SNAPSHOT 3.1.6-SNAPSHOT 3.2.7-SNAPSHOT 2.4.6-SNAPSHOT - 3.1.1 + 3.1.2-SNAPSHOT 3.1.3 - 3.1.1 + 3.1.2-SNAPSHOT From 55f92ff863c185caf81f474702d37b73992f7156 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 20 Dec 2022 12:04:14 -0500 Subject: [PATCH 32/33] updates zookeeper to 3.1.4-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 4cb15d68..d250677e 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -32,7 +32,7 @@ 3.2.7-SNAPSHOT 2.4.6-SNAPSHOT 3.1.2-SNAPSHOT - 3.1.3 + 3.1.4-SNAPSHOT 3.1.2-SNAPSHOT From dd371879d6786a9ce4b85c23e1f7564fe251e499 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 7 Feb 2023 16:37:39 +0100 Subject: [PATCH 33/33] Skipping gpg and standard deploy for release train docs --- train-docs/pom.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/train-docs/pom.xml b/train-docs/pom.xml index de7ca70c..74588690 100644 --- a/train-docs/pom.xml +++ b/train-docs/pom.xml @@ -20,6 +20,9 @@ 4.3.0 2.5.3 2.11.0 + + none + none @@ -115,13 +118,9 @@ maven-deploy-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - - true - + + deploy-file +