generator-jhipster 7.2.0 → 7.4.1

package/generators/generator-base.js

@@ -41,15 +41,13 @@ const { formatDateForChangelog } = require('../utils/liquibase');
 const { calculateDbNameWithLimit, hibernateSnakeCase } = require('../utils/db');
 const defaultApplicationOptions = require('../jdl/jhipster/default-application-options');
 const databaseTypes = require('../jdl/jhipster/database-types');
+const { ANGULAR_X: ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = require('../jdl/jhipster/client-framework-types');
 
 const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`;
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 
 const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
-const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
-const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
-const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
 const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA, H2_MEMORY, H2_DISK } = databaseTypes;
 const NO_DATABASE = databaseTypes.NO;
@@ -159,7 +157,13 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    * Alternative templatePath that fetches from the blueprinted generator, instead of the blueprint.
    */
   jhipsterTemplatePath(...args) {
-    this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    try {
+      this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    } catch (error) {
+      throw new Error(
+        `The Namespace ${this.options.namespace} may not be correct. Please check your configuration and ensure your blueprint folder start with "generator-". Detail: ${error}`
+      );
+    }
     return this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...args);
   }
 
@@ -450,8 +454,8 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     } else if (clientFramework === VUE) {
       this.needleApi.clientVue.addEntityToRouterImport(entityName, entityFileName, entityFolderName, readOnly);
       this.needleApi.clientVue.addEntityToRouter(entityInstance, entityName, entityFileName, readOnly);
-      this.needleApi.clientVue.addEntityServiceToMainImport(entityName, entityClass, entityFileName, entityFolderName);
-      this.needleApi.clientVue.addEntityServiceToMain(entityInstance, entityName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponent(entityInstance, entityName);
     }
   }
 
@@ -1862,16 +1866,22 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    */
   generateKeyStore() {
     const done = this.async();
-    const keyStoreFile = `${SERVER_MAIN_RES_DIR}config/tls/keystore.p12`;
+
+    let keystoreFolder = `${SERVER_MAIN_RES_DIR}config/tls/`;
+    if (this.destinationPath) {
+      keystoreFolder = this.destinationPath(keystoreFolder);
+    }
+    const keyStoreFile = `${keystoreFolder}/keystore.p12`;
+
     if (this.fs.exists(keyStoreFile)) {
       this.log(chalk.cyan(`\nKeyStore '${keyStoreFile}' already exists. Leaving unchanged.\n`));
       done();
     } else {
       try {
-        shelljs.mkdir('-p', `${SERVER_MAIN_RES_DIR}config/tls`);
+        shelljs.mkdir('-p', keystoreFolder);
       } catch (error) {
         // noticed that on windows the shelljs.mkdir tends to sometimes fail
-        fs.mkdir(`${SERVER_MAIN_RES_DIR}config/tls`, { recursive: true }, err => {
+        fs.mkdir(keystoreFolder, { recursive: true }, err => {
           if (err) throw err;
         });
       }
@@ -2654,7 +2664,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     }
 
     if (options.microfrontend) {
-      this.jhipsterConfig.microfrontend = options.microfrontend;
+      this.warning('Microfrontend option is deprecated.');
     }
 
     if (options.reactive !== undefined) {
@@ -2715,7 +2725,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.jhipsterVersion = config.jhipsterVersion;
     dest.baseName = config.baseName;
     dest.applicationType = config.applicationType;
@@ -2735,12 +2745,18 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.pages = config.pages;
     dest.skipJhipsterDependencies = !!config.skipJhipsterDependencies;
     dest.withAdminUi = config.withAdminUi;
-    dest.microfrontend = config.microfrontend;
     dest.gatewayServerPort = config.gatewayServerPort;
 
+    dest.capitalizedBaseName = config.capitalizedBaseName;
+    dest.dasherizedBaseName = config.dasherizedBaseName;
+    dest.humanizedBaseName = config.humanizedBaseName;
+    dest.projectDescription = config.projectDescription;
+
     dest.testFrameworks = config.testFrameworks || [];
     dest.cypressCoverage = config.cypressCoverage;
 
+    dest.remotes = Object.entries(config.applications || {}).map(([baseName, config]) => ({ baseName, ...config })) || [];
+
     dest.gatlingTests = dest.testFrameworks.includes(GATLING);
     dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
     dest.protractorTests = dest.testFrameworks.includes(PROTRACTOR);
@@ -2762,11 +2778,22 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     if (dest.baseName) {
       dest.camelizedBaseName = _.camelCase(dest.baseName);
       dest.hipster = this.getHipster(dest.baseName);
-      dest.capitalizedBaseName = _.upperFirst(dest.baseName);
-      dest.dasherizedBaseName = _.kebabCase(dest.baseName);
+      dest.capitalizedBaseName = dest.capitalizedBaseName || _.upperFirst(dest.baseName);
+      dest.dasherizedBaseName = dest.dasherizedBaseName || _.kebabCase(dest.baseName);
       dest.lowercaseBaseName = dest.baseName.toLowerCase();
-      dest.humanizedBaseName = dest.baseName.toLowerCase() === 'jhipster' ? 'JHipster' : _.startCase(dest.baseName);
+      dest.humanizedBaseName =
+        dest.humanizedBaseName || (dest.baseName.toLowerCase() === 'jhipster' ? 'JHipster' : _.startCase(dest.baseName));
+      dest.projectDescription = dest.projectDescription || `Description for ${this.baseName}`;
+      dest.endpointPrefix = !dest.applicationType || dest.applicationTypeMicroservice ? `services/${dest.lowercaseBaseName}` : '';
     }
+
+    if (dest.remotes) {
+      dest.remotes.forEach(app => this.loadDerivedAppConfig(app));
+      dest.microfrontends = dest.remotes.filter(r => r.clientFramework && r.clientFramework !== CLIENT_FRAMEWORK_NO);
+    }
+    dest.microfrontend =
+      (dest.applicationTypeMicroservice && !dest.skipClient) ||
+      (dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
   }
 
   /**
@@ -2776,7 +2803,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.clientPackageManager = config.clientPackageManager;
     dest.clientFramework = config.clientFramework;
     dest.clientTheme = config.clientTheme;
@@ -2807,7 +2834,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.enableTranslation = config.enableTranslation;
     dest.nativeLanguage = config.nativeLanguage;
     dest.languages = config.languages;
@@ -2820,7 +2847,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.packageName = config.packageName;
     dest.packageFolder = config.packageFolder;
     dest.serverPort = config.serverPort;
@@ -2934,7 +2961,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         [MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(dest.devDatabaseType));
   }
 
-  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.serviceDiscoveryType = config.serviceDiscoveryType;
     dest.monitoring = config.monitoring;
     this.loadDerivedPlatformConfig(dest);
@@ -3004,11 +3031,21 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     return this._needleApi;
   }
 
+  /**
+   * Default config based on current applicationType
+   */
+  get jhipsterDefaults() {
+    return this.getDefaultConfigForApplicationType();
+  }
+
   /**
    * Get default config based on applicationType
    */
   getDefaultConfigForApplicationType(applicationType = this.jhipsterConfig.applicationType) {
-    return { ...defaultApplicationOptions.getConfigForApplicationType(applicationType), ...defaultConfig };
+    return {
+      ...defaultApplicationOptions.getConfigForApplicationType(applicationType),
+      ...(applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig),
+    };
   }
 
   setConfigDefaults(defaults = this.jhipsterConfig.applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig) {

package/generators/generator-constants.js

@@ -22,10 +22,11 @@ const { ANGULAR_X, REACT, VUE } = require('../jdl/jhipster/client-framework-type
 const commonPackageJson = require('./common/templates/package.json');
 
 // Version of Java
-const JAVA_VERSION = '11'; // Java version is forced to be 11. We keep the variable as it might be useful in the future.
+const JAVA_VERSION = '11';
+const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
 
 // Version of Node, NPM
-const NODE_VERSION = '14.17.6';
+const NODE_VERSION = '14.18.1';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
@@ -33,10 +34,10 @@ const GRADLE_VERSION = '7.0.2';
 const JIB_VERSION = '3.1.4';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.2.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.4.1';
 // 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.4';
-const LIQUIBASE_VERSION = '4.4.3';
+const SPRING_BOOT_VERSION = '2.5.7';
+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';
 
@@ -46,30 +47,31 @@ const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.1';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
-const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.0.0';
+// const DOCKER_JHIPSTER_REGISTRY = 'ghcr.io/jhipster/jhipster-registry:main';
+const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.1.0';
 const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.5.0';
 const DOCKER_JAVA_JRE = 'eclipse-temurin:11-jre-focal';
-const DOCKER_MYSQL = 'mysql:8.0.26';
-const DOCKER_MARIADB = 'mariadb:10.6.4';
-const DOCKER_POSTGRESQL = 'postgres:13.4';
-const DOCKER_MONGODB = 'mongo:4.4.8';
+const DOCKER_MYSQL = 'mysql:8.0.27';
+const DOCKER_MARIADB = 'mariadb:10.7.1';
+const DOCKER_POSTGRESQL = 'postgres:13.5';
+const DOCKER_MONGODB = 'mongo:4.4.10';
 const DOCKER_COUCHBASE = 'couchbase/server:7.0.0';
 const DOCKER_CASSANDRA = 'cassandra:3.11.11';
-const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04';
-const DOCKER_NEO4J = 'neo4j:4.2.11';
+const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04';
+const DOCKER_NEO4J = 'neo4j:4.3.7';
 const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.06';
-const DOCKER_MEMCACHED = 'memcached:1.6.10-alpine';
-const DOCKER_REDIS = 'redis:6.2.5';
-const DOCKER_KEYCLOAK = 'jboss/keycloak:14.0.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_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_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}`;
-const DOCKER_SONAR = 'sonarqube:8.9.2-community';
-const DOCKER_CONSUL = 'consul:1.9.9';
+const DOCKER_SONAR = 'sonarqube:9.1.0-community';
+const DOCKER_CONSUL = 'consul:1.10.4';
 const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
-const DOCKER_PROMETHEUS = 'prom/prometheus:v2.29.2';
+const DOCKER_PROMETHEUS = 'prom/prometheus:v2.31.1';
 const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
-const DOCKER_GRAFANA = 'grafana/grafana:8.1.3';
+const DOCKER_GRAFANA = 'grafana/grafana:8.2.4';
 const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11';
 const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
 const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1';
@@ -81,7 +83,7 @@ const KUBERNETES_BATCH_API_VERSION = 'batch/v1';
 const KUBERNETES_DEPLOYMENT_API_VERSION = 'apps/v1';
 const KUBERNETES_STATEFULSET_API_VERSION = 'apps/v1';
 const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1beta1';
-const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1alpha3';
+const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1beta1';
 const KUBERNETES_RBAC_API_VERSION = 'rbac.authorization.k8s.io/v1';
 
 // Helm versions
@@ -93,6 +95,7 @@ const HELM_MYSQL = '^1.4.0';
 const HELM_MARIADB = '^6.12.2';
 const HELM_POSTGRESQL = '^6.5.3';
 const HELM_MOGODB_REPLICASET = '^3.10.1';
+const HELM_COUCHBASE_OPERATOR = '^2.2.1';
 
 // all constants used throughout all generators
 
@@ -246,10 +249,13 @@ const LANGUAGES = [
     name: 'Indonesian',
     dispName: 'Bahasa Indonesia',
     /*
-           To fix a nasty bug in the JDK ("Indonesian Locale does not comply with ISO 639")
+           JDK <17 ("Indonesian Locale does not comply with ISO 639")
            The locale is set to "in" for Indonesia
            See https://bugs.openjdk.java.net/browse/JDK-6457127
            And https://github.com/jhipster/generator-jhipster/issues/9494
+           Java 17 supports 'id' locale, for compatibility with java 11, we will keep legacy 'in' value while we support java 11.
+           When running with java 17 users must set 'java.locale.useOldISOCodes=true' environment variable.
+           See https://bugs.openjdk.java.net/browse/JDK-8267069.
         */
     value: 'in',
     localeId: 'id',
@@ -378,6 +384,7 @@ const constants = {
   DOCKER_PROMETHEUS_ALERTMANAGER,
   DOCKER_GRAFANA,
   JAVA_VERSION,
+  JAVA_COMPATIBLE_VERSIONS,
   KAFKA_VERSION,
   GRADLE_VERSION,
 
@@ -419,6 +426,7 @@ const constants = {
   HELM_MARIADB,
   HELM_POSTGRESQL,
   HELM_MOGODB_REPLICASET,
+  HELM_COUCHBASE_OPERATOR,
 };
 
 module.exports = constants;

package/generators/generator-transforms.js

@@ -18,24 +18,31 @@
  */
 const { State } = require('mem-fs-editor');
 const path = require('path');
-const { createFileTransform } = require('yeoman-environment/lib/util/transform');
+const { passthrough } = require('p-transform');
 const prettier = require('prettier');
 const prettierPluginJava = require('prettier-plugin-java');
 const prettierPluginPackagejson = require('prettier-plugin-packagejson');
+const { patternSpy } = require('yeoman-environment/transform');
 
 const { isFileStateDeleted } = State;
 
-const prettierTransform = function (options, generator, ignoreErrors = false) {
-  return createFileTransform((file, encoding, callback) => {
-    if (isFileStateDeleted(file)) {
-      callback(null, file);
-      return Promise.resolve();
-    }
-    /* resolve from the projects config */
-    let fileContent;
-    return prettier
-      .resolveConfig(file.relative)
-      .then(function (resolvedDestinationFileOptions) {
+const prettierTransform = function (options, generator, transformOptions = {}) {
+  if (typeof transformOptions === 'boolean') {
+    transformOptions = { ignoreErrors: transformOptions };
+  }
+  const { ignoreErrors = false, extensions = generator.getPrettierExtensions() } = transformOptions;
+  return patternSpy(
+    async file => {
+      if (isFileStateDeleted(file)) {
+        return file;
+      }
+      if (!file.contents) {
+        throw new Error(`File content doesn't exist for ${file.relative}`);
+      }
+      /* resolve from the projects config */
+      let fileContent;
+      try {
+        const resolvedDestinationFileOptions = await prettier.resolveConfig(file.relative);
         const prettierOptions = {
           plugins: [],
           // Config from disk
@@ -52,27 +59,33 @@ const prettierTransform = function (options, generator, ignoreErrors = false) {
         fileContent = file.contents.toString('utf8');
         const data = prettier.format(fileContent, prettierOptions);
         file.contents = Buffer.from(data);
-        callback(null, file);
-      })
-      .catch(error => {
-        const errorMessage = `Error parsing file ${file.relative}: ${error}
+        return file;
+      } catch (error) {
+        let errorMessage;
+        if (fileContent) {
+          errorMessage = `Error parsing file ${file.relative}: ${error}
 
 At: ${fileContent
-          .split('\n')
-          .map((value, idx) => `${idx + 1}: ${value}`)
-          .join('\n')}`;
+            .split('\n')
+            .map((value, idx) => `${idx + 1}: ${value}`)
+            .join('\n')}`;
+        } else {
+          errorMessage = `Unknown prettier error: ${error}`;
+        }
         if (ignoreErrors) {
           generator.warning(errorMessage);
-          callback(null, file);
-        } else {
-          callback(new Error(errorMessage));
+          return file;
         }
-      });
-  });
+        throw new Error(errorMessage);
+      }
+    },
+    `**/*.{${extensions}}`,
+    { dot: true }
+  ).name('jhipster:prettier');
 };
 
 const generatedAnnotationTransform = generator => {
-  return createFileTransform(function (file, encoding, callback) {
+  return passthrough(file => {
     if (
       !file.path.endsWith('package-info.java') &&
       !file.path.endsWith('MavenWrapperDownloader.java') &&
@@ -92,8 +105,7 @@ const generatedAnnotationTransform = generator => {
         file.contents = Buffer.from(newContent);
       }
     }
-    callback(null, file);
-  });
+  }, 'jhipster:generated-by-annotation');
 };
 
 module.exports = {

package/generators/heroku/index.js

@@ -39,8 +39,6 @@ const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
 const NO_CACHE_PROVIDER = cacheProviderOptions.NO;
 const execCmd = util.promisify(ChildProcess.exec);
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -64,8 +62,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.randomPassword = crypto.randomBytes(20).toString('hex');
     this.herokuSkipBuild = this.options.skipBuild;
     this.herokuSkipDeploy = this.options.skipDeploy || this.options.skipBuild;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_HEROKU);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_HEROKU);
+    }
   }
 
   _initializing() {
@@ -99,7 +101,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -191,29 +193,8 @@ module.exports = class extends BaseBlueprintGenerator {
             type: 'list',
             name: 'herokuJavaVersion',
             message: 'Which Java version would you like to use to build and run your app ?',
-            choices: [
-              {
-                value: '1.8',
-                name: '1.8',
-              },
-              {
-                value: '11',
-                name: '11',
-              },
-              {
-                value: '12',
-                name: '12',
-              },
-              {
-                value: '13',
-                name: '13',
-              },
-              {
-                value: '14',
-                name: '14',
-              },
-            ],
-            default: 1,
+            choices: constants.JAVA_COMPATIBLE_VERSIONS.map(version => ({ value: version })),
+            default: constants.JAVA_VERSION,
           },
         ];
 
@@ -244,6 +225,7 @@ module.exports = class extends BaseBlueprintGenerator {
             default: 1,
           },
           {
+            when: answers => answers.useOkta,
             type: 'input',
             name: 'oktaAdminLogin',
             message: 'Login (valid email) for the JHipster Admin user:',
@@ -254,27 +236,21 @@ module.exports = class extends BaseBlueprintGenerator {
               return true;
             },
           },
-          {
-            type: 'confirm',
-            name: 'oktaAdminPassword',
-            message: `${chalk.blue('Take note of this password!')} You will need it on your first login: ${chalk.blue(
-              this.randomPassword
-            )}`,
-            default: true,
-          },
         ];
 
         return this.prompt(prompts).then(props => {
           this.useOkta = props.useOkta;
-          this.oktaAdminLogin = props.oktaAdminLogin;
-          this.oktaAdminPassword = this.randomPassword;
+          if (this.useOkta) {
+            this.oktaAdminLogin = props.oktaAdminLogin;
+            this.oktaAdminPassword = this.randomPassword;
+          }
         });
       },
     };
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -300,14 +276,13 @@ module.exports = class extends BaseBlueprintGenerator {
           herokuJavaVersion: this.herokuJavaVersion,
           useOkta: this.useOkta,
           oktaAdminLogin: this.oktaAdminLogin,
-          oktaAdminPassword: this.oktaAdminPassword,
         });
       },
     };
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -327,7 +302,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -391,7 +366,7 @@ module.exports = class extends BaseBlueprintGenerator {
         const regionParams = this.herokuRegion !== 'us' ? ` --region ${this.herokuRegion}` : '';
 
         this.log(chalk.bold('\nCreating Heroku application and setting up node environment'));
-        const child = ChildProcess.exec(`heroku create ${this.herokuAppName}${regionParams}`, (err, stdout, stderr) => {
+        const child = ChildProcess.exec(`heroku create ${this.herokuAppName}${regionParams}`, { timeout: 6000 }, (err, stdout, stderr) => {
           if (err) {
             if (stderr.includes('is already taken')) {
               const prompts = [
@@ -458,7 +433,11 @@ module.exports = class extends BaseBlueprintGenerator {
               });
             } else {
               this.abort = true;
-              this.log.error(err);
+              if (stderr.includes('Invalid credentials')) {
+                this.log.error("Error: Not authenticated. Run 'heroku login' to login to your heroku account and try again.");
+              } else {
+                this.log.error(err);
+              }
               done();
             }
           } else {
@@ -598,7 +577,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -645,7 +624,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -779,7 +758,7 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.log(chalk.yellow('After you have installed jq execute ./provision-okta-addon.sh manually.'));
               }
               if (curlAvailable && jqAvailable) {
-                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users to use with jhipster.'));
+                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users for JHipster.'));
                 try {
                   await execCmd('./provision-okta-addon.sh');
                   this.log(chalk.bold('\nOkta configured successfully!'));
@@ -850,7 +829,7 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.log(chalk.yellow('After you have installed jq execute ./provision-okta-addon.sh manually.'));
               }
               if (curlAvailable && jqAvailable) {
-                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users to use with JHipster.'));
+                this.log(chalk.green('Running ./provision-okta-addon.sh to create all required roles and users for JHipster.'));
                 try {
                   await execCmd('./provision-okta-addon.sh');
                   this.log(chalk.bold('\nOkta configured successfully!'));
@@ -873,7 +852,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/init/constants.cjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const NODE_VERSION = '14.17.1';
+const NODE_VERSION = '14.18.1';
 
 const PRETTIER_DEFAULT_INDENT = 'prettierDefaultIndent';
 const PRETTIER_DEFAULT_INDENT_DEFAULT_VALUE = 2;

package/generators/init/templates/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm exec --no lint-staged
+npx --no-install lint-staged

package/generators/java/constants.cjs

@@ -20,7 +20,7 @@ const { MAVEN: BUILD_TOOL_MAVEN, MAVEN_DESCRIPTION, BUILD_DESTINATION_VALUE } =
 const { GRADLE: BUILD_TOOL_GRADLE, GRADLE_DESCRIPTION } = require('../gradle/constants.cjs');
 
 const JAVA_VERSION = '11';
-const JAVA_COMPATIBLE_VERSIONS = ['1.8', '1.9', '10', '11', '12', '13', '14', '15', '16'];
+const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
 const JAVA_APP_VERSION = '0.0.1-SNAPSHOT';
 const JAVA_SOURCE_DIR = 'src/main/java/';
 const JAVA_RESOURCE_DIR = 'src/main/resources/';

package/generators/kubernetes/files.js

@@ -57,6 +57,9 @@ function writeFiles() {
         if (!this.app.serviceDiscoveryType && this.app.authenticationType === JWT) {
           this.template('secret/jwt-secret.yml.ejs', `${appOut}/jwt-secret.yml`);
         }
+        if (this.app.prodDatabaseTypeCouchbase) {
+          this.template('secret/couchbase-secret.yml.ejs', `${appOut}/templates/couchbase-secret.yml`);
+        }
         if (this.monitoring === PROMETHEUS) {
           this.template('monitoring/jhipster-prometheus-sm.yml.ejs', `${appOut}/${appName}-prometheus-sm.yml`);
         }