SUPPORT-29677 update spring boot version

Author: lojzatran

examples/spring/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.6.0'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
     id "com.diffplug.spotless" version "6.10.0"
@@ -44,7 +44,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.session:spring-session-core'
-    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.2.RELEASE'
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'

examples/spring/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java

@@ -129,14 +129,15 @@ private ProjectApiRoot meClient(final ApiHttpClient client, final Mono<WebSessio
             TokenStorage storage = new SessionTokenStorage(session);
 
             ApiRootBuilder builder = ApiRootBuilder.of(client)
-                    .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl: ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
+                    .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl : ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
                     .withProjectKey(projectKey);
 
             if (authUrl != null) {
-                builder = builder.withAnonymousRefreshFlow(credentials(), authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl +  "/oauth/token", storage);
-            } else {
-                builder = builder
-                    .withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
+                builder = builder.withAnonymousRefreshFlow(credentials(),
+                    authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl + "/oauth/token", storage);
+            }
+            else {
+                builder = builder.withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
             }
 
             return builder.build(projectKey);

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/MeClientFilter.java

@@ -64,14 +64,15 @@ private ProjectApiRoot meClient(ApiHttpClient client, Mono<WebSession> session)
         final TokenStorage storage = new SessionTokenStorage(session);
 
         ApiRootBuilder builder = ApiRootBuilder.of(client)
-                .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl: ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
+                .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl : ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
                 .withProjectKey(projectKey);
 
         if (authUrl != null) {
-            builder = builder.withAnonymousRefreshFlow(credentials(), authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl +  "/oauth/token", storage);
-        } else {
-            builder = builder
-                    .withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
+            builder = builder.withAnonymousRefreshFlow(credentials(),
+                authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl + "/oauth/token", storage);
+        }
+        else {
+            builder = builder.withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
         }
 
         return builder.build(projectKey);

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/WebConfig.java

@@ -13,11 +13,11 @@
 import org.springframework.web.reactive.config.ResourceHandlerRegistry;
 import org.springframework.web.reactive.config.ViewResolverRegistry;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
-import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring5.ISpringWebFluxTemplateEngine;
-import org.thymeleaf.spring5.SpringWebFluxTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.reactive.ThymeleafReactiveViewResolver;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
+import org.thymeleaf.spring6.SpringWebFluxTemplateEngine;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.view.reactive.ThymeleafReactiveViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 
 @Configuration

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/service/CtpClientBeanService.java

@@ -7,7 +7,6 @@
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.oauth2.ClientCredentials;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -41,15 +40,15 @@ public ApiHttpClient client() {
         ApiRootBuilder builder;
         if (authUrl != null) {
             builder = ApiRootBuilder.of().defaultClient(credentials(), authUrl + "/oauth/token", apiBaseUrl);
-        } else {
+        }
+        else {
             builder = ApiRootBuilder.of().defaultClient(credentials());
         }
 
         return builder.buildClient();
     }
 
     @Bean
-    @Autowired
     public ProjectApiRoot apiRoot(ApiHttpClient client) {
 
         final ProjectApiRoot build = ProjectApiRoot.fromClient(projectKey, client);

examples/spring/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
               class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%logger{1.}): requestId=%X{requestId} %msg%n%throwable
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%logger{1}): requestId=%X{requestId} %msg%n%throwable
             </Pattern>
         </layout>
     </appender>