From 084242ac9ec40d38bf472cf53ec8d9f17cd04809 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 May 2024 10:53:12 +0000 Subject: [PATCH] Going back to snapshots --- binders/kafka-binder/pom.xml | 4 +- .../spring-cloud-starter-stream-kafka/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-stream-binder-kafka/pom.xml | 2 +- binders/pom.xml | 4 +- binders/pulsar-binder/pom.xml | 4 +- .../spring-cloud-stream-binder-pulsar/pom.xml | 2 +- binders/rabbit-binder/pom.xml | 6 +- .../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 | 226 ------------------ bom/spring-cloud-stream-dependencies/pom.xml | 4 +- core/pom.xml | 4 +- .../pom.xml | 2 +- core/spring-cloud-stream-test-binder/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 +- schema-registry/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 29 files changed, 40 insertions(+), 266 deletions(-) delete mode 100644 bom/spring-cloud-stream-dependencies/.flattened-pom.xml diff --git a/binders/kafka-binder/pom.xml b/binders/kafka-binder/pom.xml index 8c298d213..d55b882c3 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 - 4.1.2 + 4.1.2-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.1.2 + 4.1.2-SNAPSHOT https://github.com/spring-cloud/spring-cloud-stream-binder-kafka 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 1c7205cb0..2aaa9aac5 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 - 4.1.2 + 4.1.2-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 d92f731a6..eaa22a0fd 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 - 4.1.2 + 4.1.2-SNAPSHOT spring-cloud-stream-binder-kafka-core Spring Cloud Stream Kafka Binder Core diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml index 2bce448ce..542f6a440 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.1.2 + 4.1.2-SNAPSHOT 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 7dfd7d594..680ba25c1 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 - 4.1.2 + 4.1.2-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 a81f3c3df..76ce1d2c2 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 - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/binders/pom.xml b/binders/pom.xml index b29032c3e..cf2a2c83d 100644 --- a/binders/pom.xml +++ b/binders/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-binders - 4.1.2 + 4.1.2-SNAPSHOT binders Framework provided binders pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/binders/pulsar-binder/pom.xml b/binders/pulsar-binder/pom.xml index 18800f769..94e16b29a 100644 --- a/binders/pulsar-binder/pom.xml +++ b/binders/pulsar-binder/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-pulsar-parent - 4.1.2 + 4.1.2-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml b/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml index f44a62ab9..21a5188ac 100644 --- a/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml +++ b/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-pulsar-parent - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/binders/rabbit-binder/pom.xml b/binders/rabbit-binder/pom.xml index 8be4bad69..ec5e9a9be 100644 --- a/binders/rabbit-binder/pom.xml +++ b/binders/rabbit-binder/pom.xml @@ -2,16 +2,16 @@ 4.0.0 spring-cloud-stream-binder-rabbit-parent - 4.1.2 + 4.1.2-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.1.2 + 4.1.2-SNAPSHOT 17 - 4.1.2 + 4.1.2-SNAPSHOT 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 aa5e0820c..19027d28b 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 - 4.1.2 + 4.1.2-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 673cd20e6..afd325e35 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 - 4.1.2 + 4.1.2-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 a4ae2f5cb..b74a63d31 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 - 4.1.2 + 4.1.2-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 a426e71a1..2449d003f 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 - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/bom/pom.xml b/bom/pom.xml index b04ff74c1..6c2972d24 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,11 +7,11 @@ pom spring-cloud-stream-release-build Spring Cloud Stream Release Build - 4.1.2 + 4.1.2-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/bom/spring-cloud-starter-parent/pom.xml b/bom/spring-cloud-starter-parent/pom.xml index 6b9b8e42e..048a28987 100644 --- a/bom/spring-cloud-starter-parent/pom.xml +++ b/bom/spring-cloud-starter-parent/pom.xml @@ -6,12 +6,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.6 + 3.2.4 org.springframework.cloud spring-cloud-stream-starter-parent - 4.1.2 + 4.1.2-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 8325c7356..000000000 --- a/bom/spring-cloud-stream-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 4.1.2 - - - org.springframework.cloud - spring-cloud-stream-dependencies - 4.1.2 - 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/4.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-test-binder - ${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-reactive - ${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} - - - org.springframework.cloud - spring-cloud-stream-binder-pulsar - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-schema-registry-client - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-schema-registry-core - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-schema-registry-server - ${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 11ae5b831..0def54a66 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 - 4.1.2 + 4.1.2-SNAPSHOT spring-cloud-stream-dependencies - 4.1.2 + 4.1.2-SNAPSHOT pom spring-cloud-stream-dependencies Spring Cloud Stream Dependencies diff --git a/core/pom.xml b/core/pom.xml index 4e927edf4..44bd03810 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-core - 4.1.2 + 4.1.2-SNAPSHOT core Core Spring Cloud Stream pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.1.2 + 4.1.2-SNAPSHOT .. diff --git a/core/spring-cloud-stream-integration-tests/pom.xml b/core/spring-cloud-stream-integration-tests/pom.xml index 1c7654e75..90151ba52 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 - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/core/spring-cloud-stream-test-binder/pom.xml b/core/spring-cloud-stream-test-binder/pom.xml index 0c987046e..bec52db86 100644 --- a/core/spring-cloud-stream-test-binder/pom.xml +++ b/core/spring-cloud-stream-test-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/core/spring-cloud-stream-test-support/pom.xml b/core/spring-cloud-stream-test-support/pom.xml index 1c7806cc3..1e088505a 100644 --- a/core/spring-cloud-stream-test-support/pom.xml +++ b/core/spring-cloud-stream-test-support/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/core/spring-cloud-stream/pom.xml b/core/spring-cloud-stream/pom.xml index 23aaf5bad..824a932c7 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 - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 9899504b3..1cc205a2c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.1.2 + 4.1.2-SNAPSHOT jar Spring Cloud Stream Docs diff --git a/pom.xml b/pom.xml index 38ea17fef..1dc7b933f 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 - 4.1.2 + 4.1.2-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 4.1.2 + 4.1.2-SNAPSHOT @@ -24,7 +24,7 @@ 17 2.1 - 4.1.2 + 4.1.2-SNAPSHOT true true true diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml index f9d76246d..ad87fecc7 100644 --- a/schema-registry/pom.xml +++ b/schema-registry/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-schema-registry - 4.1.2 + 4.1.2-SNAPSHOT schema-registry Spring Cloud Stream Schema Registry Components pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml index 46662f5f2..1d1b1984e 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml @@ -3,7 +3,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.1.2 + 4.1.2-SNAPSHOT 4.0.0 diff --git a/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml index 3b481b1d1..1eaf4f42d 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.1.2 + 4.1.2-SNAPSHOT diff --git a/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml index 05d9a2e88..f238dd62a 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.1.2 + 4.1.2-SNAPSHOT