From 9f25fb53b6d3483e62ae3a6aa0c571faaf52dd6a Mon Sep 17 00:00:00 2001 From: Gareth Clay Date: Tue, 3 Nov 2020 14:14:09 +0000 Subject: [PATCH] Dependency bumps * BlockHound 1.0.4.RELEASE * Checkstyle 8.37 * PMD 6.29.0 * Spring Boot 2.3.5.RELEASE * Spring Framework 5.2.10.RELEASE * Wiremock 2.27.2 --- gradle.properties | 12 ++++++------ ...viceInstanceBindingStateRepositoryTest.java | 18 +++++++++--------- ...moryServiceInstanceStateRepositoryTest.java | 18 +++++++++--------- .../appbroker/deployer/util/ByteSizeUtils.java | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index a11d61f..b1a150e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ group=org.springframework.cloud onlyShowStandardStreamsOnTestFailure = false awaitilityVersion = 4.0.2 -blockHoundVersion = 1.0.3.RELEASE +blockHoundVersion = 1.0.4.RELEASE cfJavaClientVersion = 4.7.0.RELEASE -checkstyleVersion = 8.33 +checkstyleVersion = 8.37 commonsTextVersion = 1.8 immutablesVersion = 2.8.8 openServiceBrokerVersion = 3.2.0-SNAPSHOT -pmdVersion = 6.24.0 -springBootVersion = 2.3.1.RELEASE +pmdVersion = 6.29.0 +springBootVersion = 2.3.5.RELEASE springCredhubVersion = 2.1.1.RELEASE -springFrameworkVersion = 5.2.7.RELEASE -wiremockVersion = 2.25.1 +springFrameworkVersion = 5.2.10.RELEASE +wiremockVersion = 2.27.2 diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepositoryTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepositoryTest.java index 92e3f8b..dd207ad 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepositoryTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepositoryTest.java @@ -16,7 +16,7 @@ package org.springframework.cloud.appbroker.state; -import java.util.Calendar; +import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -55,7 +55,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); } @@ -69,7 +69,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -78,7 +78,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -96,7 +96,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -105,7 +105,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -116,7 +116,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); @@ -125,7 +125,7 @@ class InMemoryServiceInstanceBindingStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isInSameMinuteWindowAs(Calendar.getInstance().getTime()); + .isInSameMinuteWindowAs(new Date()); }) .verifyComplete(); } diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java index 793830a..c4b3b5c 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java @@ -16,7 +16,7 @@ package org.springframework.cloud.appbroker.state; -import java.util.Calendar; +import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -53,7 +53,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); } @@ -65,7 +65,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -74,7 +74,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -91,7 +91,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -100,7 +100,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -110,7 +110,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); @@ -119,7 +119,7 @@ class InMemoryServiceInstanceStateRepositoryTest { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(Calendar.getInstance().getTime()); + .isEqualToIgnoringSeconds(new Date()); }) .verifyComplete(); } diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java index 24dfbf5..f222c67 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java @@ -49,7 +49,7 @@ public final class ByteSizeUtils { " Expected a number with optional 'm' or 'g' suffix", text)); } int size = Integer.parseInt(matcher.group("amount")); - if (matcher.group("unit").equalsIgnoreCase("g")) { + if ("g".equalsIgnoreCase(matcher.group("unit"))) { size *= 1024L; } return size;