Skip to content

(2.3.x): Upgrading spring boot to 3.3.1 #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2024
Merged

(2.3.x): Upgrading spring boot to 3.3.1 #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c333083
Upgrading spring boot to 3.3.1
Albertoimpl Jul 3, 2024
9730409
Upgrading osb to latest M1
Albertoimpl Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
14 changes: 7 additions & 7 deletions ...org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isCloseTo is definitely the right choice here, but are we sure 1 sec is enough to avoid flakes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested every method locally with @RepeatedTest(10000) and nothing failed.
Just did it again with 100.000 repetitions and they were all still happy.

})
.verifyComplete();

Expand All @@ -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();
}
Expand All @@ -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();

Expand All @@ -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();

Expand All @@ -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();

Expand All @@ -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();

Expand All @@ -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();
}
Expand Down
1 change: 0 additions & 1 deletion src/pmd/pmdRuleSet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down