From 74ba6c90c2e563dd44fcc943821c5196514cc31a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 18:20:12 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 2.1.3.RELEASE --- README.adoc | 7 ++++++- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 10 files changed, 17 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index 9dccadc0..a02a7e0a 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,8 @@ -// Do not edit this file (e.g. go instead to src/main/asciidoc) +//// +DO NOT EDIT THIS FILE. IT WAS GENERATED. +Manual changes to this file will be lost when it is generated again. +Edit the files in the src/main/asciidoc/ directory instead. +//// image::https://circleci.com/gh/spring-cloud/spring-cloud-commons.svg?style=svg[Build Status, link=https://circleci.com/gh/spring-cloud/spring-cloud-commons] @@ -246,6 +250,7 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index c4ce40d6..49fd4fe4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 2fe15e00..3800fc64 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index e1abc087..9bac6076 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE spring-cloud-commons-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 368deda5..64f11dfd 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index c7b62813..71577654 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 4ed22eb7..f797a110 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index c68965a8..5167524c 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 83a5cf87..b4fda493 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index f86e440b..78868e85 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-test-support From fff96f4a8c595222ee3b5be27a7a581d8b9c319c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 18:22:04 +0000 Subject: [PATCH 2/4] Going back to snapshots --- README.adoc | 7 +------ docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 10 files changed, 12 insertions(+), 17 deletions(-) diff --git a/README.adoc b/README.adoc index a02a7e0a..9dccadc0 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,4 @@ -//// -DO NOT EDIT THIS FILE. IT WAS GENERATED. -Manual changes to this file will be lost when it is generated again. -Edit the files in the src/main/asciidoc/ directory instead. -//// +// Do not edit this file (e.g. go instead to src/main/asciidoc) image::https://circleci.com/gh/spring-cloud/spring-cloud-commons.svg?style=svg[Build Status, link=https://circleci.com/gh/spring-cloud/spring-cloud-commons] @@ -250,7 +246,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index 49fd4fe4..c4ce40d6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 3800fc64..2fe15e00 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 9bac6076..e1abc087 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 64f11dfd..368deda5 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 71577654..c7b62813 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index f797a110..4ed22eb7 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 5167524c..c68965a8 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index b4fda493..83a5cf87 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 78868e85..f86e440b 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-test-support From d8b1abe02f38afb20fdad6b862e10738ecbb56dd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 18:22:04 +0000 Subject: [PATCH 3/4] Bumping versions to 2.1.4.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c4ce40d6..bcadacbc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 2fe15e00..9353bdd4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index e1abc087..62c9f855 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 368deda5..1c478a18 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index c7b62813..aa02ae13 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 4ed22eb7..a9e339e3 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index c68965a8..456c03c3 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 83a5cf87..11b5a685 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index f86e440b..7c3d754b 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-test-support From 38db8440f11f7bfc4aa79244bd0efbb801115cf8 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 17 Sep 2019 15:43:45 +0200 Subject: [PATCH 4/4] Remove spring.provides. --- spring-cloud-starter/src/main/resources/META-INF/spring.provides | 1 - 1 file changed, 1 deletion(-) delete mode 100644 spring-cloud-starter/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-starter/src/main/resources/META-INF/spring.provides b/spring-cloud-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index e984b26d..00000000 --- a/spring-cloud-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-commons