-
Notifications
You must be signed in to change notification settings - Fork 319
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.
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
Upgrade to Spring Boot 3.0.0 #1287
Conversation
8cf7cb7
to
b57dd4c
Compare
7429583
to
ea807c7
Compare
08ebdf6
to
69545ab
Compare
0cb8ffe
to
80cbbd8
Compare
Hi @elefeint, could you sign the CLA? The previous one seems expired. |
CLA |
d5fbb9c
to
4a2a4d7
Compare
I modify the commits to reset the author, hope you don't mind, Elena. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First pass...
This an impressive amount of work! It would probably have been easier for reviewing to split into separate PRs, but I think we can manage this time.
In addition to the comments inline, here are a few more observations:
- There are still many references in comments, documentation, and text for ListenableFuture which should be replaced with CompletableFuture.
- spring-cloud-gcp-starter-sql-mysql-r2dbc directory has not been deleted
- sql.adoc is not updated to remove mysql-r2dbc
- Generally, please make sure that sample code in the documentation is still correct
- There are still numerous mentions of Sleuth in the project, mostly in documentation.
...c/main/java/com/google/cloud/spring/autoconfigure/bigquery/GcpBigQueryAutoConfiguration.java
Show resolved
Hide resolved
@EnableConfigurationProperties({GcpTraceProperties.class}) | ||
@ConditionalOnProperty( | ||
value = {"spring.sleuth.enabled", "spring.cloud.gcp.trace.enabled"}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the replacement for these properties in Spring Boot?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sleuth
is removed from Spring Cloud release train, so sleuth-related properties are no longer exist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sleuth
was replaced by Micrometer Tracing
https://github.com/micrometer-metrics/tracing/wiki/Spring-Cloud-Sleuth-3.1-Migration-Guide
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JoeWang1127 Mike is asking a replacement of this property exists or not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
spring.sleuth.enabled
doesn't exist anymore.
To use trace, set spring.cloud.gcp.trace.enabled
to true
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good. Ensure the migration document has the explanation.
spring-cloud-gcp-core/src/main/java/com/google/cloud/spring/core/util/MapBuilder.java
Outdated
Show resolved
Hide resolved
...spanner/src/test/java/com/google/cloud/spring/data/spanner/test/domain/SingerRepository.java
Show resolved
Hide resolved
...g-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/src/main/java/com/example/Trader.java
Show resolved
Hide resolved
@@ -16,8 +16,6 @@ spring.cloud.stream.gcp.pubsub.bindings.logUserMessage-in-0.consumer.ackMode=MAN | |||
# The application also subscribes to the dead letter topic to show that it's just another normal topic. | |||
spring.cloud.stream.bindings.deadLetterMessages-in-0.destination=my-dead-letter-topic | |||
|
|||
spring.cloud.stream.gcp.pubsub.default.consumer.auto-create-resources=true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still in the docs though. Please update documentation as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The docs are updated.
I'm not sure whether we still need the polling example and I'll do more research about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The legacy imperative programming model has been removed, so we don't need the polling example now.
...les/spring-cloud-gcp-pubsub-stream-polling-sample/src/main/java/com/example/SinkExample.java
Show resolved
Hide resolved
...ud-gcp-samples/spring-cloud-gcp-secretmanager-sample/src/main/resources/bootstrap.properties
Show resolved
Hide resolved
Kudos, SonarCloud Quality Gate passed! |
Congrats guys on this nice job. |
Thank you for the work. Impatiently waiting for this to be published in maven central. |
This is awesome. Thank you guys for this awesome work. |
Congrats on the great work! Is there any upgrade guide available? I've run into this error after bumping up to 4.0.0:
|
Hi @codependent, here is the migration guide. Feel free to file an issue if you have any questions. Thanks. |
These are residual files from sample modules that are removed as part of #1287. They are unused and should be removed. - `spring-cloud-gcp-pubsub-stream-polling-sample` is meant to be removed: #1287 (comment) - `spring-cloud-gcp-pubsub-stream-sample` replaced by [functional sample](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/tree/main/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample)
…ve sample. (#1851) This pr cleans up setups in pom for `spring-cloud-gcp-data-firestore-sample` related to native support (configured with outdated `org.springframework.experimental:spring-native-configuration`). It reverts what's added for the sample in #508. The relevant native support module has stopped working for a while and was deleted in #1287. So it should be safe to also remove these setups in sample.
This sample was removed as part of #1287
BEGIN_COMMIT_OVERRIDE
feat!: This release officially introduces Spring Boot 3.x compatibility. Note that breaking changes occur in this release. For full list of changes, refer to this.
END_COMMIT_OVERRIDE
Migration guide
Migration Guide from Spring Cloud GCP 3.x to 4.x
Changes applied to all modules
Changes in each module
ListenableFuture
andSettableListenableFuture
withCompletableFuture
, referencer2dbc-mysql
ClassTypeInformation
withTypeInformation
, referenceDatastoreRepository
, referencespring-shell
dependencyClassTypeInformation
withTypeInformation
, referencejavax.servlet
withjakarta.servlet
, referenceListenableFuture
andSettableListenableFuture
withCompletableFuture
, referencespring-cloud-stream-binder-test
tospring-cloud-stream-test-support
, referenceGcpSecretManagerBootstrapConfiguration
javax.servlet
withjakarta.servlet
, referencePreferredConstructor
withInstanceCreatorMetadata
ClassTypeInformation
withTypeInformation
, referenceSpannerRepository
, referencespring-cloud-sleuth
dependencyListenableFuture
andSettableListenableFuture
withCompletableFuture
, reference