generator-jhipster 8.7.1 → 8.7.3

package/dist/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs

@@ -329,46 +329,52 @@ sonar.password=admin
 
 For more information, refer to the [Code quality page][].
 
-### Using Docker to simplify development (optional)
+### Docker Compose support
 
-You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
+JHipster generates a number of Docker Compose configuration files in the [<%- dockerServicesDir %>](<%- dockerServicesDir %>) folder to launch required third party services.
 
-<%_ if (!databaseTypeNo) { _%>
-For example, to start a <%= prodDatabaseType %> database in a docker container, run:
+For example, to start required services in Docker containers, run:
 
 ```
-docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml up -d
+docker compose -f <%- dockerServicesDir %>services.yml up -d
 ```
 
-To stop it and remove the container, run:
+To stop and remove the containers, run:
 
 ```
-docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml down
+docker compose -f <%- dockerServicesDir %>services.yml down
 ```
-<%_ } _%>
 
-You can also fully dockerize your application and all the services that it depends on.
-To achieve this, first build a docker image of your app by running:
+[Spring Docker Compose Integration](https://docs.spring.io/spring-boot/reference/features/dev-services.html) is enable by default. It's possible to disable it in application.yml:
 
+```yaml
+spring:
+  ...
+  docker:
+    compose:
+      enabled: false
 ```
+
+You can also fully dockerize your application and all the services that it depends on.
+To achieve this, first build a Docker image of your app by running:
+
+```sh
 npm run java:docker
 ```
 
-Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
+Or build a arm64 Docker image when using an arm64 processor os like MacOS with M1 processor family running:
 
-```
+```sh
 npm run java:docker:arm64
 ```
 
 Then run:
 
-```
+```sh
 docker compose -f <%- dockerServicesDir %>app.yml up -d
 ```
 
-When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental `Use the new Virtualization framework` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).
-
-For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
+For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the Docker Compose sub-generator (`jhipster docker-compose`), which is able to generate Docker configurations for one or several JHipster applications.
 
 ## Continuous Integration (optional)
 

package/dist/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs

@@ -24,56 +24,12 @@ sourceSets {
         }
     }
 }
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-
-configurations {
-  all {
-    resolutionStrategy {
-  <%_ if (prodDatabaseDriver?.r2dbc?.version) { _%>
-      force "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>:<%- prodDatabaseDriver.r2dbc.version %>"
-  <%_ } _%>
-  <%_ if (prodDatabaseDriver?.jdbc?.version) { _%>
-      force "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>:<%- prodDatabaseDriver.jdbc.version %>"
-  <%_ } _%>
-    }
-  }
-}
 
