generator-jhipster 8.3.0 → 8.5.0

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

@@ -31,6 +31,10 @@ if (isUsingMapsId) {
   mapsIdEntityInstance =  mapsIdEntity.charAt(0).toLowerCase() + mapsIdEntity.slice(1);
   mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
 }
+const hasUserRepository =
+  (requiresDeleteAllUsers && hasRelationshipWithBuiltInUser) ||
+  filterTestableRelationships.some(rel => rel.otherEntity.builtInUser) ||
+  (isUsingMapsId && (!dtoMapstruct && serviceNo) && mapsIdEntity === 'User');
 
 let callBlock = '';
 let callListBlock = '';
@@ -85,8 +89,8 @@ if(jpaMetamodelFiltering && reactive) {
 import <%= entityAbsolutePackage %>.repository.<%= relationship.otherEntityNameCapitalized %>Repository;
 <%_ });
  } _%>
-<%_ if (saveUserSnapshot) { _%>
-import <%= entityAbsolutePackage %>.repository.UserRepository;
+<%_ if (hasUserRepository) { _%>
+import <%= user.entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
 import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -114,9 +118,7 @@ import org.assertj.core.util.IterableUtil;
 import org.springframework.data.util.Streamable;
 import java.util.concurrent.TimeUnit;
 <%_ } _%>
-<%_ if ((databaseTypeSql && reactive) || searchEngineElasticsearch) { _%>
 import org.junit.jupiter.api.AfterEach;
-<%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 <%_ if (skipJunitTests) { _%>
 import org.junit.jupiter.api.Disabled;
@@ -459,11 +461,11 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 
     @Autowired
     private <%= entityClass %>Repository <%= entityInstance %>Repository;
-<%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo)) { _%>
+<%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo) && mapsIdEntity !== 'User') { _%>
     @Autowired
     private <%= mapsIdEntity %>Repository <%= mapsIdRepoInstance %>;
 <%_ } _%>
-<%_ if (saveUserSnapshot) { _%>
+<%_ if (hasUserRepository) { _%>
 
     @Autowired
     private UserRepository userRepository;
@@ -503,8 +505,10 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 
     private <%= persistClass %> <%= persistInstance %>;
 
+    private <%= persistClass %> inserted<%= persistClass %>;
+
 <%_ if(jpaMetamodelFiltering && reactive) {
-filterTestableRelationships.forEach((relationship) => { _%>
+filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach((relationship) => { _%>
     @Autowired
     private <%= relationship.otherEntity.persistClass %>Repository <%= relationship.otherEntity.persistInstance %>Repository;
 <%_ });
@@ -620,19 +624,6 @@ _%>
   }); _%>
     }
 
-    @AfterEach
-    public void cleanup() {
-        deleteEntities(em);
-    }
-
-<%_ } _%>
-<%_ if (searchEngineElasticsearch) { _%>
-    @AfterEach
-    public void cleanupElasticSearchRepository() {
-        <%= entityInstance %>SearchRepository.deleteAll()<%= callBlock %>;
-        assertThat(<%= entityInstance %>SearchRepository.count()<%= callBlock %>).isEqualTo(0);
-    }
-
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
@@ -643,12 +634,27 @@ _%>
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-<%_ if (databaseTypeMongodb || databaseTypeCouchbase || databaseTypeCassandra || databaseTypeNeo4j) { _%>
-        <%= entityInstance %>Repository.deleteAll()<%= callBlock %>;
-<%_ } else if (databaseTypeSql && reactive) {  _%>
+        <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
+    }
+
+    @AfterEach
+    public void cleanup() {
+        if (inserted<%= persistClass %> != null) {
+            <%= entityInstance %>Repository.delete(inserted<%= persistClass %>)<%= reactorBlock %>;
+<%_ if (searchEngineElasticsearch) { _%>
+            <%= entityInstance %>SearchRepository.delete(inserted<%= persistClass %>)<%= reactorBlock %>;
+<%_ } _%>
+            inserted<%= persistClass %> = null;
+        }
+<%_ if (databaseTypeSql && reactive) {  _%>
         deleteEntities(em);
 <%_ } _%>
-        <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
+<%_ if (requiresDeleteAllUsers && hasUserRepository) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+  <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } _%>
     }
 <%_ if (!readOnly) { _%>
 
@@ -718,13 +724,15 @@ _%>
 
         assert<%- persistClass %>MapsIdRelationshipPersistedValue(<%= persistInstance %>, returned<%- persistClass %>);
   <%_ } _%>
+
+        inserted<%= persistClass %> = returned<%- persistClass %>;
     }
 
     @Test<%= transactionalAnnotation %>
     void create<%= entityClass %>WithExistingId() throws Exception {
         // Create the <%= entityClass %> with an existing ID
   <%_ if ((primaryKey.typeUUID && databaseTypeSql) || !primaryKey.autoGenerate) { _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ } else { _%>
         <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } else if (primaryKey.typeLong) { %>1L<% } else if (primaryKey.typeInteger) { %>1<% } else { %>"existing_id"<% } %>);
   <%_ } _%>
