Fix dependencies for the 1.1.x branch

I think we picked up some unintended commits in this branch since the
last 1.1.x release tag and accidentally moved to Spring Boot 2.3.
Rolling back to the latest available versions in the correct release
series:

* CF Java Client 4.16.0.RELEASE
* Open Service Broker 3.1.2.RELEASE
* Spring Boot 2.2.13.RELEASE

Author: spikymonkey

gradle.properties

@@ -9,9 +9,9 @@ cfJavaClientVersion = 4.16.0.RELEASE
 checkstyleVersion = 8.33
 commonsTextVersion = 1.8
 immutablesVersion = 2.8.8
-openServiceBrokerVersion = 3.2.0-SNAPSHOT
+openServiceBrokerVersion = 3.1.2.RELEASE
 pmdVersion = 6.24.0
-springBootVersion = 2.3.1.RELEASE
+springBootVersion = 2.2.13.RELEASE
 springCredhubVersion = 2.1.1.RELEASE
 springFrameworkVersion = 5.2.7.RELEASE
 wiremockVersion = 2.25.1

spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java

@@ -114,7 +114,7 @@ public class CloudFoundryDeploymentProperties extends DeploymentProperties {
 	/**
 	 * The buildpack to use for deploying the application.
 	 */
-	private String buildpack;
+	private String buildpack = "";
 
 	/**
 	 * The type of health check to perform on deployed application, if not overridden per-app.  Defaults to PORT

spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java

@@ -151,6 +151,7 @@ class CloudFoundryAppDeployerTest {
 	@BeforeEach
 	void setUp() {
 		deploymentProperties = new CloudFoundryDeploymentProperties();
+
 		CloudFoundryTargetProperties targetProperties = new CloudFoundryTargetProperties();
 		targetProperties.setDefaultOrg("default-org");
 		targetProperties.setDefaultSpace("default-space");
@@ -190,6 +191,7 @@ void deployAppWithPlatformDefaults() {
 		ApplicationManifest expectedManifest = baseManifestWithSpringAppJson()
 			.name(APP_NAME)
 			.path(new File(APP_PATH).toPath())
+			.buildpacks("") // Empty list means to discover the buildpack
 			.build();
 
 		then(operationsApplications).should().pushManifest(argThat(matchesManifest(expectedManifest)));
@@ -433,6 +435,7 @@ void deployAppWithEnvironmentUsingSpringAppJson() {
 			"\"ENV_VAR_2\":\"value2\",\"ENV_VAR_1\":\"value1\"")
 			.name(APP_NAME)
 			.path(new File(APP_PATH).toPath())
+			.buildpacks("")
 			.environmentVariable("JAVA_OPTS", "-Xms512m -Xmx1024m")
 			.build();
 
@@ -459,6 +462,7 @@ void deployAppWithEnvironmentNotUsingSpringAppJson() {
 		ApplicationManifest expectedManifest = baseManifest()
 			.name(APP_NAME)
 			.path(new File(APP_PATH).toPath())
+			.buildpack("")
 			.environmentVariable("JAVA_OPTS", "-Xms512m -Xmx1024m")
 			.environmentVariable("spring.cloud.appbroker.service-instance-id", SERVICE_INSTANCE_ID)
 			.environmentVariable("ENV_VAR_1", "value1")

spring-cloud-app-broker-docs/build.gradle

@@ -29,11 +29,11 @@ dependencies {
 	implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
 	implementation project(":spring-cloud-app-broker-core")
 	implementation "org.springframework.boot:spring-boot-starter"
-	implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
 	implementation "org.springframework.boot:spring-boot-starter-security"
 	implementation "org.springframework.boot:spring-boot-starter-tomcat"
 	implementation "io.projectreactor:reactor-core"
 	implementation "io.r2dbc:r2dbc-h2:0.8.0.RELEASE"
+	implementation "org.springframework.data:spring-data-r2dbc:1.1.9.RELEASE"
 
 	docs "io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip"
 }

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/WiremockComponentTest.java

@@ -50,7 +50,8 @@
 		"spring.cloud.appbroker.deployer.cloudfoundry.password=adminpass",
 		"spring.cloud.appbroker.deployer.cloudfoundry.default-org=test",
 		"spring.cloud.appbroker.deployer.cloudfoundry.default-space=development",
-		"spring.cloud.appbroker.deployer.cloudfoundry.secure=false"
+		"spring.cloud.appbroker.deployer.cloudfoundry.secure=false",
+		"spring.cloud.appbroker.deployer.cloudfoundry.properties.buildpack=example-buildpack"
 	}
 )
 @ActiveProfiles("openservicebroker-catalog")

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/fixtures/CloudControllerStubFixture.java

@@ -236,6 +236,7 @@ public void stubPushAppWithHost(final String appName, final String host, Content
 	}
 
 	public void stubUpdateAppWithUpgrade(final String appName) {
+		stubGetV3App(appName);
 		stubUpdateEnvironment(appName);
 		stubCreatePackage(appName);
 		stubCreateBuild(appName);
@@ -248,12 +249,22 @@ public void stubUpdateAppWithHostAndDomain(final String appName) {
 	}
 
 	public void stubUpdateApp(final String appName) {
+		stubGetV3App(appName);
 		stubUpdateEnvironment(appName);
 		stubGetPackage(appName);
 		stubCreateBuild(appName);
 		stubCreateDeployment(appName);
 	}
 
+	private void stubGetV3App(String appName) {
+		stubFor(get(urlPathEqualTo("/v3/apps/" + appGuid(appName)))
+			.willReturn(ok()
+				.withBody(cc("get-v3-app-STARTED",
+					replace("@name", appName),
+					replace("@guid",  appGuid(appName))
+				))));
+	}
+
 	private void stubAppAfterCreation(String appName, String host) {
 		stubMapRouteToApp(appName, host);
 		stubUploadAppBits(appName);

spring-cloud-app-broker-integration-tests/src/test/resources/responses/cloudcontroller/get-v3-app-STARTED.json

@@ -0,0 +1,70 @@
+{
+	"guid": "@guid",
+	"name": "@name",
+	"state": "STARTED",
+	"created_at": "2016-03-17T21:41:30Z",
+	"updated_at": "2016-06-08T16:41:26Z",
+	"lifecycle": {
+		"type": "buildpack",
+		"data": {
+			"buildpacks": [
+				"java_buildpack"
+			],
+			"stack": "cflinuxfs3"
+		}
+	},
+	"relationships": {
+		"space": {
+			"data": {
+				"guid": "@space-guid"
+			}
+		}
+	},
+	"links": {
+		"self": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446"
+		},
+		"space": {
+			"href": "https://api.example.org/v3/spaces/2f35885d-0c9d-4423-83ad-fd05066f8576"
+		},
+		"processes": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/processes"
+		},
+		"packages": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/packages"
+		},
+		"environment_variables": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/environment_variables"
+		},
+		"current_droplet": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/droplets/current"
+		},
+		"droplets": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/droplets"
+		},
+		"tasks": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/tasks"
+		},
+		"start": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/actions/start",
+			"method": "POST"
+		},
+		"stop": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/actions/stop",
+			"method": "POST"
+		},
+		"revisions": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/revisions"
+		},
+		"deployed_revisions": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/revisions/deployed"
+		},
+		"features": {
+			"href": "https://api.example.org/v3/apps/1cb006ee-fb05-47e1-b541-c34179ddc446/features"
+		}
+	},
+	"metadata": {
+		"labels": {},
+		"annotations": {}
+	}
+}