From fd78298723a433aedd7c5cb9909c037863ed5b02 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Mon, 9 Dec 2019 17:59:32 -0500 Subject: [PATCH] Upgrade to Spring Boot 2.2.2.RELEASE - Upgrade to Spring Framework 5.2.2.RELEASE - Upgrade to Reactor Dysprosium-SR2 - Upgrade to CF Java Client 4.2.0.RELEASE --- build.gradle | 8 ++++---- .../deployer/cloudfoundry/CloudFoundryAppDeployer.java | 1 + .../CloudFoundryAppDeployerUpdateApplicationTest.java | 2 +- spring-cloud-app-broker-integration-tests/build.gradle | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 861a66a..bf3f951 100644 --- a/build.gradle +++ b/build.gradle @@ -28,12 +28,12 @@ buildscript { } ext { - springBootVersion = project.findProperty("springBootVersion") ?: "2.2.1.RELEASE" - springFrameworkVersion = project.findProperty("springFrameworkVersion") ?: "5.2.1.RELEASE" - reactorVersion = project.findProperty("reactorVersion") ?: "Dysprosium-SR1" + springBootVersion = project.findProperty("springBootVersion") ?: "2.2.2.RELEASE" + springFrameworkVersion = project.findProperty("springFrameworkVersion") ?: "5.2.2.RELEASE" + reactorVersion = project.findProperty("reactorVersion") ?: "Dysprosium-SR2" openServiceBrokerVersion = "3.1.0.RELEASE" springCredhubVersion = "2.0.1.RELEASE" - cfJavaClientVersion = "4.1.0.RELEASE" + cfJavaClientVersion = "4.2.0.RELEASE" blockHoundVersion = "1.0.1.RELEASE" junitPlatformLauncherVersion = "1.5.2" checkstyleVersion = "8.21" diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java index 919ea5c..e8aaf74 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java @@ -309,6 +309,7 @@ public class CloudFoundryAppDeployer implements AppDeployer, ResourceLoaderAware .getId(); } + @SuppressWarnings("deprecation") private Mono waitForDeploymentDeployed(String deploymentId) { return this.client .deploymentsV3() diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java index 3ca50f1..7bb8ae1 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java @@ -133,7 +133,7 @@ class CloudFoundryAppDeployerUpdateApplicationTest { private ResourceLoader resourceLoader; @BeforeEach - @SuppressWarnings("PMD.ExcessiveMethodLength") + @SuppressWarnings({"PMD.ExcessiveMethodLength", "deprecation"}) void setUp() { CloudFoundryDeploymentProperties deploymentProperties = new CloudFoundryDeploymentProperties(); CloudFoundryTargetProperties targetProperties = new CloudFoundryTargetProperties(); diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle index 4b8e2c2..cd1f02c 100644 --- a/spring-cloud-app-broker-integration-tests/build.gradle +++ b/spring-cloud-app-broker-integration-tests/build.gradle @@ -50,4 +50,5 @@ dependencies { test { // force a new fork for every test to eliminate issues with wiremock state forkEvery = 1 + maxHeapSize = '1G' }