generator-jhipster 7.4.1 → 7.5.0

package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs

@@ -48,7 +48,7 @@ if (databaseTypeSql && reactive) {
 let idValue = `${persistInstance}.get${primaryKey.nameCapitalized}()`;
 if (primaryKey.typeLong) {
   idValue = idValue + '.intValue()';
-} else if (primaryKey.type === 'UUID') {
+} else if (primaryKey.typeUUID) {
   idValue = idValue + '.toString()';
 }
 let transactionalAnnotation = '';
@@ -815,7 +815,7 @@ _%>
   <%_ } _%>
         <%= entityInstance %>Repository.save(<%= persistInstance %>)<%= callBlock %>;
 
-        List<<%= entityClass %>> <%= entityInstance %>List = webTestClient.get().uri(ENTITY_API_URL)
+        List<<%= asEntity(entityClass) %>> <%= entityInstance %>List = webTestClient.get().uri(ENTITY_API_URL)
             .accept(MediaType.APPLICATION_NDJSON)
             .exchange()
             .expectStatus().isOk()

package/generators/generator-base-private.js

@@ -355,7 +355,8 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     }
     try {
       const content = languages.reduce(
-        (content, language) => `${content}import 'dayjs/locale/${this.getDayjsLocaleId(language)}'\n`,
+        (content, language) =>
+          `${content}import 'dayjs/${this.clientFrameworkAngular ? 'esm/' : ''}locale/${this.getDayjsLocaleId(language)}'\n`,
         '// jhipster-needle-i18n-language-dayjs-imports - JHipster will import languages from dayjs here\n'
       );
 

package/generators/generator-base.js

@@ -2625,7 +2625,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       this.jhipsterConfig.clientFramework = options.clientFramework;
     }
     if (options.testFrameworks) {
-      this.jhipsterConfig.testFrameworks = options.testFrameworks;
+      this.jhipsterConfig.testFrameworks = [...new Set([...(this.jhipsterConfig.testFrameworks || []), ...options.testFrameworks])];
     }
     if (options.cypressCoverage !== undefined) {
       this.jhipsterConfig.cypressCoverage = options.cypressCoverage;
@@ -2636,7 +2636,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     if (options.language) {
       // workaround double options parsing, remove once generator supports skipping parse options
       const languages = options.language.flat();
-      this.jhipsterConfig.languages = [...this.jhipsterConfig.languages, ...languages];
+      if (languages.length === 1 && languages[0] === 'false') {
+        this.jhipsterConfig.enableTranslation = false;
+      } else {
+        this.jhipsterConfig.languages = [...this.jhipsterConfig.languages, ...languages];
+      }
     }
     if (options.nativeLanguage) {
       if (typeof options.nativeLanguage === 'string') {
@@ -2664,13 +2668,17 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     }
 
     if (options.microfrontend) {
-      this.warning('Microfrontend option is deprecated.');
+      this.jhipsterConfig.microfrontend = options.microfrontend;
     }
 
     if (options.reactive !== undefined) {
       this.jhipsterConfig.reactive = options.reactive;
     }
 
+    if (options.enableSwaggerCodegen !== undefined) {
+      this.jhipsterConfig.enableSwaggerCodegen = options.enableSwaggerCodegen;
+    }
+
     if (options.clientPackageManager) {
       this.jhipsterConfig.clientPackageManager = options.clientPackageManager;
     }
@@ -2736,6 +2744,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.dtoSuffix = config.dtoSuffix;
     dest.skipUserManagement = config.skipUserManagement;
     dest.skipCheckLengthOfIdentifier = config.skipCheckLengthOfIdentifier;
+    dest.microfrontend = config.microfrontend;
 
     dest.skipServer = config.skipServer;
     dest.skipCommitHook = config.skipCommitHook;
@@ -2792,6 +2801,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.microfrontends = dest.remotes.filter(r => r.clientFramework && r.clientFramework !== CLIENT_FRAMEWORK_NO);
     }
     dest.microfrontend =
+      dest.microfrontend ||
       (dest.applicationTypeMicroservice && !dest.skipClient) ||
       (dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
   }

package/generators/generator-constants.js

@@ -26,24 +26,24 @@ const JAVA_VERSION = '11';
 const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
 
 // Version of Node, NPM
-const NODE_VERSION = '14.18.1';
+const NODE_VERSION = '16.13.1';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
-const GRADLE_VERSION = '7.0.2';
+const GRADLE_VERSION = '7.3.1';
 const JIB_VERSION = '3.1.4';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.4.1';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.5.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.5.7';
+const SPRING_BOOT_VERSION = '2.5.8';
 const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.4.32.Final';
+const HIBERNATE_VERSION = '5.4.33';
 
 const JACOCO_VERSION = '0.8.7';
 const KAFKA_VERSION = '5.5.5';
-const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.1';
+const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
@@ -62,7 +62,7 @@ const DOCKER_NEO4J = 'neo4j:4.3.7';
 const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.06';
 const DOCKER_MEMCACHED = 'memcached:1.6.12-alpine';
 const DOCKER_REDIS = 'redis:6.2.6';
-const DOCKER_KEYCLOAK = 'jboss/keycloak:15.0.2'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
+const DOCKER_KEYCLOAK = 'jboss/keycloak:16.1.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
 const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.13.3'; // The version should be coherent with the one from spring-data-elasticsearch project
 const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
 const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;

package/generators/server/__snapshots__/generator.spec.mjs.snap

@@ -266,7 +266,6 @@ Object {
       ],
     },
     Object {
-      "condition": [Function],
       "templates": Array [
         Object {
           "file": "npmw",
@@ -778,10 +777,6 @@ Object {
       "condition": [Function],
       "path": "src/main/java/",
       "templates": Array [
-        Object {
-          "file": "package/config/apidocs/GatewaySwaggerResourcesProvider.java",
-          "renameTo": [Function],
-        },
         Object {
           "file": "package/web/filter/ModifyServersOpenApiFilter.java",
           "renameTo": [Function],
@@ -796,10 +791,6 @@ Object {
           "file": "package/web/filter/ModifyServersOpenApiFilterTest.java",
           "renameTo": [Function],
         },
-        Object {
-          "file": "package/config/apidocs/GatewaySwaggerResourcesProviderTest.java",
-          "renameTo": [Function],
-        },
       ],
     },
   ],
@@ -1170,7 +1161,16 @@ Object {
           "file": "package/cucumber/stepdefs/UserStepDefs.java",
           "renameTo": [Function],
         },
-        "../features/user/user.feature",
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/resources/",
+      "templates": Array [
+        Object {
+          "file": "package/features/user/user.feature",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -1735,17 +1735,18 @@ Object {
           "file": "package/cucumber/CucumberTestContextConfiguration.java",
           "renameTo": [Function],
         },
-        Object {
-          "file": "../features/gitkeep",
-          "noEjs": true,
-        },
       ],
     },
     Object {
       "condition": [Function],
       "path": "src/test/resources/",
       "templates": Array [
-        "cucumber.properties",
+        "junit-platform.properties",
+        Object {
+          "file": "package/features/gitkeep",
+          "noEjs": true,
+          "renameTo": [Function],
+        },
       ],
     },
     Object {

package/generators/server/cleanup.js

@@ -0,0 +1,151 @@
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {any} generator - reference to generator
+ * @param {string} javaDir - Java directory
+ * @param {string} testDir - Java tests directory
+ * @param {string} mainResourceDir - Main resources directory
+ * @param {string} testResourceDir - Test resources directory
+ */
+function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
+  if (generator.isJhipsterVersionLessThan('3.5.0')) {
+    generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
+    generator.removeFile(`${javaDir}domain/util/JSR310LocalDateDeserializer.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.6.0')) {
+    generator.removeFile(`${javaDir}config/HerokuDatabaseConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.10.0')) {
+    generator.removeFile(`${javaDir}config/CloudMongoDbConfiguration.java`);
+    generator.removeFile(`${javaDir}security/CustomAccessDeniedHandler.java`);
+    generator.removeFile(`${javaDir}web/filter/CsrfCookieGeneratorFilter.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.12.0')) {
+    generator.removeFile(`${javaDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/hazelcast/package-info.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.0.0')) {
+    generator.removeFile(`${javaDir}async/ExceptionHandlingAsyncTaskExecutor.java`);
+    generator.removeFile(`${javaDir}async/package-info.java`);
+    generator.removeFile(`${javaDir}config/jHipsterProperties.java`);
+    generator.removeFile(`${javaDir}config/LoadBalancedResourceDetails.java`);
+    generator.removeFile(`${javaDir}config/ElasticSearchConfiguration.java`);
+    generator.removeFile(`${javaDir}config/apidoc/package-info.java`);
+    generator.removeFile(`${javaDir}config/apidoc/PageableParameterBuilderPlugin.java`);
+    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
+    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/liquibase/AsyncSpringLiquibase.java`);
+    generator.removeFile(`${javaDir}config/liquibase/package-info.java`);
+    generator.removeFile(`${javaDir}config/locale/AngularCookieLocaleResolver.java`);
+    generator.removeFile(`${javaDir}config/locale/package-info.java`);
+    generator.removeFile(`${javaDir}domain/util/FixedH2Dialect.java`);
+    generator.removeFile(`${javaDir}domain/util/FixedPostgreSQL82Dialect`);
+    generator.removeFile(`${javaDir}domain/util/JSR310DateConverters.java`);
+    generator.removeFile(`${javaDir}domain/util/JSR310PersistenceConverters.java`);
+    generator.removeFile(`${javaDir}security/AjaxAuthenticationFailureHandler.java`);
+    generator.removeFile(`${javaDir}security/AjaxAuthenticationSuccessHandler.java`);
+    generator.removeFile(`${javaDir}security/AjaxLogoutSuccessHandler.java`);
+    generator.removeFile(`${javaDir}security/CustomPersistentRememberMeServices.java`);
+    generator.removeFile(`${javaDir}security/Http401UnauthorizedEntryPoint.java`);
+    generator.removeFile(`${javaDir}security/UserDetailsService.java`);
+    generator.removeFile(`${javaDir}web/filter/CachingHttpHeadersFilter.java`);
+    generator.removeFile(`${javaDir}web/filter/package-info.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.3.0')) {
+    generator.removeFile(`${javaDir}gateway/ratelimiting/RateLimitingRepository.java`);
+    generator.removeFile(`${javaDir}config/cassandra/CustomZonedDateTimeCodec.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.7.1')) {
+    generator.removeFile(`${javaDir}web/rest/errors/ErrorVM.java`);
+    generator.removeFile(`${javaDir}web/rest/errors/ParameterizedErrorVM.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('5.0.0')) {
+    generator.removeFile(`${javaDir}config/ThymeleafConfiguration.java`);
+    generator.removeFile(`${javaDir}web/rest/ProfileInfoResource.java`);
+    generator.removeFile(`${mainResourceDir}mails/activationEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/creationEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/passwordResetEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/socialRegistrationValidationEmail.html`);
+    generator.removeFile(`${testResourceDir}mail/testEmail.html`);
+    generator.removeFile(`${testDir}web/rest/ProfileInfoResourceIT.java`);
+    generator.removeFile('gradle/mapstruct.gradle');
+  }
+  if (generator.isJhipsterVersionLessThan('5.2.2')) {
+    generator.removeFile(`${javaDir}config/ElasticsearchConfiguration.java`);
+    generator.removeFile('gradle/liquibase.gradle');
+  }
+  if (generator.isJhipsterVersionLessThan('5.8.0')) {
+    generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
+    if (generator.databaseType === 'cassandra') {
+      generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('6.0.0')) {
+    generator.removeFile(`${javaDir}web/rest/errors/CustomParameterizedException.java`);
+    generator.removeFile(`${javaDir}web/rest/errors/InternalServerErrorException.java`);
+    generator.removeFile(`${javaDir}web/rest/util/PaginationUtil.java`);
+    generator.removeFile(`${javaDir}web/rest/util/HeaderUtil.java`);
+    generator.removeFile(`${testDir}web/rest/util/PaginationUtilUnitTest.java`);
+    generator.removeFile(`${javaDir}web/rest/vm/LoggerVM.java`);
+    generator.removeFile(`${javaDir}web/rest/LogsResource.java`);
+    generator.removeFile(`${testDir}web/rest/LogsResourceIT.java`);
+    generator.removeFile(`${javaDir}config/OAuth2Configuration.java`);
+    generator.removeFile(`${javaDir}security/OAuth2AuthenticationSuccessHandler.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.5.2')) {
+    generator.removeFile(`${testDir}service/mapper/UserMapperIT.java`);
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java`);
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java`);
+    generator.removeFile(`${testDir}web/rest/ClientForwardControllerIT.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.6.1')) {
+    generator.removeFile(`${javaDir}web/rest/errors/EmailNotFoundException.java`);
+    generator.removeFile(`${javaDir}config/DefaultProfileUtil.java`);
+    generator.removeFolder(`${javaDir}service/util`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.8.0')) {
+    generator.removeFile(`${javaDir}security/oauth2/JwtAuthorityExtractor.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.8.1')) {
+    generator.removeFile(`${javaDir}config/ReactivePageableHandlerMethodArgumentResolver.java`);
+    generator.removeFile(`${javaDir}config/ReactiveSortHandlerMethodArgumentResolver.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
+    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
+    generator.removeFile(`${javaDir}config/audit/package-info.java`);
+    generator.removeFile(`${javaDir}config/audit/AuditEventConverter.java`);
+    generator.removeFile(`${javaDir}domain/PersistentAuditEvent.java`);
+    generator.removeFile(`${javaDir}repository/PersistenceAuditEventRepository.java`);
+    generator.removeFile(`${javaDir}repository/CustomAuditEventRepository.java`);
+    generator.removeFile(`${javaDir}service/AuditEventService.java`);
+    generator.removeFile(`${javaDir}web/rest/AuditResource.java`);
+    generator.removeFile(`${testDir}service/AuditEventServiceIT.java`);
+    generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
+    generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
+
+    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`);
+      generator.removeFile(`${javaDir}config/cassandra/package-info.java`);
+      generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
+      generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
+    }
+    if (generator.searchEngine === 'elasticsearch') {
+      generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.1')) {
+    generator.removeFile(`${javaDir}config/CloudDatabaseConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.4.2')) {
+    generator.removeFile(`${javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
+    generator.removeFile(`${testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/files.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const cleanup = require('../cleanup');
+const serverCleanup = require('./cleanup');
 const constants = require('../generator-constants');
 const { GATEWAY, MICROSERVICE, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { JWT, OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
@@ -345,7 +345,6 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.buildTool === MAVEN,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -661,10 +660,6 @@ const baseServerFiles = {
       condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
-        {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProvider.java',
-          renameTo: generator => `${generator.javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`,
-        },
         {
           file: 'package/web/filter/ModifyServersOpenApiFilter.java',
           renameTo: generator => `${generator.javaDir}web/filter/ModifyServersOpenApiFilter.java`,
@@ -679,10 +674,6 @@ const baseServerFiles = {
           file: 'package/web/filter/ModifyServersOpenApiFilterTest.java',
           renameTo: generator => `${generator.testDir}web/filter/ModifyServersOpenApiFilterTest.java`,
         },
-        {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProviderTest.java',
-          renameTo: generator => `${generator.testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`,
-        },
       ],
     },
   ],
@@ -1323,13 +1314,15 @@ const baseServerFiles = {
           file: 'package/cucumber/CucumberTestContextConfiguration.java',
           renameTo: generator => `${generator.testDir}cucumber/CucumberTestContextConfiguration.java`,
         },
-        { file: '../features/gitkeep', noEjs: true },
       ],
     },
     {
       condition: generator => generator.cucumberTests,
       path: SERVER_TEST_RES_DIR,
-      templates: ['cucumber.properties'],
+      templates: [
+        'junit-platform.properties',
+        { file: 'package/features/gitkeep', renameTo: generator => `${generator.testDir}cucumber/gitkeep`, noEjs: true },
+      ],
     },
     {
       condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
@@ -1638,7 +1631,16 @@ const baseServerFiles = {
           file: 'package/cucumber/stepdefs/UserStepDefs.java',
           renameTo: generator => `${generator.testDir}cucumber/stepdefs/UserStepDefs.java`,
         },
-        '../features/user/user.feature',
+      ],
+    },
+    {
+      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'package/features/user/user.feature',
+          renameTo: generator => `${generator.testDir}cucumber/user.feature`,
+        },
       ],
     },
     {
@@ -1735,7 +1737,7 @@ function writeFiles() {
     },
 
     cleanupOldServerFiles() {
-      cleanup.cleanupOldServerFiles(
+      serverCleanup.cleanupOldServerFiles(
         this,
         `${SERVER_MAIN_SRC_DIR}/${this.javaDir}`,
         `${SERVER_TEST_SRC_DIR}/${this.testDir}`,

package/generators/server/index.js

@@ -54,6 +54,8 @@ const NO_CACHE = cacheTypes.NO;
 const NO_DATABASE = databaseTypes.NO;
 const NO_WEBSOCKET = websocketTypes.FALSE;
 
+const { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, MAIN_DIR, TEST_DIR } = constants;
+
 module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -93,14 +95,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           ) {
             return defaultInstallTask();
           }
-          const gradle = buildTool === GRADLE;
-          const command = gradle ? './gradlew' : './npmw';
-          const args = gradle ? ['npmInstall'] : ['install'];
 
           try {
-            await this.spawnCommand(command, args, { preferLocal: true });
+            await this.spawnCommand('./npmw', ['install'], { preferLocal: true });
           } catch (error) {
-            this.log(chalk.red(`Error executing '${command} ${args.join(' ')}', execute it yourself. (${error.shortMessage})`));
+            this.log(chalk.red(`Error executing './npmw install', execute it yourself. (${error.shortMessage})`));
           }
           return true;
         }.bind(this),
@@ -336,6 +335,15 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
         this.jhiTablePrefix = this.getTableName(this.jhiPrefix);
 
+        this.mainJavaDir = SERVER_MAIN_SRC_DIR;
+        this.mainJavaResourceDir = SERVER_MAIN_RES_DIR;
+        this.mainJavaPackageDir = `${SERVER_MAIN_RES_DIR}${this.packageFolder}/`;
+        this.testJavaDir = SERVER_TEST_SRC_DIR;
+        this.testJavaPackageDir = `${SERVER_MAIN_RES_DIR}${this.packageFolder}/`;
+        this.testResourceDir = SERVER_TEST_RES_DIR;
+        this.srcMainDir = MAIN_DIR;
+        this.srcTestDir = TEST_DIR;
+
         if (this.jhipsterConfig.databaseType === SQL) {
           // sql
           let dbContainer;
@@ -432,6 +440,20 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
+      cleanupCucumberTests() {
+        if (!this.cucumberTests) return undefined;
+        if (this.isJhipsterVersionLessThan('7.4.2')) {
+          this.removeFile(`${this.testResourceDir}cucumber.properties`);
+          this.removeFile(`${this.srcTestDir}features/gitkeep`);
+          this.removeFile(`${this.srcTestDir}features/user/user.feature`);
+        }
+      },
+      cleanupServer() {
+        if (this.isJhipsterVersionLessThan('7.4.2')) {
+          this.removeFile(`${this.mainJavaPackageDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
+          this.removeFile(`${this.testJavaDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
+        }
+      },
       ...writeFiles(),
       ...super._missingPostWriting(),
     };
@@ -544,17 +566,18 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const buildTool = this.jhipsterConfig.buildTool;
         let e2ePackage = 'target/e2e';
         if (buildTool === MAVEN) {
+          const excludeWebapp = this.jhipsterConfig.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
           scriptsStorage.set({
             'app:start': './mvnw',
             'backend:info': './mvnw -ntp enforcer:display-info --batch-mode',
             'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
             'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
-            'backend:start': './mvnw -P-webapp',
+            'backend:start': `./mvnw${excludeWebapp}`,
             'java:jar': './mvnw -ntp verify -DskipTests --batch-mode',
             'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar',
-            'java:docker': './mvnw -ntp verify -DskipTests jib:dockerBuild',
+            'java:docker': './mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild',
             'java:docker:arm64': 'npm run java:docker -- -Djib-maven-plugin.architecture=arm64',
-            'backend:unit:test': `./mvnw -ntp -P-webapp verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
+            'backend:unit:test': `./mvnw -ntp${excludeWebapp} verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
             'backend:build-cache': './mvnw dependency:go-offline',
             'backend:debug': './mvnw -Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"',
           });
@@ -569,7 +592,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             'backend:start': `./gradlew ${excludeWebapp}`,
             'java:jar': './gradlew bootJar -x test -x integrationTest',
             'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
-            'java:docker': './gradlew bootJar jibDockerBuild',
+            'java:docker': './gradlew bootJar -Pprod jibDockerBuild',
             'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`,
             'postci:e2e:package': 'cp build/libs/*.$npm_package_config_packaging e2e.$npm_package_config_packaging',
             'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package',
@@ -583,8 +606,8 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           'java:war:prod': 'npm run java:war -- -Pprod',
           'java:docker:dev': 'npm run java:docker -- -Pdev,webapp',
           'java:docker:prod': 'npm run java:docker -- -Pprod',
-          'ci:backend:test': 'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test',
-          'ci:server:package': 'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment',
+          'ci:backend:test':
+            'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test -- -P$npm_package_config_default_environment',
           'ci:e2e:package':
             'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment -- -Pe2e -Denforcer.skip=true',
           'preci:e2e:server:start': 'npm run docker:db:await --if-present && npm run docker:others:await --if-present',
@@ -605,18 +628,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               'concurrently -k -s first "npm run backend:start" "npm start" "wait-on http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"',
           });
         }
-        // Vue eagerly loads remotes, wait for it.
-        if (this.microfrontend && this.applicationTypeGateway && this.clientFrameworkVue) {
-          const remotesScript = this.remotes
-            .map(
-              app =>
-                `echo "Waiting for microfrontend ${app.baseName} to start" && wait-on http-get://localhost:$npm_package_config_backend_port/${app.endpointPrefix}/remoteEntry.js && echo "Microfrontend ${app.baseName} started"`
-            )
-            .join(' && ');
-          scriptsStorage.set({
-            'ci:server:await': `${scriptsStorage.get('ci:server:await')} && ${remotesScript}`,
-          });
-        }
       },
     };
   }