+<%_ } _%>
 dependencies {
     developmentOnly "org.springframework.boot:spring-boot-devtools"
-  <%_ if (devDatabaseTypeH2Any && !reactive) { _%>
-    implementation "com.h2database:h2"
-  <%_ } _%>
-  <%_ if (devDatabaseTypeOracle) { _%>
-    implementation "com.oracle.database.jdbc:ojdbc8"
-  <%_ } _%>
-  <%_ if (devDatabaseTypeH2Any && reactive) { _%>
-    implementation "io.r2dbc:r2dbc-h2"
-  <%_ } _%>
-  <%_ if (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypePostgres || devDatabaseTypeMysql) { _%>
-    <%_ if (reactive) { _%>
-    implementation "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>"
-    <%_ } _%>
-    implementation "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMariadb) { _%>
-    testImplementation "org.testcontainers:mariadb"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMssql) { _%>
-    testImplementation "org.testcontainers:mssqlserver"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMysql) { _%>
-    testImplementation "org.testcontainers:mysql"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeOracle) { _%>
-    testImplementation "org.testcontainers:oracle-xe"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypePostgresql) { _%>
-    testImplementation "org.testcontainers:postgresql"
-  <%_ } _%>
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
-<%_ } _%>
 
 ext {
     springProfiles = "dev" + springProfiles

package/dist/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs

@@ -16,55 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (devDatabaseType !== prodDatabaseType && (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypeMysql || devDatabaseTypePostgres)) { _%>
-sourceSets {
-    test {
-        java {
-            exclude '<%= packageFolder %>/config/<% if (devDatabaseTypeMariadb) { %>Mariadb<% } else if (devDatabaseTypeMssql) { %>MsSql<% } else if (devDatabaseTypeMysql) { %>Mysql<% } else if (devDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
-        }
-    }
-}
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-
-configurations {
-  all {
-    resolutionStrategy {
-  <%_ if (prodDatabaseDriver?.r2dbc?.version) { _%>
-      force "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>:<%- prodDatabaseDriver.r2dbc.version %>"
-  <%_ } _%>
-  <%_ if (prodDatabaseDriver?.jdbc?.version) { _%>
-      force "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>:<%- prodDatabaseDriver.jdbc.version %>"
-  <%_ } _%>
-    }
-  }
-}
-
 dependencies {
-  <%_ if (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgresql) { _%>
-    <%_ if (reactive) { _%>
-    implementation "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>"
-    <%_ } _%>
-    implementation "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMariadb) { _%>
-    testImplementation "org.testcontainers:mariadb"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMssql) { _%>
-    testImplementation "org.testcontainers:mssqlserver"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeMysql) { _%>
-    testImplementation "org.testcontainers:mysql"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypeOracle) { _%>
-    implementation "com.oracle.database.jdbc:ojdbc8"
-    testImplementation "org.testcontainers:oracle-xe"
-  <%_ } _%>
-  <%_ if (prodDatabaseTypePostgresql) { _%>
-    testImplementation "org.testcontainers:postgresql"
-  <%_ } _%>
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
-<%_ } _%>
 
 ext {
     springProfiles = "prod" + springProfiles

package/dist/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs

@@ -41,8 +41,11 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;
+<%_ if (devDatabaseTypeH2Any) { _%>
+import org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration;
+<%_ } _%>
 
-@SpringBootApplication
+@SpringBootApplication(<% if (devDatabaseTypeH2Any) { %>exclude = { H2ConsoleAutoConfiguration.class }<% } %>)
 @EnableConfigurationProperties({<% if (databaseMigrationLiquibase) { %>LiquibaseProperties.class, <% } %>ApplicationProperties.class})
 public class <%= mainClass %> {
 

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs

@@ -51,6 +51,10 @@ import tech.jhipster.web.filter.CookieCsrfFilter;
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+<%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -113,6 +117,10 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.web.server.WebFilterChainProxy;
+import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
+<%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
 import org.springframework.util.StringUtils;
 <%_ } _%>
@@ -194,17 +202,13 @@ public class SecurityConfiguration {
 <%_ if (!skipClient) { _%>
                     .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.txt"), mvc.pattern("/*.json"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
                     .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
-  <%_ if (clientFrameworkVue) { _%>
+  <%_ if (clientBundlerVite) { _%>
                     .requestMatchers(mvc.pattern("/assets/**")).permitAll()
-    <%_ if (microfrontend) { _%>
-                    .requestMatchers(mvc.pattern("/app/**")).permitAll()
-                    .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
-    <%_ } _%>
   <%_ } else { _%>
                     .requestMatchers(mvc.pattern("/app/**")).permitAll()
                     .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
-  <%_ } _%>
                     .requestMatchers(mvc.pattern("/content/**")).permitAll()
+  <%_ } _%>
                     .requestMatchers(mvc.pattern("/swagger-ui/**")).permitAll()
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
@@ -227,6 +231,9 @@ public class SecurityConfiguration {
 <%_ if (applicationTypeGateway) { _%>
   <%_ if (microfrontend) { _%>
                     // microfrontend resources are loaded by webpack without authentication, they need to be public
+    <%_ if (clientBundlerVite) { _%>
+                    .requestMatchers(mvc.pattern("/services/*/assets/**")).permitAll()
+    <%_ } _%>
                     .requestMatchers(mvc.pattern("/services/*/*.js")).permitAll()
                     .requestMatchers(mvc.pattern("/services/*/*.txt")).permitAll()
                     .requestMatchers(mvc.pattern("/services/*/*.json")).permitAll()
@@ -417,4 +424,20 @@ public class SecurityConfiguration {
         }
     }
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+
+    // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
+    @Bean
+    BeanPostProcessor beanPostProcessor() {
+        return new BeanPostProcessor() {
+            @Override
+            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+                if (bean instanceof WebFilterChainProxy springSecurity) {
+                    springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
+                }
+                return bean;
+            }
+        };
+    }
+<%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs

@@ -39,6 +39,10 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties;
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+<%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 <%_ if (authenticationTypeOauth2) { _%>
@@ -114,6 +118,10 @@ import org.springframework.security.web.server.savedrequest.NoOpServerRequestCac
 <%_ } _%>
 import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
 import org.springframework.security.web.server.util.matcher.OrServerWebExchangeMatcher;
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.web.server.WebFilterChainProxy;
+import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
+<%_ } _%>
 <%_ if (authenticationUsesCsrf) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
@@ -214,19 +222,16 @@ public class SecurityConfiguration {
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
-  <%_ if (clientFrameworkVue) { _%>
                 pathMatchers(
+  <%_ if (clientBundlerVite) { _%>
                     "/assets/**",
-    <%_ if (microfrontend) { _%>
+  <%_ } else { _%>
                     "/app/**",
                     "/i18n/**",
                     "/content/**",
-    <%_ } _%>
+  <%_ } _%>
                     "/swagger-ui/**"
                 )
-  <%_ } else { _%>
-                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**")
-  <%_ } _%>
             )))
 <%_ if (!applicationTypeMicroservice) { _%>
             .cors(withDefaults())
@@ -286,10 +291,15 @@ public class SecurityConfiguration {
 <%_ if (applicationTypeGateway) { _%>
   <%_ if (microfrontend) { _%>
                     // microfrontend resources are loaded by webpack without authentication, they need to be public
+    <%_ if (clientBundlerVite) { _%>
+                    .pathMatchers("/services/*/assets/**").permitAll()
+                    .pathMatchers("/services/*/*.js").permitAll()
+    <%_ } else { _%>
                     .pathMatchers("/services/*/*.js").permitAll()
                     .pathMatchers("/services/*/*.txt").permitAll()
                     .pathMatchers("/services/*/*.json").permitAll()
                     .pathMatchers("/services/*/*.js.map").permitAll()
+    <%_ } _%>
   <%_ } _%>
                     .pathMatchers("/services/*/management/health/readiness").permitAll()
                     .pathMatchers("/services/*/v3/api-docs").hasAuthority(AuthoritiesConstants.ADMIN)
@@ -480,4 +490,20 @@ public class SecurityConfiguration {
         return Mono.empty();
     }
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+
+    // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
+    @Bean
+    BeanPostProcessor beanPostProcessor() {
+        return new BeanPostProcessor() {
+            @Override
+            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+                if (bean instanceof WebFilterChainProxy springSecurity) {
+                    springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
+                }
+                return bean;
+            }
+        };
+    }
+<%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs

@@ -26,6 +26,7 @@ import tech.jhipster.config.JHipsterConstants;
 <%_ } _%>
 import tech.jhipster.config.JHipsterProperties;
 <%_ if (devDatabaseTypeH2Any) { _%>
+import tech.jhipster.config.ApplicationProperties;
 import tech.jhipster.config.h2.H2ConfigurationHelper;
 <%_ } _%>
 <%_ if (!skipClient && reactive) { _%>
@@ -102,14 +103,15 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
 <%_ } _%>
     private final JHipsterProperties jHipsterProperties;
 
-    public WebConfigurer(<% if (!reactive || (devDatabaseTypeH2Any && reactive)) { %>Environment env, <% } %>JHipsterProperties jHipsterProperties) {
+    public WebConfigurer(<% if (!reactive || devDatabaseTypeH2Any) { %>Environment env, <% } %>JHipsterProperties jHipsterProperties) {
 <%_ if (!reactive) { _%>
         this.env = env;
 <%_ } _%>
         this.jHipsterProperties = jHipsterProperties;
 <%_ if (devDatabaseTypeH2Any && reactive) { _%>
-        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
+        if (h2ConsoleIsEnabled(env)) {
             try {
+                LOG.info("Initialize H2 console");
                 H2ConfigurationHelper.initH2Console();
             } catch (Exception e) {
                 // Console may already be running on another app or after a refresh.
@@ -118,8 +120,6 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         }
 <%_ } _%>
     }
-
-
 <%_ if (!reactive) { _%>
 
     @Override
@@ -129,7 +129,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         }
 
   <%_ if (devDatabaseTypeH2Any) { _%>
-        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
+        if (h2ConsoleIsEnabled(env)) {
             initH2Console(servletContext);
         }
   <%_ } _%>
@@ -170,7 +170,6 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         }
         return extractedPath.substring(0, extractionEndIndex);
     }
-
   <%_ } _%>
 <%_ } _%>
 
