Update Spring Boot to v3.4.0

generators/liquibase/generator.ts

@@ -520,6 +520,8 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
           declaredConstructors: [
             'liquibase.database.LiquibaseTableNamesFactory.class',
             'liquibase.report.ShowSummaryGeneratorFactory.class',
+            'liquibase.changelog.FastCheckService.class',
+            'liquibase.changelog.visitor.ValidatingVisitorGeneratorFactory.class',
           ],
           publicConstructors: ['liquibase.ui.LoggerUIService.class'],
         });

generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs

@@ -49,6 +49,8 @@ import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 @Configuration
 public class LiquibaseConfiguration {
@@ -89,14 +91,18 @@ public class LiquibaseConfiguration {
         }
 <%_ } _%>
         liquibase.setChangeLog("classpath:config/liquibase/master.xml");
-        liquibase.setContexts(liquibaseProperties.getContexts());
+        if (!CollectionUtils.isEmpty(liquibaseProperties.getContexts())) {
+            liquibase.setContexts(StringUtils.collectionToCommaDelimitedString(liquibaseProperties.getContexts()));
+        }
         liquibase.setDefaultSchema(liquibaseProperties.getDefaultSchema());
         liquibase.setLiquibaseSchema(liquibaseProperties.getLiquibaseSchema());
         liquibase.setLiquibaseTablespace(liquibaseProperties.getLiquibaseTablespace());
         liquibase.setDatabaseChangeLogLockTable(liquibaseProperties.getDatabaseChangeLogLockTable());
         liquibase.setDatabaseChangeLogTable(liquibaseProperties.getDatabaseChangeLogTable());
         liquibase.setDropFirst(liquibaseProperties.isDropFirst());
-        liquibase.setLabelFilter(liquibaseProperties.getLabelFilter());
+        if (!CollectionUtils.isEmpty(liquibaseProperties.getLabelFilter())) {
+            liquibase.setLabelFilter(StringUtils.collectionToCommaDelimitedString(liquibaseProperties.getLabelFilter()));
+        }
         liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
         liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
         liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());

generators/server/resources/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [libraries]
-spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.4' }
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2024.0.0' }
 
 springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.7.0' }
 

generators/spring-boot/generator.ts

@@ -608,6 +608,16 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
           source.addMavenDependency!({ inProfile: 'docker-compose', ...dockerComposeArtifact, optional: true });
         }
       },
+      nativeSupport({ application, source }) {
+        const { graalvmSupport, reactive } = application;
+        if (graalvmSupport && !reactive) {
+          // Workaround https://github.com/spring-projects/spring-boot/issues/43260
+          source.addJavaDependencies?.([
+            { groupId: 'io.reactivex.rxjava3', artifactId: 'rxjava', scope: 'runtime' },
+            { groupId: 'io.projectreactor', artifactId: 'reactor-core', scope: 'runtime' },
+          ]);
+        }
+      },
     });
   }
 

generators/spring-boot/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs

@@ -46,7 +46,7 @@ import static tech.jhipster.config.logging.LoggingUtils.*;
 /*
  * Configures the console and Logstash log appenders from the app properties
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 <%_ if (serviceDiscoveryAny) { _%>
 @RefreshScope
 <%_ } _%>

generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs

@@ -52,10 +52,10 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 <%_ if (searchEngineElasticsearch) { _%>
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.auditing.AuditingHandler;
 import org.springframework.data.auditing.DateTimeProvider;
 <%_ } _%>
@@ -181,15 +181,15 @@ class UserServiceIT {
      *
      * @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
      */
-    @SpyBean
+    @MockitoSpyBean
     private UserSearchRepository spiedUserSearchRepository;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 
     @Autowired
     private AuditingHandler auditingHandler;
 
-    @MockBean
+    @MockitoBean
     private DateTimeProvider dateTimeProvider;
 <%_ } _%>
     <%_ if (!databaseTypeNo) { _%>

generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs

@@ -54,6 +54,7 @@ public class JwtAuthenticationTestUtils {
     }
 <%_ if (reactive) { _%>
 
+    // TODO switch to MockitoSpyBean https://github.com/spring-projects/spring-framework/issues/33941
     @MockBean
     private ReactiveUserDetailsService userDetailsService;
 <%_ } _%>

generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs

@@ -27,7 +27,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -56,7 +56,7 @@ class CustomClaimConverterIT {
 
     private final ObjectMapper mapper = new ObjectMapper();
 
-    @MockBean
+    @MockitoBean
     private RestTemplate restTemplate;
 
     @Autowired

generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs

@@ -45,7 +45,7 @@ import java.nio.charset.Charset;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -66,7 +66,7 @@ class MailServiceIT {
     @Autowired
     private JHipsterProperties jHipsterProperties;
 
-    @MockBean
+    @MockitoBean
     private JavaMailSender javaMailSender;
 
     @Captor

generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs

@@ -224,9 +224,8 @@ public class EntityManager {
         if (sortParameter != null && sortParameter.isSorted()) {
             RelationalPersistentEntity<?> entity = getPersistentEntity(entityType);
             if (entity != null) {
-                Sort sort = updateMapper.getMappedObject(sortParameter, entity);
                 selectFrom = selectFrom.orderBy(
-                    createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort)
+                    createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sortParameter)
                 );
             }
         }

test-integration/samples/.jhipster/JpaFilteringRelationship.json

@@ -43,7 +43,7 @@
       "otherEntityRelationshipName": "requiredManyToOneOtherSide",
       "relationshipName": "requiredManyToOne",
       "relationshipType": "many-to-one",
-      "relationshipValidateRules": "required"
+      "relationshipValidateRules https://github.com/spring-projects/spring-data-jpa/issues/3690": "required"
     },
     {
       "otherEntityField": "id",