generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.2

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -109,7 +109,7 @@
       };
       function showError() {
         var errorElm = document.getElementById('jhipster-error');
-        if (errorElm && errorElm.style) {
+        if (errorElm?.style) {
           errorElm.style.display = 'block';
         }
       }
@@ -128,14 +128,13 @@
     </script>
     -->
     <%_ } _%>
-    <!-- Google Analytics: uncomment and change UA-XXXXX-X to be your site's ID.
+    <!-- Google Analytics: uncomment and change both instances of UA-XXXXX-X to be your site's ID.
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-XXXXX-X"></script>
     <script>
-      (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-      function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-      e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-      e.src='//www.google-analytics.com/analytics.js';
-      r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-      ga('create','UA-XXXXX-X');ga('send','pageview');
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'UA-XXXXX-X');
     </script>-->
   </body>
 </html>

package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs

@@ -130,7 +130,8 @@
             if (y.includes('(default)')) return 1;
             if (x.includes('(management)')) return -1;
             if (y.includes('(management)')) return 1;
-            return x < y ? -1 : x > y ? 1 : 0;
+            if (x < y) return -1;
+            return x > y ? 1 : 0;
           });
         }
 

package/dist/generators/common/resources/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "8.1.0",
+    "concurrently": "8.2.0",
     "husky": "8.0.3",
-    "lint-staged": "13.2.2",
-    "npm": "9.7.1",
+    "lint-staged": "13.2.3",
+    "npm": "9.8.0",
     "wait-on": "7.0.1"
   }
 }

package/dist/generators/docker/generator.mjs

