From 3ee87c197d6a12b4625a462460e998483bee621c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Jun 2022 10:46:34 +0000 Subject: [PATCH 01/11] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml | 2 +- .../spring-cloud-launcher-stubrunner/pom.xml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 225884fb..ab986fed 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT jar Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index 0ebab1b9..d855e960 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.4-SNAPSHOT pom @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.6.7 - 2021.0.2-SNAPSHOT + 2021.0.4-SNAPSHOT spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index da016657..b6b891a4 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 7f3b309e..08ea6378 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index a48de76a..988bc5ec 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 141adefb..865aa5ae 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index dc14d422..86b5210f 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 74bb0390..939e615e 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 5b96b1e6..73145a02 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index 64ff9582..3a76992f 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 52d0e03b..ddefb188 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 6e3c45a6..85dd2dd4 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index 0b1ad1e6..f2c18f6b 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT From bbba4f218f5c81538846b42718a2f2f3ee912c15 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 18 Aug 2022 10:46:37 +0000 Subject: [PATCH 02/11] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d855e960..a692c50b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ cli spring-cloud-cli ${basedir}/.. - 2.6.7 + 2.6.8 2021.0.4-SNAPSHOT From 5b1d808c680956affbdaff830c7cc77dbf7a30b8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 10:46:42 +0000 Subject: [PATCH 03/11] Bumping versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a692c50b..f4c077d3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.6.8 - 2021.0.4-SNAPSHOT + 2.6.11 + 2021.0.5-SNAPSHOT spring-cloud-launcher From dd1de472d47f2f69648c5daaecb5a91b60646e95 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Nov 2022 10:46:48 +0000 Subject: [PATCH 04/11] Bumping versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f4c077d3..a184162b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT pom @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.6.11 - 2021.0.5-SNAPSHOT + 2.6.13 + 2021.0.6-SNAPSHOT spring-cloud-launcher From fecb256a7d59f5bd77512318fe3a14a74b26e87d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sun, 26 Feb 2023 10:41:53 +0000 Subject: [PATCH 05/11] Bumping versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a184162b..8e807d85 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT pom @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.6.13 - 2021.0.6-SNAPSHOT + 2.6.14 + 2021.0.7-SNAPSHOT spring-cloud-launcher From a2ef33c3cfbd1bb061aff5f480ea4c0aeaf8565c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sun, 30 Apr 2023 10:42:12 +0000 Subject: [PATCH 06/11] Bumping versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8e807d85..92d41b01 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT pom @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.6.14 - 2021.0.7-SNAPSHOT + 2021.0.8-SNAPSHOT spring-cloud-launcher From dfd16b0297fc7a72e9c375ae8540e4a3c31af903 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:43:03 -0400 Subject: [PATCH 07/11] Fixing includes --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 4 ++-- docs/src/main/asciidoc/spring-cloud-cli.adoc | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index d9316002..39dad130 100644 --- a/README.adoc +++ b/README.adoc @@ -50,7 +50,7 @@ in the JRE lib/security directory with the ones that you downloaded). == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index d973af43..1239ce09 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -8,8 +8,8 @@ include::install.adoc[] == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[] diff --git a/docs/src/main/asciidoc/spring-cloud-cli.adoc b/docs/src/main/asciidoc/spring-cloud-cli.adoc index bba7d963..c10bcdaa 100644 --- a/docs/src/main/asciidoc/spring-cloud-cli.adoc +++ b/docs/src/main/asciidoc/spring-cloud-cli.adoc @@ -6,7 +6,7 @@ include::intro.adoc[] -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing-docs.adoc[] == Installation diff --git a/pom.xml b/pom.xml index 92d41b01..cc095dce 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT pom From 8db55acfbb3e55a4c385e3bb9f016a70b570ea9e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 18 Nov 2023 12:36:46 +0000 Subject: [PATCH 08/11] Bumping versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cc095dce..6e6601b0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.6.14 - 2021.0.8-SNAPSHOT + 2.6.15 + 2021.0.9-SNAPSHOT spring-cloud-launcher From f72ef0d2b911c28eb15d67200558020afc7a9b21 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 18 Dec 2023 16:35:39 -0500 Subject: [PATCH 09/11] Update .settings.xml --- .settings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.settings.xml b/.settings.xml index 08951caf..a6f92816 100644 --- a/.settings.xml +++ b/.settings.xml @@ -21,7 +21,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -29,7 +29,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -42,12 +42,12 @@ false - - + + spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -55,12 +55,12 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false - + From d78fb3815f7fbc3f0e6277650dfdde6d932a4c1c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 18 Dec 2023 16:36:05 -0500 Subject: [PATCH 10/11] Update maven.config --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 3b8cf46e..a6829905 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1 @@ --DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring +-P spring From b4de98f26dacf03ce732cf9f37aaeaacc23c90da Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 18 Dec 2023 16:52:34 -0500 Subject: [PATCH 11/11] Update .settings.xml --- .settings.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.settings.xml b/.settings.xml index a6f92816..82eea02a 100644 --- a/.settings.xml +++ b/.settings.xml @@ -34,14 +34,6 @@ false - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - -