From fcd1b04244c2778f1a72f19d5a4827edc371bd93 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 22 May 2020 07:07:59 +0000 Subject: [PATCH 1/9] Bumping versions --- README.adoc | 5 +++++ 1 file changed, 5 insertions(+) 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 From 85b8103149368caa8003e8e13c5bb3da14316eee Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 25 May 2020 13:41:04 +0200 Subject: [PATCH 2/9] Setting up repository for docs.spring.io migration --- docs/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 849e662..4651707 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -43,6 +43,9 @@ docs + + deploy + @@ -70,8 +73,7 @@ maven-antrun-plugin - org.codehaus.mojo - build-helper-maven-plugin + maven-deploy-plugin From e7c7df9f5f03802b44dea1b0d06f9fdf5e9f3f45 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 25 May 2020 14:39:12 +0200 Subject: [PATCH 3/9] Setting up repository for docs.spring.io migration --- docs/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4651707..bc05502 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -18,6 +18,7 @@ ${basedir}/.. 2.1.x,2.2.x spring.cloud.bus.* + deploy @@ -43,9 +44,6 @@ docs - - deploy - From d5683c35e93a4aeb63ef19da15ad9fdbeb85cdf3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 May 2020 07:08:32 +0000 Subject: [PATCH 4/9] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 5465ff5..ff6cf55 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.bus.ack.destination-service | | Service that wants to listen to acks. By default null (meaning all services). +|spring.cloud.bus.ack.destination-service | null | Service that wants to listen to acks. By default null (meaning all services). |spring.cloud.bus.ack.enabled | true | Flag to switch off acks (default on). |spring.cloud.bus.destination | springCloudBus | Name of Spring Cloud Stream destination for messages. |spring.cloud.bus.enabled | true | Flag to indicate that the bus is enabled. @@ -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 From e0cdb22f10db15ec4e276745ea47edb827c1807e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 May 2020 07:07:58 +0000 Subject: [PATCH 5/9] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index ff6cf55..82517ec 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.bus.ack.destination-service | null | Service that wants to listen to acks. By default null (meaning all services). +|spring.cloud.bus.ack.destination-service | | Service that wants to listen to acks. By default null (meaning all services). |spring.cloud.bus.ack.enabled | true | Flag to switch off acks (default on). |spring.cloud.bus.destination | springCloudBus | Name of Spring Cloud Stream destination for messages. |spring.cloud.bus.enabled | true | Flag to indicate that the bus is enabled. From 5da65b2491f196905253cb1a32659b6a62175a90 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 May 2020 18:23:30 +0000 Subject: [PATCH 6/9] Update SNAPSHOT to 3.0.0-M2 --- 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 bc05502..27795fa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 3.0.0-SNAPSHOT + 3.0.0-M2 pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 104b500..c3a87db 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 3.0.0-SNAPSHOT + 3.0.0-M2 pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 3.0.0-SNAPSHOT + 3.0.0-M2 @@ -28,8 +28,8 @@ - 3.0.0-SNAPSHOT - 3.1.0.BUILD-SNAPSHOT + 3.0.0-M2 + 3.1.0.M1 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 7cd28f6..2f17899 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 - 3.0.0-SNAPSHOT + 3.0.0-M2 spring-cloud-bus-dependencies - 3.0.0-SNAPSHOT + 3.0.0-M2 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 fe17ebd..9ea6e14 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 - 3.0.0-SNAPSHOT + 3.0.0-M2 .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index b0fef88..65f7502 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 3.0.0-SNAPSHOT + 3.0.0-M2 .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 6e4e0b1..7e87043 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 - 3.0.0-SNAPSHOT + 3.0.0-M2 .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 4e44c92..1452677 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 - 3.0.0-SNAPSHOT + 3.0.0-M2 .. spring-cloud-starter-bus-kafka From a40d0c3e4c70caee8e8ccb64765c5bd8be17fb07 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 May 2020 18:24:10 +0000 Subject: [PATCH 7/9] Going back to snapshots --- 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 27795fa..bc05502 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 3.0.0-M2 + 3.0.0-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index c3a87db..104b500 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 3.0.0-M2 + 3.0.0-SNAPSHOT pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 3.0.0-M2 + 3.0.0-SNAPSHOT @@ -28,8 +28,8 @@ - 3.0.0-M2 - 3.1.0.M1 + 3.0.0-SNAPSHOT + 3.1.0.BUILD-SNAPSHOT bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 2f17899..7cd28f6 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 - 3.0.0-M2 + 3.0.0-SNAPSHOT spring-cloud-bus-dependencies - 3.0.0-M2 + 3.0.0-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 9ea6e14..fe17ebd 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 - 3.0.0-M2 + 3.0.0-SNAPSHOT .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 65f7502..b0fef88 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 3.0.0-M2 + 3.0.0-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 7e87043..6e4e0b1 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 - 3.0.0-M2 + 3.0.0-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 1452677..4e44c92 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 - 3.0.0-M2 + 3.0.0-SNAPSHOT .. spring-cloud-starter-bus-kafka From 88f07c24b5090cd3aded1501606f66c8e94ea2b4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 8 Jun 2020 16:45:40 +0200 Subject: [PATCH 8/9] Uploading sources for docs --- docs/pom.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bc05502..6dd74bd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,15 +21,7 @@ deploy - - - - maven-deploy-plugin - - true - - - + src/main/asciidoc From 9a08c1c495358405d482fca7e3698bc30310f061 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 8 Jun 2020 17:06:56 +0200 Subject: [PATCH 9/9] Converted to JAR packaging for docs --- README.adoc | 3 ++- docs/pom.xml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index ab9031a..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: @@ -335,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 6dd74bd..bd7d138 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,13 +10,12 @@ spring-cloud-bus-parent 3.0.0-SNAPSHOT - pom + jar Spring Cloud Bus Docs Spring Cloud Docs spring-cloud-bus ${basedir}/.. - 2.1.x,2.2.x spring.cloud.bus.* deploy