generator-jhipster 7.9.0 → 7.9.3

package/generators/generate-blueprint/generator.mjs

@@ -31,9 +31,12 @@ import {
   PREPARING_PRIORITY,
   WRITING_PRIORITY,
   POST_WRITING_PRIORITY,
-  INSTALL_PRIORITY,
+  POST_INSTALL_PRIORITY,
   END_PRIORITY,
+  COMPOSING_PRIORITY,
+  BASE_PRIORITY_NAMES,
 } from '../../lib/constants/priorities.mjs';
+
 import {
   options,
   requiredConfig,
@@ -42,19 +45,23 @@ import {
   allGeneratorsConfig,
   prompts,
   subGeneratorPrompts,
+  GENERATE_SNAPSHOTS,
+  LINK_JHIPSTER_DEPENDENCY,
   ALL_GENERATORS,
   GENERATORS,
   PRIORITIES,
   SUB_GENERATORS,
   ADDITIONAL_SUB_GENERATORS,
   WRITTEN,
+  LOCAL_BLUEPRINT_OPTION,
+  ALL_PRIORITIES,
 } from './constants.mjs';
 
 import GENERATOR_LIST from '../generator-list.js';
 import { files, generatorFiles } from './files.mjs';
 
 const { camelCase, upperFirst, snakeCase } = lodash;
-const { GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
+const { GENERATOR_PROJECT_NAME, GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
 
 export default class extends BaseBlueprintGenerator {
   constructor(args, opts, features) {
@@ -73,22 +80,18 @@ export default class extends BaseBlueprintGenerator {
       this.config.set(allGeneratorsConfig());
     }
     if (this.options.defaults) {
-      this.config.defaults(defaultConfig());
+      this.config.defaults(defaultConfig({ config: this.jhipsterConfig }));
     }
-    this.config.defaults({
-      [SKIP_COMMIT_HOOK]: true,
-    });
   }
 
   /** @inheritdoc */
   async getPossibleDependencies() {
-    return [GENERATOR_INIT];
+    return [GENERATOR_PROJECT_NAME, GENERATOR_INIT];
   }
 
   async _beforeQueue() {
     if (!this.fromBlueprint) {
-      const configure = this.options.configure || !this.shouldComposeModular();
-      await this.dependsOnJHipster(GENERATOR_INIT, [], { configure });
+      await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
       await this.composeWithBlueprints(GENERATOR_GENERATE_BLUEPRINT);
     }
   }
@@ -119,20 +122,30 @@ export default class extends BaseBlueprintGenerator {
         await this.prompt(prompts(this), this.config);
       },
       async eachSubGenerator() {
+        const { localBlueprint } = this.jhipsterConfig;
+        const { [ALL_PRIORITIES]: allPriorities } = this.options;
         const subGenerators = this.config.get(SUB_GENERATORS) || [];
         for (const subGenerator of subGenerators) {
           const subGeneratorStorage = this.getSubGeneratorStorage(subGenerator);
-          await this.prompt(subGeneratorPrompts(subGenerator), subGeneratorStorage);
+          if (allPriorities) {
+            subGeneratorStorage.defaults({ [PRIORITIES]: BASE_PRIORITY_NAMES });
+          }
+          await this.prompt(subGeneratorPrompts({ subGenerator, localBlueprint, options: this.options }), subGeneratorStorage);
         }
       },
       async eachAdditionalSubGenerator() {
+        const { localBlueprint } = this.jhipsterConfig;
+        const { [ALL_PRIORITIES]: allPriorities } = this.options;
         const additionalSubGenerators = this.config.get(ADDITIONAL_SUB_GENERATORS) || '';
         for (const subGenerator of additionalSubGenerators
           .split(',')
           .map(sub => sub.trim())
           .filter(Boolean)) {
           const subGeneratorStorage = this.getSubGeneratorStorage(subGenerator);
-          await this.prompt(subGeneratorPrompts(subGenerator, true), subGeneratorStorage);
+          if (allPriorities) {
+            subGeneratorStorage.defaults({ [PRIORITIES]: BASE_PRIORITY_NAMES });
+          }
+          await this.prompt(subGeneratorPrompts({ subGenerator, localBlueprint, additionalSubGenerator: true }), subGeneratorStorage);
         }
       },
     };
@@ -148,6 +161,13 @@ export default class extends BaseBlueprintGenerator {
       requiredConfig() {
         this.config.defaults(requiredConfig());
       },
+      conditionalConfig() {
+        if (!this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) {
+          this.config.defaults({
+            [SKIP_COMMIT_HOOK]: true,
+          });
+        }
+      },
     };
   }
 
@@ -156,6 +176,20 @@ export default class extends BaseBlueprintGenerator {
     return this.configuring;
   }
 
+  get composing() {
+    return {
+      async compose() {
+        const configure = this.options.configure || !this.shouldComposeModular() || this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION];
+        await this.composeWithJHipster(GENERATOR_INIT, [], { configure });
+      },
+    };
+  }
+
+  get [COMPOSING_PRIORITY]() {
+    if (this.delegateToBlueprint) return {};
+    return this.composing;
+  }
+
   get loading() {
     return {
       createContext() {
@@ -184,6 +218,9 @@ export default class extends BaseBlueprintGenerator {
           }
         }
       },
+      preparePath() {
+        this.application.blueprintsPath = this.application[LOCAL_BLUEPRINT_OPTION] ? '.blueprint/' : 'generators/';
+      },
     };
   }
 
