generator-jhipster 7.2.0 → 7.3.0

package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= entityAbsolutePackage %>.service;
 
 <%_
 const serviceClassName = entityClass + 'QueryService';
@@ -44,16 +44,16 @@ import org.springframework.transaction.annotation.Transactional;
 
 import tech.jhipster.service.QueryService;
 
-import <%= packageName %>.domain.<%= persistClass %>;
-import <%= packageName %>.domain.*; // for static metamodels
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.*; // for static metamodels
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 
 /**

package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= entityAbsolutePackage %>.service;
 
 <%_
 const instanceType = restClass;
@@ -26,9 +26,9 @@ const listOrFlux = (reactive) ? 'Flux' : 'List';
 const pageOrFlux = (reactive) ? 'Flux' : 'Page';
 _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
 <%_ } else { _%>
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
 <%_ if (!paginationNo || relationshipsContainEagerLoad) { _%>
 
@@ -53,7 +53,7 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Service Interface for managing {@link <% if (dtoMapstruct) { %><%= packageName %>.domain.<% } %><%= persistClass %>}.
+ * Service Interface for managing {@link <% if (dtoMapstruct) { %><%= entityAbsolutePackage %>.domain.<% } %><%= persistClass %>}.
  */
 public interface <%= entityClass %>Service {
 

package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs

@@ -1,10 +1,10 @@
-package <%= packageName %>.service.criteria;
+package <%= entityAbsolutePackage %>.service.criteria;
 
 import java.io.Serializable;
 import java.util.Objects;
 import tech.jhipster.service.Criteria;
 <%_ for (const field of fields) { if (field.fieldIsEnum === true) { _%>
-import <%= packageName %>.domain.enumeration.<%= field.fieldType %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ } } _%>
 import tech.jhipster.service.filter.BooleanFilter;
 import tech.jhipster.service.filter.DoubleFilter;
@@ -68,8 +68,8 @@ filterVariables.push({ filterType : oauthAwareReferenceFilterType,
 });
 _%>
 /**
- * Criteria class for the {@link <%= packageName %>.domain.<%= persistClass %>} entity. This class is used
- * in {@link <%= packageName %>.web.rest.<%= entityClass %>Resource} to receive all the possible filtering options from
+ * Criteria class for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity. This class is used
+ * in {@link <%= entityAbsolutePackage %>.web.rest.<%= entityClass %>Resource} to receive all the possible filtering options from
  * the Http GET request parameters.
  * For example the following could be a valid request:
  * {@code /<%= entityApiUrl %>?id.greaterThan=5&attr1.contains=something&attr2.specified=false}

package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.dto;
+package <%= entityAbsolutePackage %>.service.dto;
 
 import java.util.Objects;
 <%_ if (typeof javadoc !== 'undefined') { _%>
@@ -57,11 +57,11 @@ import java.util.UUID;
 import javax.persistence.Lob;
 <%_ } _%>
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 
 /**
- * A DTO for the {@link <%= packageName %>.domain.<%= persistClass %>} entity.
+ * A DTO for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity.
  */
 <%_ if (typeof javadoc !== 'undefined') { _%>
 @ApiModel(description = "<%- formatAsApiDescription(javadoc) %>")

package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service<% if (serviceImpl) { %>.impl<% } %>;
+package <%= entityAbsolutePackage %>.service<% if (serviceImpl) { %>.impl<% } %>;
 
 <%_
 const serviceClassName = serviceImpl ? entityClass + 'ServiceImpl' : entityClass + 'Service';
@@ -34,19 +34,19 @@ const searchRepository = entityInstance  + 'SearchRepository';
 
 _%>
 <%_ if (serviceImpl) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } _%>
-import <%= packageName %>.domain.<%= persistClass %>;
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (isUsingMapsId === true) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 import org.mapstruct.BeanMapping;
 import org.mapstruct.MappingTarget;

package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 <%_
 let existingMappings = [];
@@ -38,8 +38,8 @@ _%>
 import java.util.Set;
 <%_ } _%>
 