@@ -230,14 +229,20 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     }
   <%_ } _%>
 <%_ } _%>
-<%_ if (devDatabaseTypeH2Any && !reactive) { _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
+
+    private boolean h2ConsoleIsEnabled(Environment env) {
+        return env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) && "true".equals(env.getProperty("spring.h2.console.enabled"));
+    }
+  <%_ if (!reactive) { _%>
 
     /**
      * Initializes H2 console.
      */
     private void initH2Console(ServletContext servletContext) {
-        LOG.debug("Initialize H2 console");
+        LOG.info("Initialize H2 console");
         H2ConfigurationHelper.initH2Console(servletContext);
     }
+  <%_ } _%>
 <%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs

@@ -41,7 +41,6 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 <%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
   <%_ if (requiresPersistableImplementation) { _%>
@@ -395,7 +394,7 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
     @BatchSize(size = 20)
 <%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
-    @Transient
+    @org.springframework.data.annotation.Transient
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
     private Set<Authority> authorities = new HashSet<>();
@@ -413,7 +412,7 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
 <%_ } _%>
 <%_ if (databaseTypeSql && reactive && requiresPersistableImplementation) { _%>
 
-    @Transient
+    @org.springframework.data.annotation.Transient
     private boolean isPersisted;
 <%_ } _%>
 

