From d8f02dd91143eaa0f3191a5ed1dd172dfcde7503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20C=2E=20R=C3=ADos?= <albertoimpl@gmail.com>
Date: Wed, 3 Jul 2024 13:37:11 +0200
Subject: [PATCH] Upgrading spring boot to 3.3.1

---
 settings.gradle                                    |  2 +-
 ...InMemoryServiceInstanceStateRepositoryTest.java | 14 +++++++-------
 src/pmd/pmdRuleSet.xml                             |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 9b1a93b..660e2c7 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 b2caf55..ebbddff 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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 @@ class InMemoryServiceInstanceStateRepositoryTest {
 				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 be9598d..91e7825 100644
--- a/src/pmd/pmdRuleSet.xml
+++ b/src/pmd/pmdRuleSet.xml
@@ -57,7 +57,6 @@
 <!--	</rule>-->
 	<rule ref="category/java/errorprone.xml">
 		<exclude name="AvoidFieldNameMatchingMethodName" />
-		<exclude name="BeanMembersShouldSerialize" />
 		<exclude name="DataflowAnomalyAnalysis" />
 		<exclude name="InvalidLogMessageFormat" />
 		<exclude name="ReturnEmptyCollectionRatherThanNull" />