@@ -772,7 +780,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void update<%= entityClass %>MapsIdAssociationWithNewId() throws Exception {
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
     <%_ const alreadyGeneratedEntities = []; _%>
         long databaseSizeBeforeCreate = getRepositoryCount();
     <%_ if (searchEngineElasticsearch) { _%>
@@ -828,14 +836,14 @@ _%>
     <%_ if (databaseTypeCouchbase) { _%>
         SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
     <%_ } _%>
-        List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertSameRepositoryCount(databaseSizeBeforeCreate);
-        <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
 
-        // Validate the id for MapsId, the ids must be same
-        // Uncomment the following line for assertion. However, please note that there is a known issue and uncommenting will fail the test.
-        // Please look at https://github.com/jhipster/generator-jhipster/issues/9100. You can modify this test as necessary.
-        // assertThat(test<%= entityClass %>.get<%= primaryKey.nameCapitalized %>()).isEqualTo(test<%= entityClass %>.get<%= mapsIdEntity %>().get<%= primaryKey.nameCapitalized %>());
+        /**
+         * Validate the id for MapsId, the ids must be same
+         * Uncomment the following line for assertion. However, please note that there is a known issue and uncommenting will fail the test.
+         * Please look at https://github.com/jhipster/generator-jhipster/issues/9100. You can modify this test as necessary.
+         * assertThat(test<%= entityClass %>.get<%= primaryKey.nameCapitalized %>()).isEqualTo(test<%= entityClass %>.get<%= mapsIdEntity %>().get<%= primaryKey.nameCapitalized %>());
+         */
     <%_ if (searchEngineElasticsearch) { _%>
         int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
@@ -886,7 +894,6 @@ _%>
         int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
         <%_ } _%>
-
     }
       <%_ } _%>
     <%_ } _%>
