generator-jhipster 7.7.0 → 7.8.0

package/generators/generator-constants.js

@@ -24,7 +24,7 @@ const commonPackageJson = require('./common/templates/package.json');
 
 // Version of Java
 const JAVA_VERSION = '11';
-const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
+const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17', '18'];
 
 // Version of Node, NPM
 const NODE_VERSION = '16.14.0';
@@ -32,15 +32,15 @@ const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
 const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
-const JIB_VERSION = '3.2.0';
+const JIB_VERSION = '3.2.1';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.7.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.8.0';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
-const SPRING_BOOT_VERSION = '2.6.3';
+const SPRING_BOOT_VERSION = '2.6.6';
 const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.6.4.Final';
+const HIBERNATE_VERSION = '5.6.7.Final';
 
 const JACOCO_VERSION = '0.8.7';
 const KAFKA_VERSION = '5.5.7';

package/generators/generator-transforms.js

@@ -88,7 +88,6 @@ const generatedAnnotationTransform = generator => {
   return passthrough(file => {
     if (
       !file.path.endsWith('package-info.java') &&
-      !file.path.endsWith('MavenWrapperDownloader.java') &&
       path.extname(file.path) === '.java' &&
       !isFileStateDeleted(file) &&
       !file.path.endsWith('GeneratedByJHipster.java')

package/generators/gradle/constants.cjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const GRADLE_VERSION = '7.3.1';
+const GRADLE_VERSION = '7.4.2';
 const GRADLE = 'gradle';
 const GRADLE_DESCRIPTION = 'Gradle';
 const BUILD_DESTINATION_VALUE = 'build';

package/generators/maven/files.cjs

@@ -28,7 +28,6 @@ module.exports.files = {
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.jar', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.properties', method: 'copy', noEjs: true },
-        { file: '.mvn/wrapper/MavenWrapperDownloader.java', method: 'copy', noEjs: true },
         'pom.xml.jhi',
       ],
     },

package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+# 
+#   http://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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

package/generators/maven/templates/mvnw

@@ -8,7 +8,7 @@
 # "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
+#    http://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
@@ -36,6 +36,10 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -145,7 +149,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`which java`"
+    JAVACMD="`\\unset -f command; \\command -v java`"
   fi
 fi
 
@@ -212,9 +216,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -233,9 +237,9 @@ else
           echo "Found wget ... using wget"
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -305,6 +309,8 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

package/generators/maven/templates/mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
@@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre
 
 @setlocal
@@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
 
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -158,7 +158,13 @@ if exist %WRAPPER_JAR% (
 @REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -168,15 +174,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
 
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%

package/generators/maven/templates/pom.xml.jhi.ejs

@@ -59,7 +59,7 @@
     <properties>
         <java.version><%= JAVA_VERSION %></java.version>
 
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <compiler-plugin.version>3.8.4</compiler-plugin.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 <&- fragments.propertiesSection() -&>
     </properties>

package/generators/server/cleanup.js

@@ -8,6 +8,10 @@
  * @param {string} mainResourceDir - Main resources directory
  * @param {string} testResourceDir - Test resources directory
  */
+const { CASSANDRA, MONGODB } = require('../../jdl/jhipster/database-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
+
 function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
   if (generator.isJhipsterVersionLessThan('3.5.0')) {
     generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
@@ -78,7 +82,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
   }
   if (generator.isJhipsterVersionLessThan('5.8.0')) {
     generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
-    if (generator.databaseType === 'cassandra') {
+    if (generator.databaseType === CASSANDRA) {
       generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
     }
   }
@@ -125,7 +129,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
     generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
 
-    if (generator.databaseType === 'cassandra') {
+    if (generator.databaseType === CASSANDRA) {
       generator.removeFile(`${javaDir}config/metrics/package-info.java`);
       generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
       generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
@@ -133,7 +137,7 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
       generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
       generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
     }
-    if (generator.searchEngine === 'elasticsearch') {
+    if (generator.searchEngine === ELASTICSEARCH) {
       generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
     }
   }
@@ -144,6 +148,18 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
     generator.removeFile(`${javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
     generator.removeFile(`${testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
   }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    if (generator.databaseType === MONGODB) {
+      generator.removeFile(`${testDir}MongoDbTestContainerExtension.java`);
+    }
+    generator.removeFile(`${testDir}TestContainersSpringContextCustomizerFactory.java`);
+    if (generator.databaseType === CASSANDRA) {
+      generator.removeFile(`${testDir}AbstractCassandraTest.java`);
+    }
+    if (generator.messageBroker === KAFKA) {
+      generator.removeFile(`${javaDir}config/KafkaProperties.java`);
+    }
+  }
 }
 
 module.exports = {

package/generators/server/files.js

@@ -108,8 +108,16 @@ const mongoDbFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/MongoDbTestContainerExtension.java',
-          renameTo: generator => `${generator.testDir}MongoDbTestContainerExtension.java`,
+          file: 'package/config/MongoDbTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MongoDbTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedMongo.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedMongo.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
         },
       ],
     },
@@ -119,14 +127,8 @@ const mongoDbFiles = {
         {
           file: 'META-INF/spring.factories',
         },
-      ],
-    },
-    {
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
         {
-          file: 'package/TestContainersSpringContextCustomizerFactory.java',
-          renameTo: generator => `${generator.testDir}TestContainersSpringContextCustomizerFactory.java`,
+          file: 'testcontainers.properties',
         },
       ],
     },
@@ -222,7 +224,29 @@ const cassandraFiles = {
           file: 'package/CassandraKeyspaceIT.java',
           renameTo: generator => `${generator.testDir}CassandraKeyspaceIT.java`,
         },
-        { file: 'package/AbstractCassandraTest.java', renameTo: generator => `${generator.testDir}AbstractCassandraTest.java` },
+        {
+          file: 'package/config/CassandraTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/CassandraTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedCassandra.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedCassandra.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
       ],
     },
   ],