-import <%= packageName %>.domain.*;
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.domain.*;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
 
 import org.mapstruct.*;
 <%_ if (uuidMapMethod) { _%>

package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.web.rest;
+package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
 const viaService = !serviceNo;
@@ -30,32 +30,32 @@ for (const relationship of relationships) {
 }
 _%>
 <%_ if (!dtoMapstruct || serviceNo) { _%>
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (!serviceNo) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } else { _%>
   <%_ if (isUsingMapsId === true) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
   <%_ } _%>
 <%_ } _%>
 <%_ if (saveUserSnapshot) { _%>
-import <%= packageName %>.repository.UserRepository;
+import <%= entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
 import <%= packageName %>.web.rest.errors.BadRequestAlertException;
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
   <%_ if (serviceNo) { _%>
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
   <%_ } _%>
 <%_ } _%>
 <%_ if (jpaMetamodelFiltering) {  _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
-import <%= packageName %>.service.<%= entityClass %>QueryService;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>QueryService;
 <%_ } _%>
 
 import tech.jhipster.web.util.HeaderUtil;
@@ -134,7 +134,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 <%_ } _%>
 
 /**
- * REST controller for managing {@link <%= packageName %>.domain.<%= persistClass %>}.
+ * REST controller for managing {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>}.
  */
 @RestController
 @RequestMapping("/api")

package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.domain;
+package <%= entityAbsolutePackage %>.domain;
 
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;

package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
+package <%= entityAbsolutePackage %>.repository.search;
 
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Configuration;

package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.dto;
+package <%= entityAbsolutePackage %>.service.dto;
 
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;

package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.web.rest;
+package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
 
@@ -57,11 +57,14 @@ if (databaseTypeSql && !reactive) {
 }
 
 _%>
+<%_ if (entityAbsolutePackage !== packageName) { _%>
+import <%= packageName %>.web.rest.TestUtil;
+<% } %>
 <%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_
 var imported = [];
 for (relationship of relationships) { // import entities in required relationships
@@ -70,34 +73,34 @@ for (relationship of relationships) { // import entities in required relationshi
   const isUsingMapsIdL1 = relationship.id;
   if (imported.indexOf(otherEntityNameCapitalized) === -1) {
     if ((relationshipValidate !== null && relationshipValidate === true) || jpaMetamodelFiltering || (isUsingMapsIdL1 === true)) { _%>
-import <%= packageName %>.domain.<%= asEntity(otherEntityNameCapitalized) %>;
+import <%= entityAbsolutePackage %>.domain.<%= asEntity(otherEntityNameCapitalized) %>;
 <%_
           imported.push(otherEntityNameCapitalized);
     }
   }
 } _%>
 <%_ if (saveUserSnapshot) { _%>
-import <%= packageName %>.repository.UserRepository;
+import <%= entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= entityAbsolutePackage %>.service.EntityManager;
 <%_ } _%>
 <%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo)) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
 <%_ if (!serviceNo && fieldsContainOwnerManyToMany) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 <%_ if (jpaMetamodelFiltering) { _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
 <%_ } _%>
 
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -216,7 +219,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 <%_ for (const field of fields.filter(field => !field.transient)) {
   if (field.fieldIsEnum) { _%>
-import <%= packageName %>.domain.enumeration.<%= field.fieldType %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ }
 } _%>
 /**
@@ -447,9 +450,9 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 <%_ } if (searchEngineElasticsearch) { _%>
 
     /**
-     * This repository is mocked in the <%= packageName %>.repository.search test package.
+     * This repository is mocked in the <%= entityAbsolutePackage %>.repository.search test package.
      *
-     * @see <%= packageName %>.repository.search.<%= entityClass %>SearchRepositoryMockConfiguration
+     * @see <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepositoryMockConfiguration
      */
     @Autowired
     private <%= entityClass %>SearchRepository mock<%= entityClass %>SearchRepository;

package/generators/generator-base.js

@@ -2738,6 +2738,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     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;
 
@@ -2762,10 +2767,12 @@ 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}`;
     }
   }
 

package/generators/generator-constants.js

@@ -33,10 +33,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.3.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.4';
-const LIQUIBASE_VERSION = '4.4.3';
+const SPRING_BOOT_VERSION = '2.5.5';
+const LIQUIBASE_VERSION = '4.5.0';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
 const HIBERNATE_VERSION = '5.4.32.Final';
 
@@ -46,7 +46,8 @@ 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';
@@ -60,7 +61,7 @@ const DOCKER_NEO4J = 'neo4j:4.2.11';
 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_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}`;