@@ -79,7 +79,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
                 if (application.authenticationTypeOauth2) {
                     const faker = await createFaker();
                     faker.seed(stringHashCode(application.baseName));
-                    application.keycloakSecrets = Array.from(Array(6), () => faker.datatype.uuid());
+                    application.keycloakSecrets = Array.from(Array(6), () => faker.string.uuid());
                 }
                 await this.writeFiles({
                     sections: dockerFiles,

package/dist/generators/docker/templates/src/main/docker/app.yml.ejs

@@ -44,8 +44,7 @@ _%>
       - SPRING_LIQUIBASE_URL=<%- this.getJDBCUrl(prodDatabaseType, { hostname: prodDatabaseType, databaseName: databaseName }) %>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
-      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
-      - SPRING_DATA_MONGODB_DATABASE=<%= baseName %>
+      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
       - SPRING_NEO4J_URI=bolt://neo4j:7687

package/dist/generators/docker/templates/src/main/docker/mariadb.yml.ejs

@@ -22,17 +22,17 @@ services:
   mariadb:
     image: <%- dockerContainers.mariadb %>
     volumes:
-      - ./config/mariadb:/etc/mysql/conf.d
+      - ./config/mariadb:/etc/mariadb/conf.d
     # volumes:
-    #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
+    #   - ~/volumes/jhipster/<%= baseName %>/mariadb/:/var/lib/mariadb/
     environment:
-      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-      - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
+      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=yes
+      - MARIADB_DATABASE=<%= baseName.toLowerCase() %>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mariadbd --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
       test: ["CMD", "/usr/local/bin/healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 5s

package/dist/generators/docker-compose/generator.mjs

@@ -139,7 +139,7 @@ export default class DockerComposeGenerator extends BaseDockerGenerator {
                     if (appConfig.applicationType === GATEWAY || appConfig.applicationType === MONOLITH) {
                         if (this.keycloakSecrets === undefined && appConfig.authenticationType === OAUTH2) {
                             faker.seed(stringHashCode(appConfig.baseName));
-                            this.keycloakSecrets = Array.from(Array(6), () => faker.datatype.uuid());
+                            this.keycloakSecrets = Array.from(Array(6), () => faker.string.uuid());
                         }
                         this.keycloakRedirectUris += `"http://localhost:${appConfig.composePort}/*", "https://localhost:${appConfig.composePort}/*", `;
                         if (appConfig.devServerPort !== undefined) {

package/dist/generators/entities/generator.mjs

@@ -40,7 +40,6 @@ export default class EntitiesGenerator extends BaseApplicationGenerator {
         this.option('defaults', {
             description: 'Execute jhipster with default config',
             type: Boolean,
-            default: false,
         });
         this.option('composed-entities', {
             description: 'Entities to be that already have been composed',

package/dist/generators/generate-blueprint/files.mjs

@@ -27,6 +27,7 @@ export const files = {
                 '.mocharc.cjs',
                 'README.md',
                 'test/utils.mjs',
+                'tsconfig.json',
                 '.prettierignore.jhi.blueprint',
             ],
         },

package/dist/generators/generate-blueprint/generator.mjs

@@ -26,6 +26,7 @@ import { files, generatorFiles } from './files.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { SKIP_COMMIT_HOOK } from '../init/constants.mjs';
 import command from './command.mjs';
+import { NODE_VERSION } from '../generator-constants.mjs';
 const { camelCase, upperFirst, snakeCase } = lodash;
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
 export default class extends BaseGenerator {
@@ -137,6 +138,7 @@ export default class extends BaseGenerator {
         return {
             prepareCommands() {
                 this.application.commands = [];
+                this.application.nodeVersion = NODE_VERSION;
                 if (!this.application[GENERATORS])
                     return;
                 for (const generator of Object.keys(this.application[GENERATORS])) {
@@ -232,7 +234,7 @@ export default class extends BaseGenerator {
                         'yeoman-test': `${packagejs.devDependencies['yeoman-test']}`,
                     },
                     engines: {
-                        node: '>=16.13.0',
+                        node: `>=${packagejs.engines.node}`,
                     },
                     imports: {
                         '#test-utils': './test/utils.mjs',

package/dist/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs

@@ -29,6 +29,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: <%- nodeVersion.split('.', 2)[0] %>
       - run: npm ci
       - run: npm run test

package/dist/generators/generate-blueprint/templates/tsconfig.json.ejs

@@ -0,0 +1,31 @@
+/* tsconfig.json is provided for ui autocomplete support, jhipster types are experimental */
+{
+  "compilerOptions": {
+    /* Language and Environment */
+    "target": "ES2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "lib": ["ES2022"] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
+    "types": [],
+
+    /* Modules */
+    "module": "node16" /* Specify what module code is generated. */,
+    "rootDir": "./" /* Specify the root folder within your source files. */,
+
+    /* JavaScript Support */
+    "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */,
+
+    /* Emit */
+    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
+
+    /* Interop Constraints */
+    "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
+    /* Type Checking */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": false,
+
+    /* Completeness */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  }
+}

package/dist/generators/generator-constants.mjs

@@ -17,46 +17,43 @@
  * limitations under the License.
  */
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-beta.1';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-beta.2';
 // Version of Java
 export const JAVA_VERSION = '17';
 export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM
-export const NODE_VERSION = '18.16.0';
-export const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
+export const NODE_VERSION = '18.16.1';
+export const OPENAPI_GENERATOR_CLI_VERSION = '2.6.0';
 export const javaDependencies = {
     /**
      * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
      */
-    'spring-boot': '3.0.7',
+    'spring-boot': '3.1.1',
     /*
      * hibernate version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to hibernate-jpamodelgen annotation processor.
      */
+    // TODO update to spring-boot provided version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
     hibernate: '6.1.7.Final',
     /*
      * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to java-driver-mapper-processor annotation processor.
      */
     cassandra: '4.15.0',
-    /**
-     * TODO drop once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-     */
-    'r2dbc-mariadb': '1.1.2',
 };
 Object.freeze(javaDependencies);
 // The version should be coherent with the one from spring-data-elasticsearch project
-export const ELATICSEARCH_TAG = '8.5.3';
-export const ELATICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
+export const ELASTICSEARCH_TAG = '8.7.1';
+export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 /**
  * Manually updated docker containers
  */
 export const dockerContainers = {
-    elasticsearchTag: ELATICSEARCH_TAG,
-    elasticsearchImage: ELATICSEARCH_IMAGE,
-    elasticsearch: `${ELATICSEARCH_IMAGE}:${ELATICSEARCH_TAG}`,
+    elasticsearchTag: ELASTICSEARCH_TAG,
+    elasticsearchImage: ELASTICSEARCH_IMAGE,
+    elasticsearch: `${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_TAG}`,
 };
 Object.freeze(dockerContainers);
 // Kubernetes versions
@@ -75,7 +72,7 @@ export const HELM_GRAFANA = '^4.0.0';
 export const HELM_MYSQL = '^1.4.0';
 export const HELM_MARIADB = '^6.12.2';
 export const HELM_POSTGRESQL = '^6.5.3';
-export const HELM_MOGODB_REPLICASET = '^3.10.1';
+export const HELM_MONGODB_REPLICASET = '^3.10.1';
 export const HELM_COUCHBASE_OPERATOR = '^2.2.1';
 // all constants used throughout all generators
 export const LOGIN_REGEX = '^(?>[a-zA-Z0-9!$&*+=?^_`{|}~.-]+@[a-zA-Z0-9-]+(?:\\\\.[a-zA-Z0-9-]+)*)|(?>[_.@A-Za-z0-9-]+)$';

package/dist/generators/gradle/constants.mjs

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

package/dist/generators/heroku/generator.mjs

@@ -398,13 +398,13 @@ export default class HerokuGenerator extends BaseGenerator {
                         }
                         else {
                             this.abort = true;
+                            this.herokuAppName = null;
                             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 {
@@ -659,7 +659,47 @@ export default class HerokuGenerator extends BaseGenerator {
                         }
                         this.log.log(chalk.bold('\nConfiguring Heroku'));
                         await execCmd(`heroku config:set ${configVars}--app ${this.herokuAppName}`);
-                        await execCmd(`heroku buildpacks:add ${buildpack} --app ${this.herokuAppName}`);
+                        const { stdout: data } = await execCmd(`heroku buildpacks:add ${buildpack} --app ${this.herokuAppName}`);
+                        if (data) {
+                            this.logger.info(data);
+                            // remote:  !     The following add-ons were automatically provisioned: . These add-ons may incur additional cost,
+                            // which is prorated to the second. Run `heroku addons` for more info.
+                            if (data.includes('Run `heroku addons` for more info.')) {
+                                await execCmd('heroku addons');
+                            }
+                            this.log('');
+                            const prompts = [
+                                {
+                                    type: 'list',
+                                    name: 'userDeployDecision',
+                                    message: 'Continue to deploy?',
+                                    choices: [
+                                        {
+                                            value: 'Yes',
+                                            name: 'Yes, I confirm',
+                                        },
+                                        {
+                                            value: 'No',
+                                            name: 'No, abort (Recommended)',
+                                        },
+                                    ],
+                                    default: 0,
+                                },
+                            ];
+                            this.log('');
+                            const props = await this.prompt(prompts);
+                            if (props.userDeployDecision === 'Yes') {
+                                this.log.info(chalk.bold('Continuing deployment...'));
+                            }
+                            else {
+                                this.log(this.logger);
+                                this.log.info(chalk.bold('You aborted deployment!'));
+                                this.abort = true;
+                                this.herokuAppName = null;
+                                return;
+                            }
+                            this.log('');
+                        }
                         this.log.log(chalk.bold('\nDeploying application'));
                         const herokuPush = execCmd('git push heroku HEAD:main', { maxBuffer: 1024 * 10000 });
                         herokuPush.child.stdout.on('data', data => {

package/dist/generators/init/constants.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const NODE_VERSION = '14.18.1';
 export const SKIP_COMMIT_HOOK = 'skipCommitHook';
 export const SKIP_COMMIT_HOOK_DESCRIPTION = 'Skip adding husky commit hooks';
 export const SKIP_COMMIT_HOOK_DEFAULT_VALUE = false;

package/dist/generators/init/generator.mjs

@@ -19,9 +19,10 @@
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_INIT, GENERATOR_GIT, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
 import { defaultConfig } from './config.mjs';
-import { NODE_VERSION, SKIP_COMMIT_HOOK } from './constants.mjs';
+import { SKIP_COMMIT_HOOK } from './constants.mjs';
 import { files, commitHooksFiles } from './files.mjs';
 import command from './command.mjs';
+import { packageJson } from '../../lib/index.mjs';
 /**
  * @class
  * @extends {BaseApplicationGenerator<import('../base-application/types.mjs').BaseApplication>}
@@ -47,7 +48,7 @@ export default class InitGenerator extends BaseApplicationGenerator {
         return this.asLoadingTaskGroup({
             loadConfig({ application }) {
                 const config = { ...defaultConfig, ...this.config.getAll() };
-                application.nodeVersion = NODE_VERSION;
+                application.applicationNodeEngine = packageJson.engines.node;
                 application[SKIP_COMMIT_HOOK] = config[SKIP_COMMIT_HOOK];
             },
             loadNodeDependencies({ application }) {

package/dist/generators/init/templates/package.json.ejs

@@ -32,7 +32,7 @@
     "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
   },
   "engines": {
-    "node": ">=<%= nodeVersion %>"
+    "node": "<%= applicationNodeEngine %>"
   },
   "scripts": {
     "prettier:check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",

package/dist/generators/jdl/generator.mjs

@@ -203,11 +203,11 @@ export default class JdlGenerator extends BaseGenerator {
                     }
                 }
                 else if (this.applications.length === 1) {
-                    this.log.debug('Generating 1 application');
+                    this.log.info('Generating 1 application');
                     await this.composeWithJHipster(GENERATOR_APP, { generatorOptions });
                 }
                 else {
-                    this.log.debug(`Generating ${this.applications.length}applications`);
+                    this.log.info(`Generating ${this.applications.length} applications`);
                     await this.composeWithJHipster(GENERATOR_WORKSPACES, {
                         generatorOptions: {
                             workspacesFolders: this.applications.map(app => app.folder),
@@ -224,19 +224,26 @@ export default class JdlGenerator extends BaseGenerator {
     get end() {
         return this.asEndTaskGroup({
             async generateDeployments() {
-                if (!this.ignoreDeployments && this.exportedDeployments && this.exportedDeployments.length > 0) {
-                    for (const deployment of this.exportedDeployments) {
-                        const deploymentConfig = deployment[GENERATOR_JHIPSTER];
-                        const deploymentType = deploymentConfig.deploymentType;
-                        this.log.debug(`Generating deployment: ${JSON.stringify(deploymentConfig, null, 2)}`);
-                        await this.composeWithJHipster(deploymentType, {
-                            generatorOptions: {
-                                destinationRoot: this.destinationPath(deploymentType),
-                                force: true,
-                                skipPrompts: true,
-                            },
-                        });
-                    }
+                if (!this.exportedDeployments || this.exportedDeployments.length === 0) {
+                    this.log.info('No deployment configured');
+                    return;
+                }
+                if (this.ignoreDeployments) {
+                    this.log.info(`Ignoring ${this.exportedDeployments.length} deployments`);
+                    return;
+                }
+                this.log.info(`Generating ${this.exportedDeployments.length} deployments`);
+                for (const deployment of this.exportedDeployments) {
+                    const deploymentConfig = deployment[GENERATOR_JHIPSTER];
+                    const deploymentType = deploymentConfig.deploymentType;
+                    this.log.debug(`Generating deployment: ${JSON.stringify(deploymentConfig, null, 2)}`);
+                    await this.composeWithJHipster(deploymentType, {
+                        generatorOptions: {
+                            destinationRoot: this.destinationPath(deploymentType),
+                            force: true,
+                            skipPrompts: true,
+                        },
+                    });
                 }
             },
         });

package/dist/generators/kubernetes/kubernetes-base.mjs

@@ -22,7 +22,7 @@ import shelljs from 'shelljs';
 import crypto from 'crypto';
 import { defaultKubernetesConfig } from './kubernetes-constants.mjs';
 import { loadFromYoRc } from '../base-docker/docker-base.mjs';
-import { KUBERNETES_CORE_API_VERSION, KUBERNETES_BATCH_API_VERSION, KUBERNETES_DEPLOYMENT_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, KUBERNETES_INGRESS_API_VERSION, KUBERNETES_ISTIO_NETWORKING_API_VERSION, KUBERNETES_RBAC_API_VERSION, HELM_KAFKA, HELM_ELASTICSEARCH, HELM_PROMETHEUS, HELM_GRAFANA, HELM_MARIADB, HELM_MYSQL, HELM_POSTGRESQL, HELM_MOGODB_REPLICASET, HELM_COUCHBASE_OPERATOR, } from '../generator-constants.mjs';
+import { KUBERNETES_CORE_API_VERSION, KUBERNETES_BATCH_API_VERSION, KUBERNETES_DEPLOYMENT_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, KUBERNETES_INGRESS_API_VERSION, KUBERNETES_ISTIO_NETWORKING_API_VERSION, KUBERNETES_RBAC_API_VERSION, HELM_KAFKA, HELM_ELASTICSEARCH, HELM_PROMETHEUS, HELM_GRAFANA, HELM_MARIADB, HELM_MYSQL, HELM_POSTGRESQL, HELM_MONGODB_REPLICASET, HELM_COUCHBASE_OPERATOR, } from '../generator-constants.mjs';
 import { applicationTypes, kubernetesPlatformTypes } from '../../jdl/jhipster/index.mjs';
 const { MICROSERVICE } = applicationTypes;
 const { GeneratorTypes, IngressTypes, ServiceTypes } = kubernetesPlatformTypes;
@@ -112,7 +112,7 @@ export function setupHelmConstants() {
     this.HELM_MARIADB = HELM_MARIADB;
     this.HELM_MYSQL = HELM_MYSQL;
     this.HELM_POSTGRESQL = HELM_POSTGRESQL;
-    this.HELM_MOGODB_REPLICASET = HELM_MOGODB_REPLICASET;
+    this.HELM_MONGODB_REPLICASET = HELM_MONGODB_REPLICASET;
     this.HELM_COUCHBASE_OPERATOR = HELM_COUCHBASE_OPERATOR;
 }
 export default {

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

@@ -166,10 +166,8 @@ spec:
   <%_ } _%>
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
-        - name: SPRING_DATA_MONGODB_DATABASE
-          value: <%= app.baseName %>
         - name: SPRING_DATA_MONGODB_URI
-          value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (app.reactive) { %>/?waitQueueMultiple=1000<% } %><% if (i < (app.dbPeerCount-1)) { %>,<% }} %>"
+          value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %><% if (app.reactive) { %>?waitQueueMultiple=1000<% } %>"
 <%_ } _%>
 <%_ if (app.databaseTypeNeo4j) { _%>
         - name: SPRING_NEO4J_URI

package/dist/generators/kubernetes-helm/templates/app/Chart.yml.ejs

@@ -33,7 +33,7 @@ dependencies:
   condition: mariadb.enabled
 <%_ } else if (app.databaseTypeMongodb) { _%>
 - name: mongodb-replicaset
-  version: <%= HELM_MOGODB_REPLICASET %>
+  version: <%= HELM_MONGODB_REPLICASET %>
   repository: https://charts.helm.sh/stable
   condition: mongodb.enabled
 <%_ } else if (app.databaseTypeCouchbase) { _%>

package/dist/generators/kubernetes-helm/templates/app/requirements.yml.ejs

@@ -16,7 +16,7 @@ dependencies:
     condition: mariadb.enabled
 <%_ } else if (app.databaseTypeMongodb) { _%>
   - name: mongodb-replicaset
-    version: <%= HELM_MOGODB_REPLICASET %>
+    version: <%= HELM_MONGODB_REPLICASET %>
     repository: https://charts.helm.sh/stable
     condition: mongodb.enabled
 <%_ } else if (app.databaseTypeCouchbase) { _%>

package/dist/generators/kubernetes-knative/templates/service.yml.ejs

@@ -106,10 +106,8 @@ spec:
                   key: postgresql-password
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
-            - name: SPRING_DATA_MONGODB_DATABASE
-              value: <%= app.baseName %>
             - name: SPRING_DATA_MONGODB_URI
-              value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (app.reactive) { %>/?waitQueueMultiple=1000<% } %><% if (i < (app.dbPeerCount-1)) { %>,<% }} %>"
+              value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %><% if (app.reactive) { %>?waitQueueMultiple=1000<% } %>"
 <%_ } _%>
 <%_ if (app.databaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING

package/dist/generators/languages/templates/entity/i18n/entity_ja.json.ejs

@@ -22,20 +22,20 @@ let helpBlocks = 0; %>
         "<%= entityTranslationKey %>" : {
             "home": {
                 "title": "<%= entityClassPlural %>",
-                "refreshListLabel": "Refresh list",
+                "refreshListLabel": "リストの更新",
 <%_ if (!readOnly) { _%>
-                "createLabel": "<%= entityClassHumanized %> を追加",
-                "createOrEditLabel": "<%= entityClassHumanized %>を追加または編集",
+                "createLabel": "<%= entityClassHumanized %> の作成",
+                "createOrEditLabel": "<%= entityClassHumanized %>の作成または編集",
 <%_ } _%>
 <%_ if (searchEngineAny) { _%>
-                "search": "Search for <%= entityClassHumanized %>",
+                "search": "<%= entityClassHumanized %> の検索",
 <%_ } _%>
-                "notFound": "No <%= entityClassPluralHumanized %> found"
+                "notFound": "<%= entityClassPluralHumanized %> が見つかりません。"
             },
 <%_ if (!microserviceAppName && !readOnly) { _%>
-            "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}",
-            "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}",
-            "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}",
+            "created": "新しい <%= entityClassHumanized %> がID {{ param }} で作成されました。",
+            "updated": "ID {{ param }} の <%= entityClassHumanized %> が更新されました。",
+            "deleted": "ID {{ param }} の <%= entityClassHumanized %> が削除されました。",
 <%_ } _%>
 <%_ if (!readOnly) { _%>
             "delete": {
@@ -60,9 +60,9 @@ let helpBlocks = 0; %>
 <%_ if (microserviceAppName && !readOnly) { _%>,
     "<%= microserviceAppName %>": {
         "<%= entityTranslationKey %>" : {
-            "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}",
-            "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}",
-            "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}"
+            "created": "新しい <%= entityClassHumanized %> がID {{ param }} で作成されました。",
+            "updated": "ID {{ param }} の <%= entityClassHumanized %> が更新されました。",
+            "deleted": "ID {{ param }} の <%= entityClassHumanized %> が削除されました。"
         }
     }
 <%_ } _%>

package/dist/generators/languages/templates/src/main/resources/i18n/messages_ja.properties.ejs

@@ -26,16 +26,16 @@ error.message=メッセージ:
 # Activation email
 email.activation.title=<%= baseName %> のアカウントアクティベート
 email.activation.greeting={0} 様
-email.activation.text1=あなたの <%= baseName %> アカウントが作成されました。以下のURLをクリックしてアクティベートしてください:
-email.activation.text2=宜しくお願いいたします。
+email.activation.text1=あなたの <%= baseName %> アカウントが作成されました。以下のURLをクリックしてアクティベートしてください。
+email.activation.text2=よろしくお願いいたします。
 email.signature=<%= baseName %> チームより
 
 # Creation email
-email.creation.text1=Your <%= baseName %> account has been created, please click on the URL below to access it:
+email.creation.text1=あなたの <%= baseName %> アカウントが作成されました。以下のURLをクリックしてアクセスしてください。
 
 # Reset email
-email.reset.title=<%= baseName %> password reset
-email.reset.greeting=Dear {0}
-email.reset.text1=For your <%= baseName %> account a password reset was requested, please click on the URL below to reset it:
-email.reset.text2=Regards,
+email.reset.title=<%= baseName %> のパスワードリセット
+email.reset.greeting={0} 様
+email.reset.text1=あなたの <%= baseName %> アカウントでパスワードのリセットが要求されました。リセットするには以下のURLをクリックしてください。
+email.reset.text2=よろしくお願いいたします。
 <%_ } _%>

package/dist/generators/languages/templates/src/main/webapp/i18n/ja/error.json

@@ -2,13 +2,13 @@
     "error": {
         "title": "エラーページ!",
         "http": {
-            "400": "Bad request.",
+            "400": "不正なリクエストです。",
             "403": "このページヘのアクセスは許可されていません。",
             "404": "ページが存在しません。",
-            "405": "The HTTP verb you used is not supported for this URL.",
-            "500": "Internal server error."
+            "405": "使用したHTTPメソッドはこのURLでは許可されていません。",
+            "500": "サーバ内部エラーです。"
         },
-        "concurrencyFailure": "Another user modified this data at the same time as you. Your changes were rejected.",
-        "validation": "Validation error on the server."
+        "concurrencyFailure": "他のユーザがあなたと同時にこのデータを変更しました。あなたの変更は拒否されました。",
+        "validation": "サーバで検証エラーが発生しました。"
     }
 }

package/dist/generators/languages/templates/src/main/webapp/i18n/ja/gateway.json

@@ -1,15 +1,15 @@
 {
     "gateway": {
-        "title": "Gateway",
+        "title": "ゲートウェイ",
         "routes": {
-            "title": "Current routes",
+            "title": "現在のルート",
             "url": "URL",
-            "service": "service",
-            "servers": "Available servers",
-            "error": "Warning: no server available!"
+            "service": "サービス",
+            "servers": "使用可能なサーバ",
+            "error": "警告:使用可能なサーバがありません!"
         },
         "refresh": {
-            "button": "Refresh"
+            "button": "リフレッシュ"
         }
     }
 }