@@ -240,8 +277,8 @@ export default class extends BaseBlueprintGenerator {
 
   get postWriting() {
     return {
-      postWriting() {
-        if (this.shouldSkipFiles()) return;
+      packageJson() {
+        if (this.shouldSkipFiles() || this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) return;
         const { packagejs } = this.application;
         this.packageJson.merge({
           name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
@@ -284,7 +321,7 @@ export default class extends BaseBlueprintGenerator {
         });
       },
       addCliToPackageJson() {
-        if (this.shouldSkipFiles() || !this.jhipsterConfig.cli) return;
+        if (this.shouldSkipFiles() || !this.jhipsterConfig.cli || this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) return;
         const { baseName, cliName = `jhipster-${baseName}` } = this.application;
         this.packageJson.merge({
           bin: {
@@ -294,7 +331,7 @@ export default class extends BaseBlueprintGenerator {
         });
       },
       addGeneratorJHipsterDependency() {
-        if (this.shouldSkipFiles()) return;
+        if (this.shouldSkipFiles() || this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) return;
         const { packagejs } = this.application;
         if (this.jhipsterConfig.dynamic) {
           this.packageJson.merge({
@@ -321,30 +358,47 @@ export default class extends BaseBlueprintGenerator {
     return this.postWriting;
   }
 
-  get install() {
+  get postInstall() {
     return {
       async addSnapshot() {
-        if (this.options.skipInstall || this.options.skipGit || this.config.existed) return;
+        const { [LOCAL_BLUEPRINT_OPTION]: localBlueprint } = this.jhipsterConfig;
+        const {
+          skipInstall,
+          skipGit,
+          existed,
+          [GENERATE_SNAPSHOTS]: generateSnapshots = !localBlueprint && !skipInstall && !skipGit && !existed,
+        } = this.options;
+        if (!generateSnapshots) return;
+
         // Generate snapshots to add to git.
         this.log(`
 This is a new blueprint, executing '${chalk.yellow('npm run update-snapshot')}' to generate snapshots and commit to git.`);
         try {
+          if (this.options[LINK_JHIPSTER_DEPENDENCY]) {
+            await this.spawnCommand('npm', ['link', 'generator-jhipster']);
+          }
           await this.spawnCommand('npm', ['run', 'update-snapshot']);
         } catch (error) {
+          if (generateSnapshots !== undefined) {
+            // We are forcing to generate snapshots fail the generation.
+            throw error;
+          }
           this.log('Fail to generate snapshots');
         }
       },
     };
   }
 
-  get [INSTALL_PRIORITY]() {
+  get [POST_INSTALL_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
-    return this.install;
+    return this.postInstall;
   }
 
   get end() {
     return {
       end() {
+        if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) return;
+
         this.log(`${chalk.bold.green('##### USAGE #####')}
 To begin to work:
 - launch: ${chalk.yellow.bold('npm install')}

package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import expect from 'expect';
+import { expect } from 'expect';
 
 import { helpers, lookups } from '#test-utils';
 

package/generators/generator-base-blueprint.js

@@ -39,6 +39,7 @@ const { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, norma
  * Base class for a generator that can be extended through a blueprint.
  *
  * @class
+ * @extends {BaseGenerator}
  * @property {import('yeoman-generator/lib/util/storage')} blueprintStorage - Storage for blueprint config (Blueprints only).
  * @property {object} blueprintConfig - Proxy object for blueprintStorage (Blueprints only).
  * @property {import('yeoman-generator')} jhipsterContext - JHipster parent generator (Blueprints only).
@@ -352,6 +353,24 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     return {};
   }
 
+  /**
+   * Priority API stub for blueprints.
+   *
+   * PostWriting priority should used to customize files.
+   *
+   * @returns {Object.<string, YeomanTask>} generator tasks
+   */
+  get postInstall() {
+    return this._postInstall();
+  }
+
+  /**
+   * Public API method used by the getter and also by Blueprints
+   */
+  _postInstall() {
+    return {};
+  }
+
   /**
    * Priority API stub for blueprints.
    *
@@ -409,7 +428,10 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       this._configureBlueprints();
     }
 
-    const blueprints = this.jhipsterConfig.blueprints || [];
+    let blueprints = this.jhipsterConfig.blueprints || [];
+    if (this.options.localBlueprint) {
+      blueprints = blueprints.concat({ name: '@jhipster/local' });
+    }
     for (const blueprint of blueprints) {
       const blueprintGenerator = await this._composeBlueprint(blueprint.name, subGen, extraOptions);
       if (blueprintGenerator) {

package/generators/generator-base-entities.cjs

@@ -26,6 +26,7 @@ const {
   PREPARING_EACH_ENTITY_FIELD,
   PREPARING_EACH_ENTITY_RELATIONSHIP,
   POST_PREPARING_EACH_ENTITY,
+  DEFAULT,
   WRITING_ENTITIES,
   POST_WRITING_ENTITIES,
 } = PRIORITY_NAMES;
@@ -43,6 +44,9 @@ const {
 
 /**
  * This is the base class for a generator that generates entities.
+ *
+ * @class
+ * @extends {BaseBlueprintGenerator}
  */
 class JHipsterBaseEntitiesGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -103,7 +107,7 @@ class JHipsterBaseEntitiesGenerator extends BaseBlueprintGenerator {
 
   getDataArgForPriority(priorityName) {
     const dataArg = super.getDataArgForPriority(priorityName);
-    if (priorityName === WRITING_ENTITIES || priorityName === POST_WRITING_ENTITIES) {
+    if (priorityName === WRITING_ENTITIES || priorityName === POST_WRITING_ENTITIES || priorityName === DEFAULT) {
       return {
         ...dataArg,
         ...this.getEntitiesDataToWrite(),

package/generators/generator-base.js

@@ -119,6 +119,7 @@ const isWin32 = os.platform() === 'win32';
  * @param {...EditFileCallback} callbacks
  * @returns {CascatedEditFileCallback} callback for cascated edit
  */
+
 /**
  * This is the Generator base class.
  * This provides all the public API methods exposed via the module system.
@@ -126,7 +127,10 @@ const isWin32 = os.platform() === 'win32';
  *
  * The method signatures in public API should not be changed without a major version change
  *
+ * @class
  * @extends {import('yeoman-generator')}
+ * @property {import('yeoman-generator/lib/util/storage')} config - Storage for config.
+ * @property {object} jhipsterConfig - Proxy object for config.
  */
 class JHipsterBaseGenerator extends PrivateBase {
   constructor(args, options, features) {
@@ -2384,24 +2388,64 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
   }
 
   /**
-   * write the given files using provided options.
+   * Block of files to written.
+   *
+   * @typedef {object} WriteFileBlock
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [from] - relative path were sources are placed
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [to=from] - relative path were the files should be written, fallbacks to from/path
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [path] - same as from
+   * @property {string | function(this: JHipsterBaseGenerator, any, string): string} [renameTo] - generate destinationFile based on sourceFile
+   * @property {boolean | function(this: JHipsterBaseGenerator, any): boolean} [condition=true] - condition to enable to write the block
+   * @property {EditFileCallback[]} transform - transforms (files processing) to be applied
+   */
+
+  /**
+   * Template file to be written.
+   *
+   * @typedef {object} WriteFileTemplate
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [sourceFile] - source file
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [destinationFile] - destination file
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [file] - deprecated, use sourceFile instead
+   * @property {string | function(this: JHipsterBaseGenerator, any): string} [renameTo] - deprecated, use destinationFile insted
+   * @property {EditFileCallback[]} [transform] - transforms (files processing) to be applied
+   * @property {boolean} [binary] - binary files skips ejs render, ejs extension and file transform
+   * @property {object} [options] - ejs options. Refer to https://ejs.co/#docs
+   */
+
+  /**
+   * Sections of blocks to be writter.
+   *
+   * @typedef {Record<string, WriteFileBlock> & { _: {
+   *   transform: EditFileCallback[]
+   * } }} WriteFileSection
+   */
+
+  /**
+   * Template options to be passed to ejs renderFile.
    *
-   * @param {object} options
-   * @param {object} [options.sections] - sections to write
-   * @param {object} [options.blocks] - blocks to write
-   * @param {object} [options.files] - files to write
-   * @param {object} [options.context] - context for templates
-   * @param {string|string[]} [options.rootTemplatesPath] - path(s) to look for templates.
+   * @typedef {object} WriteFileOptions
+   * @property {WriteFileSection} [sections] - sections to be writter
+   * @property {WriteFileBlock[]} [blocks] - block to be writter
+   * @property {WriteFileTemplate[]} [templates] - templates to be writter
+   * @property {EditFileCallback[]} [transform] - transforms (files processing) to be applied
+   * @property {object} [context=this] - context to be used as template data
+   * @property {string|string[]} [rootTemplatesPath] - path(s) to look for templates.
    *        Single absolute path or relative path(s) between the templates folder and template path.
-   * @return {string[]}
+   */
+
+  /**
+   * write the given files using provided options.
+   *
+   * @param {WriteFileOptions} options
+   * @return {Promise<string[]>}
    */
   async writeFiles(options) {
     const paramCount = Object.keys(options).filter(key => ['sections', 'blocks', 'templates'].includes(key)).length;
-    assert(paramCount > 0, 'One of sections, blocks or files is required');
-    assert(paramCount === 1, 'Only one of sections, blocks or files must be provided');
+    assert(paramCount > 0, 'One of sections, blocks or templates is required');
+    assert(paramCount === 1, 'Only one of sections, blocks or templates must be provided');
 
     const { sections, blocks, templates, rootTemplatesPath, context = this, transform: methodTransform = [] } = options;
-    const { _: commonSpec = {} } = sections;
+    const { _: commonSpec = {} } = sections || {};
     const { transform: sectionTransform = [] } = commonSpec;
     const startTime = new Date();
 
@@ -2449,7 +2493,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       const appendEjs = noEjs === undefined ? !binary && extension !== '.ejs' : !noEjs;
       const ejsFile = appendEjs || extension === '.ejs';
 
-      destinationFile = appendEjs ? normalizeEjs(destinationFile) : destinationFile;
+      if (typeof destinationFile === 'function') {
+        destinationFile = resolveCallback(destinationFile);
+      } else {
+        destinationFile = appendEjs ? normalizeEjs(destinationFile) : destinationFile;
+      }
 
       let sourceFileFrom;
       if (Array.isArray(rootTemplatesAbsolutePath)) {
@@ -2548,6 +2596,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             to: blockToCallback,
             condition: blockConditionCallback,
             transform: blockTransform = [],
+            renameTo: blockRenameTo,
           } = block;
           assert(typeof block === 'object', `Block must be an object for ${blockSpecPath}`);
           assert(Array.isArray(block.templates), `Block templates must be an array for ${blockSpecPath}`);
@@ -2570,7 +2619,12 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             }
             if (typeof fileSpec === 'string') {
               const sourceFile = path.join(blockPath, fileSpec);
-              const destinationFile = this.destinationPath(blockTo, fileSpec);
+              let destinationFile;
+              if (blockRenameTo) {
+                destinationFile = this.destinationPath(blockRenameTo.call(this, context, fileSpec, this));
+              } else {
+                destinationFile = this.destinationPath(blockTo, fileSpec);
+              }
               return { sourceFile, destinationFile, noEjs, transform: derivedTransform };
             }
 
@@ -2806,13 +2860,16 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     if (options.enableTranslation !== undefined) {
       this.jhipsterConfig.enableTranslation = options.enableTranslation;
     }
+    if (options.autoCrlf !== undefined) {
+      this.jhipsterConfig.autoCrlf = options.autoCrlf;
+    }
     if (options.language) {
       // workaround double options parsing, remove once generator supports skipping parse options
       const languages = options.language.flat();
       if (languages.length === 1 && languages[0] === 'false') {
         this.jhipsterConfig.enableTranslation = false;
       } else {
-        this.jhipsterConfig.languages = [...this.jhipsterConfig.languages, ...languages];
+        this.jhipsterConfig.languages = [...(this.jhipsterConfig.languages || []), ...languages];
       }
     }
     if (options.nativeLanguage) {
@@ -2917,6 +2974,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
   loadAppConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.jhipsterVersion = config.jhipsterVersion;
     dest.baseName = config.baseName;
+    dest.projectVersion = process.env.JHI_PROJECT_VERSION || '0.0.1-SNAPSHOT';
     dest.applicationType = config.applicationType;
     dest.reactive = config.reactive;
     dest.jhiPrefix = config.jhiPrefix;
@@ -3029,6 +3087,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.clientFrameworkAngular = dest.clientFramework === ANGULAR;
     dest.clientFrameworkReact = dest.clientFramework === REACT;
     dest.clientFrameworkVue = dest.clientFramework === VUE;
+    dest.clientFrameworkNo = dest.clientFramework === CLIENT_FRAMEWORK_NO;
+    dest.clientFrameworkAny = dest.clientFramework && dest.clientFramework !== CLIENT_FRAMEWORK_NO;
     dest.clientThemeNone = dest.clientTheme === 'none';
     dest.clientThemePrimary = dest.clientThemeVariant === 'primary';
     dest.clientThemeLight = dest.clientThemeVariant === 'light';
@@ -3095,6 +3155,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.packageFolder = dest.packageName.replace(/\./g, '/');
     }
 
+    dest.serviceDiscoveryAny = dest.serviceDiscoveryType && dest.serviceDiscoveryType !== NO_SERVICE_DISCOVERY;
     // Convert to false for templates.
     if (dest.serviceDiscoveryType === NO_SERVICE_DISCOVERY || !dest.serviceDiscoveryType) {
       dest.serviceDiscoveryType = false;
@@ -3169,7 +3230,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
   loadDerivedPlatformConfig(dest = this) {
     dest.serviceDiscoveryConsul = dest.serviceDiscoveryType === CONSUL;
     dest.serviceDiscoveryEureka = dest.serviceDiscoveryType === EUREKA;
-    dest.serviceDiscoveryAny = dest.serviceDiscoveryConsul || dest.serviceDiscoveryEureka;
+    dest.serviceDiscoveryAny = dest.serviceDiscoveryType && dest.serviceDiscoveryType !== NO_SERVICE_DISCOVERY;
     dest.monitoringELK = dest.monitoring === ELK;
     dest.monitoringPrometheus = dest.monitoring === PROMETHEUS;
   }
@@ -3380,6 +3441,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       if (optionValue !== undefined) {
         if (optionDesc.scope === 'storage') {
           this.config.set(optionName, optionValue);
+        } else if (optionDesc.scope === 'blueprint') {
+          this.blueprintStorage.set(optionName, optionValue);
         } else if (optionDesc.scope === 'runtime') {
           this.configOptions[optionName] = optionValue;
         } else if (optionDesc.scope === 'generator') {
@@ -3392,6 +3455,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     });
   }
 
+  /**
+   * @private
+   */
   getArgsForPriority(priorityName) {
     if (this.features.priorityArgs) {
       return [this.getDataArgForPriority(priorityName)];
@@ -3400,6 +3466,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
   }
 
   /**
+   * @private
    */
   getDataArgForPriority(priorityName) {
     if (

package/generators/generator-constants.js

@@ -28,25 +28,21 @@ const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17', '18'
 const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
 
 // Version of Node, NPM
-const NODE_VERSION = '16.16.0';
+const NODE_VERSION = '16.17.0';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.9.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.9.3';
 // 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.7.2';
-const LIQUIBASE_VERSION = '4.12.0';
+const SPRING_BOOT_VERSION = '2.7.3';
+const LIQUIBASE_VERSION = '4.15.0';
 // TODO v8: Remove this constant
 const LIQUIBASE_DTD_VERSION = 'latest';
 const HIBERNATE_VERSION = '5.6.10.Final';
 const JACOCO_VERSION = '0.8.8';
 const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.3';
 const JIB_VERSION = '3.2.1';
-// TODO upgrade to h2 v2 once liquibase issues has been addressed
-const H2_VERSION = '1.4.200';
-// Version 0.9.x is not compatible with h2 v1
-const H2_R2DBC_VERSION = '0.8.5.RELEASE';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
@@ -57,49 +53,49 @@ const DOCKER_JHIPSTER_CONTROL_CENTER_VERSION = 'v0.5.0';
 const DOCKER_JHIPSTER_CONTROL_CENTER = `jhipster/jhipster-control-center:${DOCKER_JHIPSTER_CONTROL_CENTER_VERSION}`;
 const DOCKER_JAVA_JRE_VERSION = '11-jre-focal';
 const DOCKER_JAVA_JRE = `eclipse-temurin:${DOCKER_JAVA_JRE_VERSION}`;
-const DOCKER_MYSQL_VERSION = '8.0.29';
+const DOCKER_MYSQL_VERSION = '8.0.30';
 const DOCKER_MYSQL = `mysql:${DOCKER_MYSQL_VERSION}`;
 const DOCKER_MARIADB_VERSION = '10.8.3';
 const DOCKER_MARIADB = `mariadb:${DOCKER_MARIADB_VERSION}`;
-const DOCKER_POSTGRESQL_VERSION = '14.4';
+const DOCKER_POSTGRESQL_VERSION = '14.5';
 const DOCKER_POSTGRESQL = `postgres:${DOCKER_POSTGRESQL_VERSION}`;
-const DOCKER_MONGODB_VERSION = '4.4.14';
+const DOCKER_MONGODB_VERSION = '4.4.15';
 const DOCKER_MONGODB = `mongo:${DOCKER_MONGODB_VERSION}`;
 const DOCKER_COUCHBASE_VERSION = '7.0.3';
 const DOCKER_COUCHBASE = `couchbase/server:${DOCKER_COUCHBASE_VERSION}`;
 const DOCKER_CASSANDRA_VERSION = '3.11.13';
 const DOCKER_CASSANDRA = `cassandra:${DOCKER_CASSANDRA_VERSION}`;
-const DOCKER_MSSQL_VERSION = '2019-CU16-ubuntu-20.04';
+const DOCKER_MSSQL_VERSION = '2019-CU16-GDR1-ubuntu-20.04';
 const DOCKER_MSSQL = `mcr.microsoft.com/mssql/server:${DOCKER_MSSQL_VERSION}`;
-const DOCKER_NEO4J_VERSION = '4.4.8';
+const DOCKER_NEO4J_VERSION = '4.4.9';
 const DOCKER_NEO4J = `neo4j:${DOCKER_NEO4J_VERSION}`;
-const DOCKER_HAZELCAST_MANAGEMENT_CENTER_VERSION = '5.1.3';
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER_VERSION = '5.1.4';
 const DOCKER_HAZELCAST_MANAGEMENT_CENTER = `hazelcast/management-center:${DOCKER_HAZELCAST_MANAGEMENT_CENTER_VERSION}`;
-const DOCKER_MEMCACHED_VERSION = '1.6.15-alpine';
+const DOCKER_MEMCACHED_VERSION = '1.6.16-alpine';
 const DOCKER_MEMCACHED = `memcached:${DOCKER_MEMCACHED_VERSION}`;
 const DOCKER_REDIS_VERSION = '6.2.7';
 const DOCKER_REDIS = `redis:${DOCKER_REDIS_VERSION}`;
-const DOCKER_KEYCLOAK_VERSION = '18.0.0';
+const DOCKER_KEYCLOAK_VERSION = '19.0.1';
 const DOCKER_KEYCLOAK = `quay.io/keycloak/keycloak:${DOCKER_KEYCLOAK_VERSION}`;
 const DOCKER_ELASTICSEARCH_CONTAINER = 'docker.elastic.co/elasticsearch/elasticsearch';
 // TODO V8 Rename ELASTICSEARCH_VERSION to DOCKER_ELASTICSEARCH_VERSION
 const ELASTICSEARCH_VERSION = '7.17.4'; // The version should be coherent with the one from spring-data-elasticsearch project
 const DOCKER_ELASTICSEARCH = `${DOCKER_ELASTICSEARCH_CONTAINER}:${ELASTICSEARCH_VERSION}`;
 // TODO V8 Rename KAFKA_VERSION to DOCKER_KAFKA_VERSION
-const KAFKA_VERSION = '7.1.1';
+const KAFKA_VERSION = '7.2.1';
 const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
 const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
-const DOCKER_SONAR_VERSION = '9.5.0-community';
+const DOCKER_SONAR_VERSION = '9.6.0-community';
 const DOCKER_SONAR = `sonarqube:${DOCKER_SONAR_VERSION}`;
-const DOCKER_CONSUL_VERSION = '1.12.2';
+const DOCKER_CONSUL_VERSION = '1.13.1';
 const DOCKER_CONSUL = `consul:${DOCKER_CONSUL_VERSION}`;
 const DOCKER_CONSUL_CONFIG_LOADER_VERSION = 'v0.4.1';
 const DOCKER_CONSUL_CONFIG_LOADER = `jhipster/consul-config-loader:${DOCKER_CONSUL_CONFIG_LOADER_VERSION}`;
-const DOCKER_PROMETHEUS_VERSION = 'v2.36.2';
+const DOCKER_PROMETHEUS_VERSION = 'v2.38.0';
 const DOCKER_PROMETHEUS = `prom/prometheus:${DOCKER_PROMETHEUS_VERSION}`;
 const DOCKER_PROMETHEUS_ALERTMANAGER_VERSION = 'v0.24.0';
 const DOCKER_PROMETHEUS_ALERTMANAGER = `prom/alertmanager:${DOCKER_PROMETHEUS_ALERTMANAGER_VERSION}`;
-const DOCKER_GRAFANA_VERSION = '9.0.1';
+const DOCKER_GRAFANA_VERSION = '9.1.0';
 const DOCKER_GRAFANA = `grafana/grafana:${DOCKER_GRAFANA_VERSION}`;
 const DOCKER_JENKINS_VERSION = 'lts-jdk11';
 const DOCKER_JENKINS = `jenkins/jenkins:${DOCKER_JENKINS_VERSION}`;
@@ -416,8 +412,6 @@ const constants = {
   JIB_VERSION,
   JACOCO_VERSION,
   JACKSON_DATABIND_NULLABLE_VERSION,
-  H2_VERSION,
-  H2_R2DBC_VERSION,
 
   // Docker
   DOCKER_COMPOSE_FORMAT_VERSION,

package/generators/kubernetes/templates/deployment.yml.ejs

@@ -116,7 +116,7 @@ spec:
           value: <%= app.baseName.toLowerCase() %>
   <%_ } _%>
 <%_ } _%>
-<%_ if (!app.serviceDiscoveryType && app.authenticationTypeJwt) { _%>
+<%_ if (!app.serviceDiscoveryAny && app.authenticationTypeJwt) { _%>
         - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
           valueFrom:
             secretKeyRef:

package/generators/kubernetes/templates/ingress.yml.ejs

@@ -38,7 +38,7 @@ spec:
             name: <%= app.baseName.toLowerCase() %>
             port:
               name: http
-      <%_ if (!app.serviceDiscoveryType) { _%>
+      <%_ if (!app.serviceDiscoveryAny) { _%>
         <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
       - path: /services/<%= config.baseName.toLowerCase() %>/<%= ingressTypeNginx ? "" : "*" %>
         pathType: Prefix

package/generators/kubernetes/templates/istio/gateway.yml.ejs

@@ -57,7 +57,7 @@ spec:
   gateways:
   - <%= app.baseName.toLowerCase() %>-gateway
   http:
-<%_ if (!app.serviceDiscoveryType) { _%>
+<%_ if (!app.serviceDiscoveryAny) { _%>
   <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
   - match:
     - uri:

package/generators/kubernetes/templates/kustomize/kustomization.yml.ejs

@@ -31,7 +31,7 @@ const appOut = appName.concat('-', suffix); _%>
 - <%= appOut %>/<%= appName %>-ingress.yml
     <%_ } _%>
   <%_ } _%>
-  <%_ if (!appConfig.serviceDiscoveryType && appConfig.authenticationTypeJwt) { _%>
+  <%_ if (!appConfig.serviceDiscoveryAny && appConfig.authenticationTypeJwt) { _%>
 - <%= appOut %>/jwt-secret.yml
   <%_ } _%>
   <%_ if (monitoringPrometheus) { _%>