@@ -340,7 +364,11 @@ const baseServerFiles = {
   ],
   serverBuild: [
     {
-      templates: [{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } }],
+      templates: [
+        { file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } },
+        { file: 'devcontainer/devcontainer.json', renameTo: () => '.devcontainer/devcontainer.json' },
+        { file: 'devcontainer/Dockerfile', renameTo: () => '.devcontainer/Dockerfile' },
+      ],
     },
     {
       condition: generator => generator.buildTool === GRADLE,
@@ -369,9 +397,9 @@ const baseServerFiles = {
       templates: [
         { file: 'mvnw', method: 'copy', noEjs: true },
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
+        { file: '.mvn/jvm.config', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.jar', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.properties', method: 'copy', noEjs: true },
-        { file: '.mvn/wrapper/MavenWrapperDownloader.java', method: 'copy', noEjs: true },
         { file: 'pom.xml', options: { interpolate: INTERPOLATE_REGEX } },
       ],
     },
@@ -1091,8 +1119,12 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/config/KafkaProperties.java',
-          renameTo: generator => `${generator.javaDir}config/KafkaProperties.java`,
+          file: 'package/config/KafkaSseConsumer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseConsumer.java`,
+        },
+        {
+          file: 'package/config/KafkaSseProducer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseProducer.java`,
         },
       ],
     },