package/generators/heroku/index.js

@@ -244,6 +244,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,20 +255,14 @@ 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;
+          }
         });
       },
     };
@@ -300,7 +295,6 @@ module.exports = class extends BaseBlueprintGenerator {
           herokuJavaVersion: this.herokuJavaVersion,
           useOkta: this.useOkta,
           oktaAdminLogin: this.oktaAdminLogin,
-          oktaAdminPassword: this.oktaAdminPassword,
         });
       },
     };
@@ -391,7 +385,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 +452,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 {
@@ -779,7 +777,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 +848,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!'));

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/kubernetes-helm/templates/app/Chart.yml.ejs

@@ -15,3 +15,25 @@ sources:
 maintainers:
 - name: Team JHipster
   email:
+dependencies:
+<%_ if (app.prodDatabaseTypeMysql) { _%>
+- name: mysql
+  version: <%= HELM_MYSQL %>
+  repository: https://charts.helm.sh/stable
+  condition: mysql.enabled
+<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+- name: postgresql
+  version: <%= HELM_POSTGRESQL %>
+  repository: https://charts.bitnami.com/bitnami
+  condition: postgresql.enabled
+<%_ } else if (app.prodDatabaseTypeMariadb) { _%>
+- name: mariadb
+  version: <%= HELM_MARIADB %>
+  repository: https://charts.bitnami.com/bitnami
+  condition: mariadb.enabled
+<%_ } else if (app.prodDatabaseTypeMongodb) { _%>
+- name: mongodb-replicaset
+  version: <%= HELM_MOGODB_REPLICASET %>
+  repository: https://charts.helm.sh/stable
+  condition: mongodb.enabled
+<%_ } _%>

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

@@ -7,12 +7,12 @@ dependencies:
 <%_ } else if (app.prodDatabaseTypePostgres) { _%>
   - name: postgresql
     version: <%= HELM_POSTGRESQL %>
-    repository: https://charts.helm.sh/stable
+    repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
 <%_ } else if (app.prodDatabaseTypeMariadb) { _%>
   - name: mariadb
     version: <%= HELM_MARIADB %>
-    repository: https://charts.helm.sh/stable
+    repository: https://charts.bitnami.com/bitnami
     condition: mariadb.enabled
 <%_ } else if (app.prodDatabaseTypeMongodb) { _%>
   - name: mongodb-replicaset

package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs

@@ -15,3 +15,20 @@ sources:
 maintainers:
 - name: Team JHipster
   email:
+dependencies:
+<%_ if (useKafka) { _%>
+- name: kafka
+  version: <%= HELM_KAFKA %>
+  repository: https://charts.helm.sh/incubator
+  condition: kafka.enabled
+<%_ } _%>
+<%_ if (monitoringPrometheus) { _%>
+- name: prometheus-community
+  version: <%= HELM_PROMETHEUS %>
+  repository: https://prometheus-community.github.io/helm-charts
+  condition: prometheus.enabled
+- name: grafana
+  version: <%= HELM_GRAFANA %>
+  repository: https://grafana.github.io/helm-charts
+  condition: prometheus.enabled
+<%_ } _%>

package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs

@@ -6,12 +6,12 @@ dependencies:
     condition: kafka.enabled
 <%_ } _%>
 <%_ if (monitoringPrometheus) { _%>
-  - name: prometheus
+  - name: prometheus-community
     version: <%= HELM_PROMETHEUS %>
-    repository: https://charts.helm.sh/stable
+    repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus.enabled
   - name: grafana
     version: <%= HELM_GRAFANA %>
-    repository: https://charts.helm.sh/stable
+    repository: https://grafana.github.io/helm-charts
     condition: prometheus.enabled
 <%_ } _%>

package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs

@@ -25,7 +25,7 @@
             },
             "messages": {
                 "info": "Unesite adresu e-pošte koju ste koristili kod registracije",
-                "success": "Provjerite svoju e-poštu radi detalja o tome kako resetirati zaporku.",
+                "success": "Provjerite svoju e-poštu radi detalja o tome kako resetirati zaporku."
             }
         },
         "finish": {
@@ -41,5 +41,4 @@
             }
         }
     }
-
 }

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

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar