From 286b62f1448746e6ade6c86ed251499cf4319cf1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 17:15:47 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 2.2.2.RELEASE --- README.adoc | 5 +++++ docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index d009883..ab9031a 100644 --- a/README.adoc +++ b/README.adoc @@ -123,6 +123,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. +==== Activate the Spring Maven profile +Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors. + ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index 7718f6c..c6587d7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 7d08998..544995a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE @@ -28,8 +28,8 @@ - 2.2.3.BUILD-SNAPSHOT - Horsham.SR3 + 2.2.3.RELEASE + Horsham.SR5 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index b25a729..961dc52 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE spring-cloud-bus-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index 15ad465..2080c6b 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 2b3aa76..bfe6486 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 646bd0f..e805284 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 869e956..5205c37 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-bus-kafka From 88e4aee56aa98cd9fc11731ea9cff2c2384c6472 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 17:17:40 +0000 Subject: [PATCH 2/5] Going back to snapshots --- README.adoc | 5 ----- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/README.adoc b/README.adoc index ab9031a..d009883 100644 --- a/README.adoc +++ b/README.adoc @@ -123,11 +123,6 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. -==== Activate the Spring Maven profile -Spring Cloud projects require the 'spring' Maven profile to be activated to resolve -the spring milestone and snapshot repositories. Use your preferred IDE to set this -profile to be active, or you may experience build errors. - ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index c6587d7..7718f6c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 544995a..7d08998 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT @@ -28,8 +28,8 @@ - 2.2.3.RELEASE - Horsham.SR5 + 2.2.3.BUILD-SNAPSHOT + Horsham.SR3 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 961dc52..b25a729 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index 2080c6b..15ad465 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index bfe6486..2b3aa76 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index e805284..646bd0f 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 5205c37..869e956 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From 9a3c38349408b8c9561b0e926290bf7c707c98b7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 17:17:40 +0000 Subject: [PATCH 3/5] Bumping versions to 2.2.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7718f6c..5017c1e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 7d08998..e834fdc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE @@ -28,8 +28,8 @@ - 2.2.3.BUILD-SNAPSHOT - Horsham.SR3 + 2.2.4.BUILD-SNAPSHOT + Horsham.SR5 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index b25a729..a442e51 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index 15ad465..054e790 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 2b3aa76..b0be9e3 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 646bd0f..61cc0c7 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 869e956..feea1c4 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From c2de6a7b1257f7cf989b7ed34975f71c4dd2588c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 4 Jun 2020 13:26:42 +0200 Subject: [PATCH 4/5] Migrated to docs.spring.io & updated sc-build --- README.adoc | 8 +++++++- docs/pom.xml | 16 ++++------------ docs/src/main/asciidoc/_configprops.adoc | 2 +- pom.xml | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index d009883..3bedac6 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 Bus :doctype: book :idprefix: @@ -123,6 +124,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. +==== Activate the Spring Maven profile +Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors. + ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse @@ -330,4 +336,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. \ No newline at end of file +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. diff --git a/docs/pom.xml b/docs/pom.xml index 5017c1e..dcee93b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,20 +16,9 @@ spring-cloud-bus ${basedir}/.. - 2.1.x,2.2.x spring.cloud.bus.* + deploy - - - - - maven-deploy-plugin - - true - - - - ${project.groupId} @@ -69,6 +58,9 @@ org.apache.maven.plugins maven-antrun-plugin + + maven-deploy-plugin + diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 5465ff5..82517ec 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -10,4 +10,4 @@ |spring.cloud.bus.refresh.enabled | true | Flag to switch off refresh events (default on). |spring.cloud.bus.trace.enabled | false | Flag to switch on tracing of acks (default off). -|=== +|=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index e834fdc..9b86a33 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT From 2dce36c10de738263fbfddac387adaa795283ed4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 8 Jun 2020 11:37:20 -0400 Subject: [PATCH 5/5] Adds .sdkmanrc --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4ddab87..14f50dd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ _site/ .factorypath .vscode/ .flattened-pom.xml +.sdkmanrc