@@ -1177,7 +1209,17 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.messageBroker === KAFKA,
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResource_reactive.java',
+          renameTo: generator => `${generator.javaDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResource.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1426,6 +1468,24 @@ const baseServerFiles = {
     {
       condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/KafkaTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/KafkaTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedKafka.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedKafka.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
       templates: [
         {
           file: 'package/web/rest/KafkaResourceIT.java',
@@ -1433,6 +1493,28 @@ const baseServerFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResourceIT_reactive.java',
+          renameTo: generator => `${generator.testDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResourceIT.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
+      ],
+    },
   ],
   serverJavaUserManagement: [
     {
@@ -1711,7 +1793,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1721,7 +1804,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_RES_DIR,
       templates: [
         {

package/generators/server/index.js

@@ -476,6 +476,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           this.removeFile(`${this.mainJavaPackageDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
           this.removeFile(`${this.testJavaDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
         }
+        if (this.isJhipsterVersionLessThan('7.7.1')) {
+          if (this.buildToolMaven) {
+            this.removeFile('.mvn/wrapper/MavenWrapperDownloader.java');
+          }
+        }
       },
       ...writeFiles(),
       ...super._missingPostWriting(),
@@ -507,7 +512,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           } else {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f src/main/docker/${prodDatabaseType}.yml up -d`,
-              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v`,
             });
           }
         } else {
@@ -526,12 +531,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             scriptsStorage.set({
               'docker:db:build': `docker-compose -f ${dockerFile} build`,
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else if (this.fs.exists(this.destinationPath(dockerFile))) {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else {
             scriptsStorage.set('docker:db:up', `echo "Docker for db ${databaseType} not configured for application ${this.baseName}"`);
@@ -564,7 +569,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
             scriptsStorage.set(`docker:${dockerConfig}:up`, `docker-compose -f ${dockerFile} up -d`);
             dockerOthersUp.push(`npm run docker:${dockerConfig}:up`);
-            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v --remove-orphans`);
+            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v`);
             dockerOthersDown.push(`npm run docker:${dockerConfig}:down`);
           }
         });
@@ -641,8 +646,9 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const scriptsStorage = this.packageJson.createStorage('scripts');
         const buildCmd = this.jhipsterConfig.buildTool === GRADLE ? 'gradlew' : 'mvnw';
         if (scriptsStorage.get('e2e')) {
+          const applicationWaitTimeout = WAIT_TIMEOUT * (this.applicationTypeGateway ? 2 : 1);
           scriptsStorage.set({
-            'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"`,
+            'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"`,
             'pree2e:headless': 'npm run ci:server:await',
             'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
             'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,

package/generators/server/needle-api/needle-server-gradle.js

@@ -20,6 +20,7 @@ const chalk = require('chalk');
 const needleServer = require('./needle-server');
 
 const buildGradlePath = 'build.gradle';
+const gradleSettingsPath = 'settings.gradle';
 
 module.exports = class extends needleServer {
   addProperty(name, value) {
@@ -92,4 +93,41 @@ module.exports = class extends needleServer {
 
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
+
+  addPluginToPluginManagement(id, version) {
+    const errorMessage = `${chalk.yellow('Reference to ')}id ${id} version ${version}${chalk.yellow(' not added.')}`;
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-plugins',
+      `id '${id}' version '${version}'`
+    );
+
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
+
+  addPluginManagementRepository(url, username, password) {
+    const errorMessage = chalk.yellow('Reference to ') + url + chalk.yellow(' not added.');
+    let repository = 'maven {\n';
+    if (url) {
+      repository += `        url "${url}"\n`;
+    }
+    if (username || password) {
+      repository += '        credentials {\n';
+      if (username) {
+        repository += `            username = "${username}"\n`;
+      }
+      if (password) {
+        repository += `            password = "${password}"\n`;
+      }
+      repository += '        }\n';
+    }
+    repository += '    }';
+
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-repositories',
+      repository
+    );
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
 };

package/generators/server/templates/.mvn/jvm.config

@@ -0,0 +1 @@
+-XX:+TieredCompilation -XX:TieredStopAtLevel=1

package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+# 
+#   http://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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

package/generators/server/templates/build.gradle.ejs

@@ -386,6 +386,7 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ } _%>
     implementation "javax.transaction:javax.transaction-api"
 <%_ if (databaseTypeCassandra) { _%>
+    testImplementation "org.testcontainers:cassandra"
     implementation "org.lz4:lz4-java"
 <%_ } _%>
 <%_ if (cacheProviderEhCache) { _%>
@@ -459,11 +460,9 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     testImplementation "org.testcontainers:oracle-xe"
 <%_ } _%>
 <%_ if (messageBrokerKafka) { _%>
-  <%_ if (reactive) { _%>
-    implementation "io.projectreactor.kafka:reactor-kafka"
-  <%_ } else { _%>
-    implementation "org.apache.kafka:kafka-clients"
-  <%_ } _%>
+    implementation "org.springframework.cloud:spring-cloud-stream"
+    implementation "org.springframework.cloud:spring-cloud-starter-stream-kafka"
+    testImplementation "org.springframework.cloud:spring-cloud-stream-test-support"
 <%_ } _%>
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation ("org.springframework.boot:spring-boot-starter-web<% if (reactive) { %>flux<% } %>") {
@@ -521,6 +520,9 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration"
 <%_ } _%>
     implementation "org.springframework.security:spring-security-config"
+<%_ if (!reactive && databaseTypeSql) { _%>
+    implementation "org.springframework.security:spring-security-data"
+<%_ } _%>
     implementation "org.springframework.security:spring-security-web"
 <%_ if (communicationSpringWebsocket) { _%>
     implementation "org.springframework.security:spring-security-messaging"