From 07c683d02a4e87e9ec0f15c4dcdc4f79d999969d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:34:12 +0000 Subject: [PATCH] Going back to snapshots --- binders/kafka-binder/docs/pom.xml | 2 +- binders/kafka-binder/pom.xml | 6 +- .../spring-cloud-starter-stream-kafka/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-stream-binder-kafka/pom.xml | 2 +- binders/pom.xml | 4 +- binders/rabbit-binder/docs/pom.xml | 2 +- binders/rabbit-binder/pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-stream-binder-rabbit/pom.xml | 2 +- bom/pom.xml | 4 +- bom/spring-cloud-starter-parent/pom.xml | 4 +- .../.flattened-pom.xml | 209 ------------------ bom/spring-cloud-stream-dependencies/pom.xml | 4 +- core/pom.xml | 4 +- core/spring-cloud-stream-binder-test/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- core/spring-cloud-stream-test-support/pom.xml | 2 +- core/spring-cloud-stream/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +- 25 files changed, 36 insertions(+), 245 deletions(-) delete mode 100644 bom/spring-cloud-stream-dependencies/.flattened-pom.xml diff --git a/binders/kafka-binder/docs/pom.xml b/binders/kafka-binder/docs/pom.xml index 57a1ed5a7..982dd4bb7 100644 --- a/binders/kafka-binder/docs/pom.xml +++ b/binders/kafka-binder/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT jar spring-cloud-stream-binder-kafka-docs diff --git a/binders/kafka-binder/pom.xml b/binders/kafka-binder/pom.xml index c65b9ccc1..a3f941ed3 100644 --- a/binders/kafka-binder/pom.xml +++ b/binders/kafka-binder/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 3.2.3 + 3.2.3-SNAPSHOT https://github.com/spring-cloud/spring-cloud-stream-binder-kafka @@ -23,7 +23,7 @@ 2.8.5 5.5.8 3.0.0 - 3.2.3 + 3.2.3-SNAPSHOT true true true diff --git a/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml b/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml index 30f263ec4..1bb40f592 100644 --- a/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml +++ b/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-starter-stream-kafka Spring Cloud Starter Stream Kafka diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml index bcf7bdcc4..1e8c4eb07 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-stream-binder-kafka-core Spring Cloud Stream Kafka Binder Core diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml index 2c7c35699..44069a6e1 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml index 7811128f1..92187b719 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/binders/pom.xml b/binders/pom.xml index 3a92be68d..96e82c739 100644 --- a/binders/pom.xml +++ b/binders/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-binders - 3.2.3 + 3.2.3-SNAPSHOT binders Framework provided binders pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/binders/rabbit-binder/docs/pom.xml b/binders/rabbit-binder/docs/pom.xml index c11601d62..0a3208e05 100644 --- a/binders/rabbit-binder/docs/pom.xml +++ b/binders/rabbit-binder/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT jar spring-cloud-stream-binder-rabbit-docs diff --git a/binders/rabbit-binder/pom.xml b/binders/rabbit-binder/pom.xml index 18c12501b..f76688f48 100644 --- a/binders/rabbit-binder/pom.xml +++ b/binders/rabbit-binder/pom.xml @@ -2,17 +2,17 @@ 4.0.0 spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 3.2.3 + 3.2.3-SNAPSHOT - 3.2.3 + 3.2.3-SNAPSHOT 1.8 - 3.2.4 + 3.2.2 true true diff --git a/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml b/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml index 3b2c053af..4c34d527d 100644 --- a/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml +++ b/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-starter-stream-rabbit Spring Cloud Starter Stream Rabbit diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml index 9f07bea87..7d3e7ee64 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml index 88f0fd5e4..3096141ea 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-stream-binder-rabbit-test-support Rabbit related test classes diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml index d2c42dea4..965961931 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/bom/pom.xml b/bom/pom.xml index dbbe94dc1..8361baf71 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,11 +7,11 @@ pom spring-cloud-stream-release-build Spring Cloud Stream Release Build - 3.2.3 + 3.2.3-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT diff --git a/bom/spring-cloud-starter-parent/pom.xml b/bom/spring-cloud-starter-parent/pom.xml index 4045ecb22..34f0df96d 100644 --- a/bom/spring-cloud-starter-parent/pom.xml +++ b/bom/spring-cloud-starter-parent/pom.xml @@ -6,11 +6,11 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.3 org.springframework.cloud spring-cloud-stream-starter-parent - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-stream-starter-parent Specifies Boot version for the releaser pom diff --git a/bom/spring-cloud-stream-dependencies/.flattened-pom.xml b/bom/spring-cloud-stream-dependencies/.flattened-pom.xml deleted file mode 100644 index 4f43cd445..000000000 --- a/bom/spring-cloud-stream-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 3.1.2 - - - org.springframework.cloud - spring-cloud-stream-dependencies - 3.2.3 - pom - spring-cloud-stream-dependencies - Spring Cloud Stream Dependencies - https://projects.spring.io/spring-cloud/spring-cloud-stream-dependencies/ - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2021 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. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-stream-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-stream-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-stream-dependencies - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - spring-docs - https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.2/reference/html/spring-cloud-stream-dependencies/ - - https://github.com/spring-cloud - - - - - org.springframework.cloud - spring-cloud-stream - ${project.version} - - - org.springframework.cloud - spring-cloud-stream - ${project.version} - test-jar - test-binder - test - - - org.springframework.cloud - spring-cloud-stream-binder-test - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-test-support - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-kafka - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-kafka-streams - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-kafka-core - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-stream-kafka - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-rabbit - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-rabbit-core - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-rabbit-test-support - ${project.version} - - - - - - spring - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - - diff --git a/bom/spring-cloud-stream-dependencies/pom.xml b/bom/spring-cloud-stream-dependencies/pom.xml index 5b10e9b1f..7a862f42f 100644 --- a/bom/spring-cloud-stream-dependencies/pom.xml +++ b/bom/spring-cloud-stream-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-stream-dependencies - 3.2.3 + 3.2.3-SNAPSHOT pom spring-cloud-stream-dependencies Spring Cloud Stream Dependencies diff --git a/core/pom.xml b/core/pom.xml index b1b84514a..8fe4c71c1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT core Core Spring Cloud Stream pom @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-stream-parent - 3.2.3 + 3.2.3-SNAPSHOT .. diff --git a/core/spring-cloud-stream-binder-test/pom.xml b/core/spring-cloud-stream-binder-test/pom.xml index da2aa3c43..fcc62a9b3 100644 --- a/core/spring-cloud-stream-binder-test/pom.xml +++ b/core/spring-cloud-stream-binder-test/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/core/spring-cloud-stream-integration-tests/pom.xml b/core/spring-cloud-stream-integration-tests/pom.xml index 9ae8c3a69..22e0ffc43 100644 --- a/core/spring-cloud-stream-integration-tests/pom.xml +++ b/core/spring-cloud-stream-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/core/spring-cloud-stream-test-support-internal/pom.xml b/core/spring-cloud-stream-test-support-internal/pom.xml index d19e97d7e..6733cffc0 100644 --- a/core/spring-cloud-stream-test-support-internal/pom.xml +++ b/core/spring-cloud-stream-test-support-internal/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-stream-test-support-internal Set of classes and utility code that may assist in testing both diff --git a/core/spring-cloud-stream-test-support/pom.xml b/core/spring-cloud-stream-test-support/pom.xml index 50d5bbb66..f22a1275b 100644 --- a/core/spring-cloud-stream-test-support/pom.xml +++ b/core/spring-cloud-stream-test-support/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT spring-cloud-stream-test-support A set of classes to ease testing of Spring Cloud Stream modules. diff --git a/core/spring-cloud-stream/pom.xml b/core/spring-cloud-stream/pom.xml index d4e7176d5..296aab416 100644 --- a/core/spring-cloud-stream/pom.xml +++ b/core/spring-cloud-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 3.2.3 + 3.2.3-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 1978c72b0..b251ef6f3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-stream-parent - 3.2.3 + 3.2.3-SNAPSHOT jar spring-cloud-stream-docs diff --git a/pom.xml b/pom.xml index 062fd0cf9..1be15939d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-stream-parent - 3.2.3 + 3.2.3-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -25,7 +25,7 @@ 1.8 2020.0.7 2.1 - 3.2.4 + 3.2.3-SNAPSHOT true true true