diff --git a/build.gradle b/build.gradle index ef73155b7..ac68bc438 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { cfJavaClientVersion = "5.10.0.RELEASE" commonsTextVersion = "1.12.0" immutablesVersion = "2.10.1" - openServiceBrokerVersion = "4.2.0" + openServiceBrokerVersion = "4.3.0-M1" wiremockVersion = "3.8.0" } } diff --git a/settings.gradle b/settings.gradle index 9b1a93bc7..660e2c7b0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { } plugins { id "io.spring.nohttp" version "0.0.11" - id 'org.springframework.boot' version "3.2.7" + id 'org.springframework.boot' version "3.3.1" id 'org.asciidoctor.jvm.pdf' id 'org.asciidoctor.jvm.convert' } 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 b2caf55e7..ebbddff77 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 @@ -44,7 +44,7 @@ void saveAndGet() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); @@ -53,7 +53,7 @@ void saveAndGet() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); } @@ -73,7 +73,7 @@ void saveAndRemove() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); @@ -90,7 +90,7 @@ void updateState() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); @@ -99,7 +99,7 @@ void updateState() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.IN_PROGRESS); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); @@ -109,7 +109,7 @@ void updateState() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); @@ -118,7 +118,7 @@ void updateState() { assertThat(serviceInstanceState.getOperationState()).isEqualTo(OperationState.SUCCEEDED); assertThat(serviceInstanceState.getDescription()).isEqualTo("bar"); assertThat(serviceInstanceState.getLastUpdated()) - .isEqualToIgnoringSeconds(new Date()); + .isCloseTo(new Date(), 1000L); }) .verifyComplete(); } diff --git a/src/pmd/pmdRuleSet.xml b/src/pmd/pmdRuleSet.xml index be9598d53..91e782551 100644 --- a/src/pmd/pmdRuleSet.xml +++ b/src/pmd/pmdRuleSet.xml @@ -57,7 +57,6 @@ -