Merge branch '4.0.x'

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>
 

projects/spring-cloud/src/main/resources/application.yml

@@ -140,7 +140,11 @@ 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"
+        - "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*"

releaser-core/pom.xml

@@ -119,6 +119,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>

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);