Upgrade to Spring Boot 3.0.0

.github/workflows/integrationTests.yaml

@@ -50,26 +50,10 @@ jobs:
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d' --utc)"
       - uses: actions/checkout@v2
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v1
-        if: matrix.it != 'native'
         with:
-          java-version: 11
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
-        if: matrix.it == 'native' # note that this is no longer in the matrix
-        with:
-          graalvm: '21.2.0'
-          java: 'java11'
-          arch: 'amd64'
-      - name: Install GraalVM Native Image
-        if: matrix.it == 'native'
-        run: gu install native-image
-      - uses: actions/cache@v2
-        id: mvn-cache
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.date }}
+          java-version: 17
       - name: Setup gcloud
         uses: google-github-actions/setup-gcloud@v0
         with:

.github/workflows/sonar.yaml

@@ -21,10 +21,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v2
         with:

.github/workflows/unitTests.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [17, 19]
     steps:
     - name: Get current date
       id: date
@@ -103,7 +103,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - uses: actions/cache@v2
         id: mvn-cache

.kokoro/publish_javadoc11.sh

@@ -79,6 +79,7 @@ sudo pandoc \
   docs/src/main/md/kotlin.md              \
   docs/src/main/md/configuration.md       \
   docs/src/main/md/migration-guide-1.x.md \
+  docs/src/main/md/migration-guide-3.x.md \
   -t markdown_github -o docs/src/main/md/documentation.md
 
 # copy and replace {project-version} documentation

CHANGELOG.md

@@ -14,15 +14,103 @@ refer to the [commit
 history](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commits/main)
 on GitHub.
 
