From 25e6bc78537a6b4a0861b24892b4a173841e4dbd Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Mon, 11 Nov 2024 12:04:42 -0500
Subject: [PATCH 1/4] Updating Spring Cloud Commons bundles

---
 projects/spring-cloud/src/main/resources/application.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml
index 320d1de6..c47efe0f 100644
--- a/projects/spring-cloud/src/main/resources/application.yml
+++ b/projects/spring-cloud/src/main/resources/application.yml
@@ -136,7 +136,9 @@ releaser:
         - "org/springframework/cloud/spring-cloud-starter-bus*"
       spring-cloud-commons:
         - "org/springframework/cloud/spring-cloud-commons*"
-        - "org/springframework/cloud/spring-cloud-starter-commons*"
+        - "org/springframework/cloud/spring-cloud-context*"
+        - "org/springframework/cloud/spring-cloud-loadbalancer*"
+        - "org/springframework/cloud/spring-cloud-starter*"
       spring-cloud-netflix:
         - "org/springframework/cloud/spring-cloud-netflix*"
         - "org/springframework/cloud/spring-cloud-starter-netflix*"

From 53eccf25f4eae83765fa97f39f07329edeaf1622 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Mon, 11 Nov 2024 14:29:55 -0500
Subject: [PATCH 2/4] Add wiremock dependency

---
 pom.xml               | 6 ++++++
 releaser-core/pom.xml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 19d15d77..496fabe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
 		<okhttp.version>4.11.0</okhttp.version>
 		<artifactory-client.version>2.17.0</artifactory-client.version>
 		<groovy.version>4.0.6</groovy.version>
+		<wiremock.version>3.0.4</wiremock.version>
 	</properties>
 
 	<dependencyManagement>
@@ -157,6 +158,11 @@
 				<artifactId>groovy</artifactId>
 				<version>${groovy.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.wiremock</groupId>
+				<artifactId>wiremock-standalone</artifactId>
+				<version>${wiremock.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/releaser-core/pom.xml b/releaser-core/pom.xml
index b0ee9beb..bb86f048 100644
--- a/releaser-core/pom.xml
+++ b/releaser-core/pom.xml
@@ -114,6 +114,12 @@
 			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.wiremock</groupId>
+			<artifactId>wiremock-standalone</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<!--<dependency>
 			<groupId>io.spring.sagan</groupId>
 			<artifactId>sagan-site</artifactId>

From 92ad3954ddc549025674f9679f628b325ad4f607 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Mon, 11 Nov 2024 15:16:42 -0500
Subject: [PATCH 3/4] Add async=false to release bundle creation api call

---
 .../java/releaser/internal/commercial/ReleaseBundleCreator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java b/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java
index 8ccc99dc..ddc529f3 100644
--- a/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java
+++ b/releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java
@@ -91,7 +91,7 @@ public class ReleaseBundleCreator {
 		log.info("Creating release bundle with JSON [{}]", json);
 
 		ArtifactoryRequest aqlRequest = new ArtifactoryRequestImpl().method(ArtifactoryRequest.Method.POST)
-				.apiUrl("lifecycle/api/v2/release_bundle").addQueryParam("project", "spring")
+				.apiUrl("lifecycle/api/v2/release_bundle").addQueryParam("project", "spring").addQueryParam("async", "false")
 				.addHeader("X-JFrog-Signing-Key-Name", "packagesKey").requestType(ArtifactoryRequest.ContentType.JSON)
 				.responseType(ArtifactoryRequest.ContentType.JSON).requestBody(json);
 		return makeArtifactoryRequest(aqlRequest);

From f68a482d401c8837c9367387627a136522cc0da7 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Tue, 12 Nov 2024 10:24:30 -0500
Subject: [PATCH 4/4] Fixing starters

---
 projects/spring-cloud/src/main/resources/application.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml
index c47efe0f..27f5418e 100644
--- a/projects/spring-cloud/src/main/resources/application.yml
+++ b/projects/spring-cloud/src/main/resources/application.yml
@@ -138,7 +138,9 @@ releaser:
         - "org/springframework/cloud/spring-cloud-commons*"
         - "org/springframework/cloud/spring-cloud-context*"
         - "org/springframework/cloud/spring-cloud-loadbalancer*"
-        - "org/springframework/cloud/spring-cloud-starter*"
+        - "org/springframework/cloud/spring-cloud-starter"
+        - "org/springframework/cloud/spring-cloud-starter-loadbalancer"
+        - "org/springframework/cloud/spring-cloud-starter-bootstrap"
       spring-cloud-netflix:
         - "org/springframework/cloud/spring-cloud-netflix*"
         - "org/springframework/cloud/spring-cloud-starter-netflix*"