Removed any references to cloud BOMs; fixes gh-2062

samples/standalone/contracts/com/example/server/pom.xml

@@ -22,22 +22,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.5-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2022.0.5-SNAPSHOT</spring-cloud-release.version>
 		<excludeBuildFolders>true</excludeBuildFolders>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud-release.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<build>
 		<plugins>
 			<plugin>

samples/standalone/dsl/http-client/build.gradle

@@ -13,12 +13,12 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-//	maven { url "https://repo.spring.io/release" }
 }
 
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:$verifierVersion"
+		mavenBom "org.springframework.cloud:spring-cloud-stream-dependencies:$springCloudStreamVersion"
 	}
 }
 

samples/standalone/dsl/http-client/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.daemon=false
-BOM_VERSION=2022.0.5-SNAPSHOT
+verifierVersion=4.0.5-SNAPSHOT
+springCloudStreamVersion=4.0.5-SNAPSHOT
 bootVersion=3.0.9

samples/standalone/dsl/http-client/pom.xml

@@ -47,13 +47,11 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>${spring-cloud-stream.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-binder</artifactId>
-			<version>${spring-cloud-stream.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -83,6 +81,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-dependencies</artifactId>
+				<version>${spring-cloud-stream.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<!-- end::contract_bom[] -->

samples/standalone/dsl/http-server/build.gradle

@@ -15,15 +15,13 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-	maven { url "https://repo.spring.io/release" }
 }
 // end::deps_repos[]
 
-ext.set("rest-assured.version", "5.2.1") // TODO: Remove once upgraded in Boot
-
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:$verifierVersion"
+		mavenBom "org.springframework.cloud:spring-cloud-stream-dependencies:$springCloudStreamVersion"
 	}
 }
 

samples/standalone/dsl/http-server/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=4.0.5-SNAPSHOT
-BOM_VERSION=2022.0.5-SNAPSHOT
+springCloudStreamVersion=4.0.5-SNAPSHOT
 bootVersion=3.0.9

samples/standalone/dsl/http-server/pom.xml

@@ -49,13 +49,11 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>${spring-cloud-stream.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-binder</artifactId>
-			<version>${spring-cloud-stream.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -77,13 +75,12 @@
 				<version>${spring-cloud-contract.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
-			</dependency>
 			<!-- end::contract_bom[] -->
-			<!-- Until updated in Spring Boot -->
+			</dependency>
 			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>rest-assured-bom</artifactId>
-				<version>5.2.1</version>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-dependencies</artifactId>
+				<version>${spring-cloud-stream.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

samples/standalone/restdocs/http-client/build.gradle

@@ -19,7 +19,6 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-	maven { url "https://repo.spring.io/release" }
 }
 
 apply plugin: 'groovy'
@@ -29,8 +28,8 @@ apply plugin: 'maven-publish'
 
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION"
-		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}"
+		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:$verifierVersion"
+		mavenBom "org.springframework.cloud:spring-cloud-stream-dependencies:$springCloudStreamVersion"
 	}
 }
 

samples/standalone/restdocs/http-client/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=4.0.5-SNAPSHOT
-BOM_VERSION=2022.0.5-SNAPSHOT
+springCloudStreamVersion=4.0.5-SNAPSHOT
 bootVersion=3.0.9

samples/standalone/restdocs/http-server/build.gradle

@@ -14,12 +14,10 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-	maven { url "https://repo.spring.io/release" }
 }
 
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${BOM_VERSION}"
 		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${verifierVersion}"
 	}
 }

samples/standalone/restdocs/http-server/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.daemon=false
 verifierVersion=4.0.5-SNAPSHOT
-BOM_VERSION=2022.0.5-SNAPSHOT
 bootVersion=3.0.9

samples/standalone/webclient/http-client/build.gradle

@@ -13,12 +13,10 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-	maven { url "https://repo.spring.io/release" }
 }
 
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${BOM_VERSION}"
 		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${verifierVersion}"
 	}
 }

samples/standalone/webclient/http-client/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.daemon=false
 verifierVersion=4.0.5-SNAPSHOT
-BOM_VERSION=2022.0.5-SNAPSHOT
 bootVersion=3.0.9

samples/standalone/webclient/http-server/build.gradle

@@ -20,12 +20,10 @@ repositories {
 	mavenLocal()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
-//	maven { url "https://repo.spring.io/release" }
 }
 
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${BOM_VERSION}"
 		mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${verifierVersion}"
 	}
 }

samples/standalone/webclient/http-server/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.daemon=false
 verifierVersion=4.0.5-SNAPSHOT
-BOM_VERSION=2022.0.5-SNAPSHOT
 bootVersion=3.0.9