+## 4.0.0
+
+### Generals
+This release officially introduces Spring Boot 3.x compatibility. Note that breaking changes occur in this release.
+
+All changes within one large [Pull Request](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/pull/1287) as we think split PRs may bring compatibility issues. For the rational of each change, please refer to the description of the PR.
+
+### Important version upgrades
+* Minimum Java version: Java 17
+* Spring Framework libraries upgrade
+    - [Spring Boot 3.0](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Migration-Guide)
+    - [Spring Framework 6.0](https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-6.x)
+    - [Spring Cloud 2022.0](https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes)
+* Upgrade plugin versions
+* [Enable auto-configuration](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Migration-Guide#auto-configuration-files)
+* Fix [#1294](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/1294)
+
+### Bigquery
+* Remove deprecated methods
+* Replace `ListenableFuture` and `SettableListenableFuture` with `CompletableFuture`
+* Code polish
+* Improve code coverage
+
+### Cloud SQL
+* Remove support for `r2dbc-mysql`
+* Fix [#1200](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/1200)
+
+### Datastore
+* Remove deprecated methods and constructors
+* Replace `ClassTypeInformation` with `TypeInformation`
+* Extend inheritance of `DatastoreRepository`
+* Change datastore-basic-sample to a web application to remove `spring-shell` dependency
+* Fix broken tests
+* Code polish
+
+### Firestore
+* Replace `ClassTypeInformation` with `TypeInformation`
+* Code polish
+
+### Kotlin sample
+* Code polish
+
+### Logging
+* Replace `javax.servlet` with `jakarta.servlet`
+* Remove deprecated methods
+* Code polish
+
+### Native support
+* Delete the module
+
+### Pubsub
+* Replace `ListenableFuture` and `SettableListenableFuture` with `CompletableFuture`
+* Remove deprecated methods and constructors
+* Code polish
+
+### Pubsub-stream-binder
+* Change to functional programming model
+* Change `spring-cloud-stream-binder-test` to `spring-cloud-stream-test-support`
+* Fix broken tests
+
+### Secret Manager
+* Delete `GcpSecretManagerBootstrapConfiguration`
+
+### Security
+* Replace `javax.servlet` with `jakarta.servlet`
+
+### Spanner
+* Replace `PreferredConstructor` with `InstanceCreatorMetadata`
+* Replace `ClassTypeInformation` with `TypeInformation`
+* Remove deprecated methods and constructors
+* Extend inheritance of `SpannerRepository`
+* Fix broken tests
+* Code polish
+
+### Storage
+* Remove deprecated methods
+* Code polish
+* Improve code coverage
+
+### Trace
+* Remove `spring-cloud-sleuth` dependency
+* Instrument trace using Observation API
+* Remove deprecated methods
+* Fix broken tests
+
+### Vision
+* Replace `ListenableFuture` and `SettableListenableFuture` with `CompletableFuture`
+* Fix broken tests
+* Code polish
+
 ## [3.4.2](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v3.4.1...v3.4.2) (2023-01-18)
 
 
 ### Documentation
 
 * Fixes docs related to keeping a background user thread - pub/sub ([2802b8e](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/2802b8e4dd22dadb9643efe73bca3615435ac362))
 
-## 3.5.0-SNAPSHOT
-
 ## 3.4.0
 
 ### General

README.adoc

@@ -36,7 +36,6 @@ Currently, this repository provides support for:
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql[Google Cloud SQL MySQL]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql[Google Cloud SQL PostgreSQL]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage[Google Cloud Storage]
-** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace[Google Cloud Trace with Spring Cloud Sleuth]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager[Google Secret Manager]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase[Firebase Authentication]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap[Google Cloud IAP Authentication]
@@ -55,6 +54,7 @@ This project has dependency and transitive dependencies on Spring Projects. The
 
 |2.0.x |https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2020.0-Release-Notes[2020.0.x] (3.0/Illford) |2.4.x, 2.5.x|5.3.x| No
 |3.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2021.0-Release-Notes[2021.0.x] (3.1/Jubilee) |2.6.x, 2.7.x | 5.3.x| Yes
+|4.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes[2022.0.x] (4.0/Kilburn) |https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes[3.x]| https://github.com/spring-projects/spring-framework/wiki/What%27s-New-in-Spring-Framework-6.x[6.x]| Yes
 |===
 
 == Spring Initializr
@@ -77,7 +77,7 @@ This will allow you to not specify versions for any of the Maven dependencies an
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>spring-cloud-gcp-dependencies</artifactId>
-            <version>3.4.0</version>
+            <version>4.0.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

docs/pom.xml

@@ -13,7 +13,7 @@
 	<name>Spring Framework on Google Cloud Documentation</name>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-docs</artifactId>
-	<version>3.4.3-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>4.0.0-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<packaging>pom</packaging>
 
 	<properties>
@@ -23,7 +23,7 @@
 		<upload-docs-zip.phase>none</upload-docs-zip.phase>
 
 		<!--maven-resources-plugin:3.2.0:copy-resources fails: https://issues.apache.org/jira/browse/MSHARED-966-->
-		<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
+		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
 	</properties>
 
 	<repositories>

docs/src/main/asciidoc/bigquery.adoc

@@ -84,7 +84,7 @@ Below is a code snippet of how to load a CSV data `InputStream` to a BigQuery ta
 BigQueryTemplate bigQueryTemplate;
 
 public void loadData(InputStream dataInputStream, String tableName) {
-  ListenableFuture<Job> bigQueryJobFuture =
+  CompletableFuture<Job> bigQueryJobFuture =
       bigQueryTemplate.writeDataToTable(
           tableName,
           dataFile.getInputStream(),
@@ -111,7 +111,7 @@ BigQueryTemplate bigQueryTemplate;
    */
   public void loadJsonStream(String tableName, InputStream jsonInputStream)
       throws ExecutionException, InterruptedException {
-    ListenableFuture<WriteApiResponse> writeApFuture =
+    CompletableFuture<WriteApiResponse> writeApFuture =
         bigQueryTemplate.writeJsonStream(tableName, jsonInputStream);
     WriteApiResponse apiRes = writeApFuture.get();//get the WriteApiResponse
     if (!apiRes.isSuccessful()){
@@ -139,7 +139,7 @@ BigQueryTemplate bigQueryTemplate;
    */
   public void createTableAndloadJsonStream(String tableName, InputStream jsonInputStream, Schema tableSchema)
       throws ExecutionException, InterruptedException {
-    ListenableFuture<WriteApiResponse> writeApFuture =
+    CompletableFuture<WriteApiResponse> writeApFuture =
         bigQueryTemplate.writeJsonStream(tableName, jsonInputStream, tableSchema);//using the overloaded method which created the table when tableSchema is passed
     WriteApiResponse apiRes = writeApFuture.get();//get the WriteApiResponse
     if (!apiRes.isSuccessful()){
@@ -200,12 +200,12 @@ Alternatively, you may omit these headers and explicitly set the table name or f
 After the `BigQueryFileMessageHandler` processes a message to load data to your BigQuery table, it will respond with a `Job` on the reply channel.
 The https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/bigquery/package-summary.html[Job object] provides metadata and information about the load file operation.
 
-By default, the `BigQueryFileMessageHandler` is run in asynchronous mode, with `setSync(false)`, and it will reply with a `ListenableFuture<Job>` on the reply channel.
+By default, the `BigQueryFileMessageHandler` is run in asynchronous mode, with `setSync(false)`, and it will reply with a `CompletableFuture<Job>` on the reply channel.
 The future is tied to the status of the data loading job and will complete when the job completes.
 
 If the handler is run in synchronous mode with `setSync(true)`, then the handler will block on the completion of the loading job and block until it is complete.
 
-NOTE: If you decide to use Spring Integration Gateways and you wish to receive `ListenableFuture<Job>` as a reply object in the Gateway, you will have to call `.setAsyncExecutor(null)` on your `GatewayProxyFactoryBean`.
+NOTE: If you decide to use Spring Integration Gateways and you wish to receive `CompletableFuture<Job>` as a reply object in the Gateway, you will have to call `.setAsyncExecutor(null)` on your `GatewayProxyFactoryBean`.
 This is needed to indicate that you wish to reply on the built-in async support rather than rely on async handling of the gateway.
 
 === Sample

docs/src/main/asciidoc/first-page.adoc

@@ -17,7 +17,7 @@ Spring Framework on Google Cloud lets you leverage the power and simplicity of t
 - Map objects, relationships, and collections with Spring Data Cloud Spanner, Spring Data Cloud Datastore and Spring Data Reactive Repositories for Cloud Firestore
 - Write and read from Spring Resources backed up by Google Cloud Storage
 - Exchange messages with Spring Integration using Google Cloud Pub/Sub on the background
-- Trace the execution of your app with Spring Cloud Sleuth and Google Cloud Trace
+- Trace the execution of your app with Micrometer and Google Cloud Trace
 - Configure your app with Spring Cloud Config, backed up by the Google Runtime Configuration API
 - Consume and produce Google Cloud Storage data via Spring Integration GCS Channel Adapters
 - Use Spring Security via Google Cloud IAP

docs/src/main/asciidoc/index.adoc

@@ -17,7 +17,7 @@ Spring Framework on Google Cloud lets you leverage the power and simplicity of t
 - Map objects, relationships, and collections with Spring Data Cloud Spanner, Spring Data Cloud Datastore and Spring Data Reactive Repositories for Cloud Firestore
 - Write and read from Spring Resources backed up by Google Cloud Storage
 - Exchange messages with Spring Integration using Google Cloud Pub/Sub on the background
-- Trace the execution of your app with Spring Cloud Sleuth and Google Cloud Trace
+- Trace the execution of your app with Micrometer and Google Cloud Trace
 - Configure your app with Spring Cloud Config, backed up by the Google Runtime Configuration API
 - Consume and produce Google Cloud Storage data via Spring Integration GCS Channel Adapters
 - Use Spring Security via Google Cloud IAP
@@ -74,3 +74,5 @@ include::kotlin.adoc[]
 To see the list of all Google Cloud related configuration properties please check link:appendix.html[the Appendix page].
 
 include::migration-guide-1.x.adoc[]
+
+include::migration-guide-3.x.adoc[]

docs/src/main/asciidoc/logging.adoc

@@ -23,8 +23,8 @@ dependencies {
 https://cloud.google.com/logging/[Cloud Logging] is the managed logging service provided by Google Cloud.
 
 This module provides support for associating a web request trace ID with the corresponding log entries.
-It does so by retrieving the `X-B3-TraceId` value from the https://logback.qos.ch/manual/mdc.html[Mapped Diagnostic Context (MDC)], which is set by Spring Cloud Sleuth.
-If Spring Cloud Sleuth isn't used, the configured `TraceIdExtractor` extracts the desired header value and sets it as the log entry's trace ID.
+It does so by retrieving the `X-B3-TraceId` value from the https://logback.qos.ch/manual/mdc.html[Mapped Diagnostic Context (MDC)], which is set by Micrometer.
+If Micrometer isn't used, the configured `TraceIdExtractor` extracts the desired header value and sets it as the log entry's trace ID.
 This allows grouping of log messages by request, for example, in the https://console.cloud.google.com/logs/viewer[Google Cloud Console Logs viewer].
 
 NOTE: Due to the way logging is set up, the Google Cloud project ID and credentials defined in `application.properties` are ignored.
@@ -35,12 +35,12 @@ You can do this easily if you're using the https://cloud.google.com/sdk[Google C
 
 For use in Web MVC-based applications, `TraceIdLoggingWebMvcInterceptor` is provided that extracts the request trace ID from an HTTP request using a `TraceIdExtractor` and stores it in a thread-local, which can then be used in a logging appender to add the trace ID metadata to log messages.
 
-WARNING: If Spring Framework on Google Cloud Trace is enabled, the logging module disables itself and delegates log correlation to Spring Cloud Sleuth.
+WARNING: If Spring Framework on Google Cloud Trace is enabled, the logging module disables itself and delegates log correlation to Micrometer.
 
 `LoggingWebMvcConfigurer` configuration class is also provided to help register the `TraceIdLoggingWebMvcInterceptor` in Spring MVC applications.
 
 Applications hosted on the Google Cloud include trace IDs under the `x-cloud-trace-context` header, which will be included in log entries.
-However, if Sleuth is used the trace ID will be picked up from the MDC.
+However, if Micrometer is used the trace ID will be picked up from the MDC.
 
 === Logback Support
 
@@ -141,7 +141,7 @@ If `projectId` is not set and cannot be determined, then it'll log `traceId` wit
 | `includeLevel` | `true` | Should the severity be included
 | `includeThreadName` | `true` | Should the thread name be included
 | `includeMDC` | `true` | Should all MDC properties be included.
-The MDC properties `X-B3-TraceId`, `X-B3-SpanId` and `X-Span-Export` provided by Spring Sleuth will get excluded as they get handled separately
+The MDC properties `X-B3-TraceId`, `X-B3-SpanId` and `X-Span-Export` provided by Micrometer will get excluded as they get handled separately
 | `includeLoggerName` | `true` | Should the name of the logger be included
 | `includeFormattedMessage` | `true` | Should the formatted log message be included.
 | `includeExceptionInMessage` | `true` | Should the stacktrace be appended to the formatted log message.