package/dist/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs

@@ -87,9 +87,10 @@ spring:
       additional-exclude: static/**<% if (devDatabaseTypeH2Any) { %>,.h2.server.properties<% } %>
     livereload:
       enabled: false # we use Webpack dev server + BrowserSync for livereload
-<%_ if (devDatabaseTypeH2Any) { _%>
+<%_ if (devDatabaseTypeH2Any && 'dockerServices' in locals && dockerServices && dockerServices.length > 1) { _%>
   docker:
     compose:
+      enabled: <%- authenticationTypeOauth2 || messageBrokerAny || serviceDiscoveryAny || cacheProviderRedis %>
       profiles:
         active: dev
 <%_ } _%>
@@ -154,8 +155,12 @@ spring:
 <%_ if (devDatabaseTypeH2Any) { _%>
   h2:
     console:
-      # disable spring boot built-in h2-console since we start it manually with correct configuration
-      enabled: false
+      # JHipster uses a custom h2-console initializer
+  <%_ if (graalvmSupport) { _%>
+      enabled: '@spring.h2.console.enabled@'
+  <%_ } else { _%>
+      enabled: true
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
   data:

package/dist/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs

@@ -269,14 +269,16 @@ spring:
           group: <%= dasherizedBaseName %>
   <%_ } _%>
 <%_ } _%>
+<%_ if ('dockerServices' in locals && dockerServices && dockerServices.length > 1) { _%>
   docker:
     compose:
       enabled: true
       lifecycle-management: start-only
-<%_ if (applicationTypeMicroservice) { _%>
+  <%_ if (applicationTypeMicroservice) { _%>
       file: <%- dockerServicesDir %><%- databaseTypeSql ? prodDatabaseType : databaseType %>.yml
-<%_ } else { _%>
+  <%_ } else { _%>
       file: <%- dockerServicesDir %>services.yml
+  <%_ } _%>
 <%_ } _%>
   profiles:
     # The commented value for `active` can be replaced with valid Spring profiles to load.

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs

@@ -329,24 +329,25 @@ if (field.fieldTypeString || field.blobContentTypeText) {
     // Generate Strings, using pattern
     try {
       const patternRegExp = new RegExp(field.fieldValidateRulesPattern);
-      const randExp = field.createRandexp();
       // set infinite repetitions max range
       if (!patternRegExp.test(sampleTextString.replace(/\\"/g, '"').replace(/\\\\/g, '\\'))) {
-        sampleTextString = randExp.gen().replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        const value = field.generateFakeDataFromPattern();
+        sampleTextString = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
       }
       if (!patternRegExp.test(updatedTextString.replace(/\\"/g, '"').replace(/\\\\/g, '\\'))) {
-        updatedTextString = randExp.gen().replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        const value = field.generateFakeDataFromPattern();
+        updatedTextString = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
       }
     } catch (error) {
-      log(this.chalkRed('Error generating test value for entity "' + entityClass +
+      this.log.warn('Error generating test value for entity "' + entityClass +
         '" field "' + field.fieldName + '" with pattern "' + field.fieldValidateRulesPattern +
-        '", generating default values for this field. Detailed error message: "' + error.message + '".'));
+        '", generating default values for this field. Detailed error message: "' + error.message + '".');
     }
     if (sampleTextString === updatedTextString) {
       updatedTextString = updatedTextString + "B";
-      log(this.chalkRed('Randomly generated first and second test values for entity "' + entityClass +
+      this.log.warn('Randomly generated first and second test values for entity "' + entityClass +
         '" field "' + field.fieldName + '" with pattern "' + field.fieldValidateRulesPattern +
-        '" in file "' + entityClass + 'ResourceIT" where equal, added symbol "B" to second value.'));
+        '" in file "' + entityClass + 'ResourceIT" where equal, added symbol "B" to second value.');
     }
   } _%>
 

package/dist/generators/spring-cache/generator.d.ts

@@ -19,7 +19,8 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
     beforeQueue(): Promise<void>;
-    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addNeedles" | "loadDependabot">;
+    get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "configure">;
+    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cancel" | "addNeedles" | "loadDependabot">;
     get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupTask" | "writeTask">;
     get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addDependencies" | "addTestSpringFactory" | "applyGradleScript">;
     get postWritingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingEntitiesTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "customizeFiles">;

package/dist/generators/spring-cache/generator.js

@@ -30,8 +30,30 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplication();
         }
     }
+    get configuring() {
+        return this.asConfiguringTaskGroup({
+            configure() {
+                const { databaseType, reactive, cacheProvider } = this.jhipsterConfigWithDefaults;
+                if (this.jhipsterConfig.enableHibernateCache && (reactive || databaseType !== 'sql')) {
+                    this.log.verboseInfo(`Disabling hibernate cache for ${reactive ? 'reactive application' : 'non-SQL databases'}`);
+                    this.jhipsterConfig.enableHibernateCache = undefined;
+                }
+                if (reactive && cacheProvider !== 'no') {
+                    this.log.error(`Cache provider is not supported in reactive application`);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING]() {
+        return this.delegateTasksToBlueprint(() => this.configuring);
+    }
     get preparing() {
         return this.asPreparingTaskGroup({
+            cancel() {
+                if (this.jhipsterConfigWithDefaults.cacheProvider === 'no') {
+                    this.cancelCancellableTasks();
+                }
+            },
             loadDependabot({ application }) {
                 this.loadJavaDependenciesFromGradleCatalog(application.javaDependencies, true);
             },

package/dist/generators/spring-cache/resources/gradle/libs.versions.toml

@@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca
 
 xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
 
-redisson = { module = 'org.redisson:redisson', version = '3.36.0' }
+redisson = { module = 'org.redisson:redisson', version = '3.37.0' }

package/dist/generators/spring-cloud/generators/gateway/generator.js

@@ -62,8 +62,8 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            cleanup({ control, application }) {
-                control.cleanupFiles({
+            async cleanup({ control, application }) {
+                await control.cleanupFiles({
                     '8.6.1': [
                         [
                             application.reactive && application.serviceDiscoveryAny,

package/dist/generators/spring-data-couchbase/generator.js

@@ -55,11 +55,11 @@ export default class CouchbaseGenerator extends BaseApplicationGenerator {
                 });
             },
             addDependencies({ application, source }) {
-                const { reactive } = application;
+                const { reactive, javaDependencies } = application;
                 source.addJavaDependencies?.([
                     { groupId: 'commons-codec', artifactId: 'commons-codec' },
                     { groupId: 'com.couchbase.client', artifactId: 'java-client' },
-                    { groupId: 'com.github.differentway', artifactId: 'couchmove' },
+                    { groupId: 'com.github.differentway', artifactId: 'couchmove', version: javaDependencies.couchmove },
                     { groupId: 'org.springframework.boot', artifactId: `spring-boot-starter-data-couchbase${reactive ? '-reactive' : ''}` },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },

package/dist/generators/spring-data-mongodb/generator.d.ts

@@ -28,5 +28,5 @@ export default class MongoDBGenerator extends BaseApplicationGenerator {
         cleanupMongodbEntityFilesTask: typeof cleanupMongodbEntityFilesTask;
         writeMongodbEntityFilesTask: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
     };
-    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addDependencies" | "addTestSpringFactory" | "blockhound">;
+    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addDependencies" | "blockhound" | "addTestSpringFactory">;
 }

package/dist/generators/spring-data-relational/files.d.ts

@@ -32,6 +32,7 @@ export declare const sqlFiles: {
         renameTo?: string | ((this: import("../index.js").GeneratorBaseCore, data: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>, filePath: string) => string) | undefined;
         condition: (generator: any) => boolean;
     })[];
+    graalvm: import("../base/api.js").WriteFileBlock[];
 };
 export declare const h2Files: {
     serverResource: {