@@ -940,7 +947,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
   <%_ } _%>
 <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List
 <%_ if (reactive) { _%>
@@ -1027,7 +1034,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
   <%_ } _%>
 <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get the <%= entityInstance %>
 <%_ if (reactive) { _%>
@@ -1066,7 +1073,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void get<%= entityClassPlural %>ByIdFiltering() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         <%= primaryKey.type %> id = <%= persistInstance %>.get<%= primaryKey.nameCapitalized %>();
 
@@ -1085,7 +1092,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> equals to
         default<%= entityClass %>Filtering(
@@ -1097,7 +1104,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsInShouldWork() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> in
         default<%= entityClass %>Filtering(
@@ -1109,7 +1116,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsNullOrNotNull() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is not null
         default<%= entityClass %>Filtering(
@@ -1122,7 +1129,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>ContainsSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> contains
         default<%= entityClass %>Filtering(
@@ -1134,7 +1141,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>NotContainsSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> does not contain
         default<%= entityClass %>Filtering(
@@ -1164,7 +1171,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsGreaterThanOrEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is greater than or equal to
         default<%= entityClass %>Filtering(
@@ -1176,7 +1183,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsLessThanOrEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is less than or equal to
         default<%= entityClass %>Filtering(
@@ -1188,7 +1195,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsLessThanSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is less than
         default<%= entityClass %>Filtering(
@@ -1200,7 +1207,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsGreaterThanSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is greater than
         default<%= entityClass %>Filtering(
@@ -1246,7 +1253,7 @@ _%>
       <%_ } else { _%>
         <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id = <%= relationship.relationshipFieldName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>();
         <%= persistInstance %>.set<%= relationship.relationshipNameCapitalized %>Id(<%= relationship.relationshipFieldName %>Id);
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
       <%_ } _%>
     <%_ } _%>
     <%_ if(!reactive) { _%>
@@ -1420,7 +1427,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         long databaseSizeBeforeUpdate = getRepositoryCount();
   <%_ if (searchEngineElasticsearch) { _%>
@@ -1620,7 +1627,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <%_ const fieldsToIncludeInPartialPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => faker.datatype.boolean())); _%>
 <%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInPartialPatchTest, saveMethod, callBlock, callListBlock}); -%>
@@ -1640,7 +1647,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <% const fieldsToIncludeInFullPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => true)); %>
 <%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInFullPatchTest, saveMethod, callBlock, callListBlock}); -%>
@@ -1777,7 +1784,7 @@ _%>
         <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>Repository.save(<%= persistInstance %>)<%= callBlock %>;
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
@@ -1826,7 +1833,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= persistInstance %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
   <%_ } else if (searchEngineCouchbase) { _%>

package/dist/generators/spring-cache/internal/dependencies.js

@@ -124,11 +124,11 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
                     },
                     {
                         groupId: 'org.infinispan',
-                        artifactId: 'infinispan-commons-jakarta',
+                        artifactId: 'infinispan-commons',
                     },
                     {
                         groupId: 'org.infinispan',
-                        artifactId: 'infinispan-core-jakarta',
+                        artifactId: 'infinispan-core',
                     },
                     {
                         groupId: 'org.infinispan',

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

@@ -5,11 +5,11 @@ typesafe = { module = 'com.typesafe:config', version = '1.4.3' }
 # hazelcast
 hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.1.0' }
 
-hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.3.7' }
+hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.4.0' }
 
 # memcached
 xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemcached-provider', version = '4.1.3' }
 
 xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
 
-redisson = { module = 'org.redisson:redisson', version = '3.27.2' }
+redisson = { module = 'org.redisson:redisson', version = '3.30.0' }

package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs

@@ -736,6 +736,10 @@ public class CacheConfiguration {
         URI redisUri = URI.create(jHipsterProperties.getCache().getRedis().getServer()[0]);
 
         Config config = new Config();
+  <%_ if (databaseTypeSql) { _%>
+        // Fix Hibernate lazy initialization https://github.com/jhipster/generator-jhipster/issues/22889
+        config.setCodec(new org.redisson.codec.SerializationCodec());
+  <%_ } _%>
         if (jHipsterProperties.getCache().getRedis().isCluster()) {
             ClusterServersConfig clusterServersConfig = config
                 .useClusterServers()

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

@@ -1,5 +1,9 @@
 const command = {
-    configs: {},
+    configs: {
+        routes: {
+            scope: 'storage',
+        },
+    },
     import: [],
 };
 export default command;

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

@@ -78,6 +78,19 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            prepareGateway({ application }) {
+                application.gatewayRoutes = (application.routes ?? []).map(routeDef => {
+                    const [route, host = route, serverPort = '8080'] = routeDef.split(':');
+                    return { route, serverPort, host };
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {

package/dist/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.js

@@ -0,0 +1,6 @@
+export const jdlRoutesOptions = {
+    name: 'routes',
+    tokenType: 'quotedList',
+    type: 'quotedList',
+    tokenValuePattern: /^"[A-Za-z][A-Za-z0-9_]*(?::[A-Za-z][A-Za-z0-9_]+(?::[0-9]+)?)?"$/,
+};

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

@@ -78,14 +78,14 @@ export default class CassandraGenerator extends BaseApplicationGenerator {
                 const { reactive, javaDependencies } = application;
                 const cassandraStarter = reactive ? 'spring-boot-starter-data-cassandra-reactive' : 'spring-boot-starter-data-cassandra';
                 source.addJavaDependencies?.([
-                    { groupId: 'com.datastax.oss', artifactId: 'java-driver-mapper-runtime' },
+                    { groupId: 'org.apache.cassandra', artifactId: 'java-driver-mapper-runtime' },
                     { groupId: 'commons-codec', artifactId: 'commons-codec' },
                     { groupId: 'org.springframework.boot', artifactId: cassandraStarter },
                     { groupId: 'org.lz4', artifactId: 'lz4-java', version: javaDependencies['lz4-java'] },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'cassandra' },
-                    { scope: 'annotationProcessor', groupId: 'com.datastax.oss', artifactId: 'java-driver-mapper-processor' },
+                    { scope: 'annotationProcessor', groupId: 'org.apache.cassandra', artifactId: 'java-driver-mapper-processor' },
                 ]);
             },
         });

package/dist/generators/spring-data-relational/support/h2-reserved-keywords.js

@@ -0,0 +1,22 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export const h2ReservedKeywords = ['KEY'];
+export const isReservedH2Keyword = (keyword) => {
+    return h2ReservedKeywords.includes(keyword.toUpperCase());
+};

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs

@@ -67,7 +67,9 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
                             Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypePostgresql) { %>PostgreSql<% } %>TestContainer");
                             prodTestContainer = beanFactory.createBean(containerClass);
                             beanFactory.registerSingleton(containerClass.getName(), prodTestContainer);
-                            // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
+                            /**
+                             * ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
+                             */
                         } catch (ClassNotFoundException e) {
                             throw new RuntimeException(e);
                         }

package/dist/generators/upgrade/generator.js

@@ -24,7 +24,6 @@ import semver from 'semver';
 import { ResetMode } from 'simple-git';
 import BaseGenerator from '../base/index.js';
 import { packageJson } from '../../lib/index.js';
-import statistics from '../statistics.js';
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
 import { GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES, UPGRADE_BRANCH } from './support/index.js';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
@@ -136,9 +135,6 @@ export default class UpgradeGenerator extends BaseGenerator {
     }
     get default() {
         return this.asDefaultTaskGroup({
-            insight() {
-                statistics.sendSubGenEvent('generator', 'upgrade');
-            },
             async prepareUpgradeBranch() {
                 const git = this.createGit();
                 // Checkout upgrade branch

package/dist/generators/vue/resources/package.json

@@ -2,12 +2,12 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "6.5.2",
     "@fortawesome/free-solid-svg-icons": "6.5.2",
-    "@fortawesome/vue-fontawesome": "3.0.6",
+    "@fortawesome/vue-fontawesome": "3.0.8",
     "@stomp/rx-stomp": "2.0.0",
     "@vuelidate/core": "2.0.3",
     "@vuelidate/validators": "2.0.4",
-    "@vueuse/core": "10.9.0",
-    "axios": "1.6.8",
+    "@vueuse/core": "10.10.0",
+    "axios": "1.7.2",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",
     "bootswatch": "4.6.2",
@@ -17,59 +17,59 @@
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "vue": "3.4.21",
-    "vue-i18n": "9.11.0",
-    "vue-router": "4.3.0"
+    "vue-i18n": "9.13.1",
+    "vue-router": "4.3.2"
   },
   "devDependencies": {
     "@module-federation/utilities": "3.0.3-0",
     "@pinia/testing": "0.1.3",
-    "@rushstack/eslint-patch": "1.10.1",
+    "@rushstack/eslint-patch": "1.10.3",
     "@tsconfig/node18": "18.2.4",
     "@types/node": "20.11.25",
     "@types/sinon": "17.0.3",
     "@vitejs/plugin-vue": "5.0.4",
     "@vue/eslint-config-prettier": "9.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
-    "@vue/test-utils": "2.4.5",
+    "@vue/test-utils": "2.4.6",
     "@vue/tsconfig": "0.5.1",
     "autoprefixer": "10.4.19",
     "axios-mock-adapter": "1.22.0",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "12.0.2",
-    "css-loader": "7.1.0",
-    "css-minimizer-webpack-plugin": "6.0.0",
+    "css-loader": "7.1.2",
+    "css-minimizer-webpack-plugin": "7.0.0",
     "eslint": "8.57.0",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-vue": "8.7.1",
     "flush-promises": "1.0.2",
     "folder-hash": "4.0.4",
-    "happy-dom": "14.7.1",
+    "happy-dom": "14.12.0",
     "html-webpack-plugin": "5.6.0",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "mini-css-extract-plugin": "2.8.1",
+    "mini-css-extract-plugin": "2.9.0",
     "numeral": "2.0.6",
     "postcss-import": "16.1.0",
     "postcss-loader": "8.1.1",
     "postcss-url": "10.1.3",
-    "rimraf": "5.0.5",
-    "sass": "1.74.1",
-    "sass-loader": "14.1.1",
-    "sinon": "17.0.1",
+    "rimraf": "5.0.7",
+    "sass": "1.77.3",
+    "sass-loader": "14.2.1",
+    "sinon": "18.0.0",
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.5.1",
-    "typescript": "5.4.4",
-    "vite": "5.2.8",
-    "vite-plugin-static-copy": "1.0.2",
-    "vitest": "1.4.0",
+    "typescript": "5.4.5",
+    "vite": "5.2.12",
+    "vite-plugin-static-copy": "1.0.5",
+    "vitest": "1.6.0",
     "vitest-sonar-reporter": "2.0.0",
     "vue-loader": "17.4.2",
     "vue-style-loader": "4.1.3",
-    "vue-tsc": "2.0.11",
+    "vue-tsc": "2.0.19",
     "webpack": "5.91.0",
-    "webpack-bundle-analyzer": "4.10.1",
+    "webpack-bundle-analyzer": "4.10.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",
-    "workbox-webpack-plugin": "7.0.0"
+    "workbox-webpack-plugin": "7.1.0"
   }
 }

package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs

@@ -19,7 +19,7 @@
                     The password and its confirmation do not match!
                 </div>
 
-                <form name="form" role="form" id="password-form" v-on:submit.prevent="changePassword()">
+                <form name="form" id="password-form" v-on:submit.prevent="changePassword()">
                     <div class="form-group">
                         <label class="form-control-label" for="currentPassword"
                             v-text="t$('global.form[\'currentpassword.label\']')">Current password</label>

package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs

@@ -7,7 +7,7 @@
         </b-alert>
       </div>
       <div class="col-md-8">
-        <b-form role="form" v-on:submit.prevent="doLogin()">
+        <b-form v-on:submit.prevent="doLogin()">
           <b-form-group v-bind:label="t$('global.form[\'username.label\']')" label-for="username">
             <b-form-input
               id="username"

package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs

@@ -25,7 +25,7 @@
         </div>
         <div class="row justify-content-center">
             <div class="col-md-8">
-                <form id="register-form" name="registerForm" role="form" v-on:submit.prevent="register()"
+                <form id="register-form" name="registerForm" v-on:submit.prevent="register()"
                     v-if="!success" no-validate>
                     <div class="form-group">
                         <label class="form-control-label" for="username"

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs

@@ -30,7 +30,7 @@
                 </div>
 
                 <div v-if="!keyMissing">
-                    <form v-if="!success" name="form" role="form" v-on:submit.prevent="finishReset()">
+                    <form v-if="!success" name="form" v-on:submit.prevent="finishReset()">
                         <div class="form-group">
                             <label class="form-control-label" for="newPassword"
                                 v-text="t$('global.form[\'newpassword.label\']')">New password</label>

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs

@@ -13,7 +13,7 @@
                         password.</p>
                 </div>
 
-                <form v-if="!success" name="form" role="form" v-on:submit.prevent="requestReset()">
+                <form v-if="!success" name="form" v-on:submit.prevent="requestReset()">
                     <div class="form-group">
                         <label class="form-control-label" for="email"
                             v-text="t$('global.form[\'email.label\']')">Email</label>

package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs

@@ -21,7 +21,7 @@
           <strong>Email is already in use!</strong> Please choose another one.
         </div>
 
-        <form name="form" id="settings-form" role="form" v-on:submit.prevent="save()" v-if="settingsAccount" novalidate>
+        <form name="form" id="settings-form" v-on:submit.prevent="save()" v-if="settingsAccount" novalidate>
           <div class="form-group">
             <label class="form-control-label" for="firstName" v-text="t$('settings.form.firstname')">First Name</label>
             <input type="text" class="form-control" id="firstName" name="firstName"