generator-jhipster 6.10.4 → 6.10.5

package/README.md

@@ -12,7 +12,7 @@ Please read our [guidelines](/CONTRIBUTING.md#submitting-an-issue) before submit
 
 ## Contributing
 
-We are honoured by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/master/CONTRIBUTING.md) for any information about contributing to the project.
+We are honoured by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) for any information about contributing to the project.
 
 ## Sponsors
 
@@ -37,7 +37,7 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
       </td>
       <td align="center" valign="middle">
         <a href="https://dev.entando.org/jhipster" target="_blank">
-          <img width="200em" src="https://www.jhipster.tech/images/open-collective/Entando_E.png">
+          <img width="200em" src="https://www.jhipster.tech/images/open-collective/entandoe.png">
         </a>
       </td>
     </tr>
@@ -46,113 +46,16 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
 
 ### Bronze sponsors
 
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://forsyslab.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/forsyslab.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.cuba-platform.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/cubaplatform.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.codefirst.co.uk" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/codefirst.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://blokt.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/blokt.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://clay.global/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/clay.png">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://uxplanet.org/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/uxplanet.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://opencollective.com/top-web-design-agencies" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/top-web-design-agencies.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://fair-laan.se/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/fair-laan.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://superkredit.net" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/superkredit.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://matchbanker.pl/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/matchbanker.png">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://matchbanker.no/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/matchbanker.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.banksecrets.eu/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/banksecrets.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://writersperhour.com/urgent-essay-writing-service" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/writersperhour.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://www.minitool.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/minitool.png">
-        </a>
-      </td>
-      <td align="center" valign="middle">
-        <a href="https://unscramblex.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/unscramblex.png">
-        </a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle">
-        <a href="https://edubirdie.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/edubirdie.png">	
-        </a>
-      </td>
-      <td align="center" valign="middle">	
-        <a href="https://www.zadluzenia.com/" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/zadluzenia.png">	
-        </a>
-      </td>
-      <td align="center" valign="middle">	
-        <a href="https://opencollective.com/jim-van-dam" target="_blank">
-          <img width="50em" src="https://www.jhipster.tech/images/open-collective/jim-van-dam.png">	
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
+[![BronzeSponsors][bronze-sponsors-image]][bronze-sponsors-url]
+
+### Backers
 
 **Thank you to all our backers!**
 
 [![Backers][backers-image]][backers-url]
 
+<object data="https://opencollective.com/generator-jhipster/tiers/backer.svg?avatarHeight=40&width=890&button=false" type="image/svg+xml"></object>
+
 ## Azure Builds
 
 Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hipster-labs/jhipster-daily-builds)
@@ -169,14 +72,11 @@ Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hip
 | [![React Gradle NoSQL][github-react-gradle-nosql]][github-actions]     |
 | [![Elasticsearch][github-elasticsearch]][github-actions]               |
 | [![Monolith OAuth2][github-monolith-oauth2]][github-actions]           |
-| [![Yarn][github-yarn]][github-actions]                                 |
 | [![No Database][github-no-database]][github-actions]                   |
 | [![Microservices JWT][github-ms-jwt]][github-actions]                  |
 | [![Microservices OAuth2][github-ms-oauth2]][github-actions]            |
 | [![Microservices UAA][github-ms-uaa]][github-actions]                  |
 | [![Docker Image][github-docker-image]][github-actions]                 |
-| [![Neo4j][github-neo4j]][github-actions]                               |
-| [![Couchbase][github-couchbase]][github-actions]                       |
 | [![Official Windows][github-official-windows]][github-actions]         |
 
 ## Analysis of the sample JHipster project
@@ -195,32 +95,31 @@ Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hip
 [github-react-gradle-nosql]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/React%20Gradle%20NoSQL/badge.svg
 [github-elasticsearch]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Elasticsearch/badge.svg
 [github-monolith-oauth2]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Monolith%20OAuth2/badge.svg
-[github-yarn]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Yarn/badge.svg
 [github-no-database]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/No%20Database/badge.svg
 [github-ms-jwt]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Microservices%20JWT/badge.svg
 [github-ms-oauth2]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Microservices%20OAuth2/badge.svg
 [github-ms-uaa]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Microservices%20UAA/badge.svg
 [github-docker-image]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Docker%20Image/badge.svg
-[github-neo4j]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Neo4j/badge.svg
-[github-couchbase]: https://github.com/hipster-labs/jhipster-daily-builds/workflows/Couchbase/badge.svg
 [sonar-url]: https://sonarcloud.io/dashboard?id=jhipster-sample-application
 [sonar-quality-gate]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=alert_status
 [sonar-coverage]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=coverage
 [sonar-bugs]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=bugs
 [sonar-vulnerabilities]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=vulnerabilities
-[jhipster-image]: https://raw.githubusercontent.com/jhipster/jhipster-artwork/master/logos/JHipster%20RGB-small100x25px.png
+[jhipster-image]: https://raw.githubusercontent.com/jhipster/jhipster-artwork/main/logos/JHipster%20RGB-small100x25px.png
 [jhipster-url]: https://www.jhipster.tech/
 [npm-image]: https://badge.fury.io/js/generator-jhipster.svg
 [npm-url]: https://npmjs.org/package/generator-jhipster
-[azure-devops-image]: https://dev.azure.com/jhipster/generator-jhipster/_apis/build/status/jhipster.generator-jhipster?branchName=master
+[azure-devops-image]: https://dev.azure.com/jhipster/generator-jhipster/_apis/build/status/jhipster.generator-jhipster?branchName=main
 [azure-devops-url-main]: https://dev.azure.com/jhipster/generator-jhipster/_build
 [github-actions-generator-image]: https://github.com/jhipster/generator-jhipster/workflows/Generator/badge.svg
 [github-actions-angular-image]: https://github.com/jhipster/generator-jhipster/workflows/Angular/badge.svg
 [github-actions-react-image]: https://github.com/jhipster/generator-jhipster/workflows/React/badge.svg
 [github-actions-webflux-image]: https://github.com/jhipster/generator-jhipster/workflows/Webflux/badge.svg
 [github-actions-url]: https://github.com/jhipster/generator-jhipster/actions
-[backers-image]: https://opencollective.com/generator-jhipster/tiers/backer.svg?avatarHeight=40&width=890
+[backers-image]: https://opencollective.com/generator-jhipster/tiers/backer.svg?avatarHeight=70&width=890
 [backers-url]: https://opencollective.com/generator-jhipster
+[bronze-sponsors-image]: https://opencollective.com/generator-jhipster/tiers/bronze-sponsor.svg?avatarHeight=120&width=890
+[bronze-sponsors-url]: https://opencollective.com/generator-jhipster
 [issue-template]: https://github.com/jhipster/generator-jhipster/issues/new?template=BUG_REPORT.md
 [feature-template]: https://github.com/jhipster/generator-jhipster/issues/new?template=FEATURE_REQUEST.md
 [npmcharts-image]: https://img.shields.io/npm/dm/generator-jhipster.svg?label=Downloads&style=flat

package/cli/jdl.js

@@ -83,7 +83,7 @@ module.exports = (args, options = {}, env, forkProcess) => {
                 if (options.skipSampleRepository) {
                     return Promise.reject(new Error(`Could not find ${filename}, make sure the path is correct.`));
                 }
-                url = new URL(filename, 'https://raw.githubusercontent.com/jhipster/jdl-samples/master/').toString();
+                url = new URL(filename, 'https://raw.githubusercontent.com/jhipster/jdl-samples/main/').toString();
                 filename = path.basename(filename);
             }
             return downloadFile(url, filename);

package/generators/generator-constants.js

@@ -31,7 +31,7 @@ const GRADLE_VERSION = '6.5';
 const JIB_VERSION = '2.4.0';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '3.9.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '3.9.1';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
 const SPRING_BOOT_VERSION = '2.2.7.RELEASE';
 const LIQUIBASE_VERSION = '3.9.0';

package/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs

@@ -26,7 +26,9 @@ import org.springframework.beans.factory.annotation.Value;
 <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%>
 import org.springframework.dao.ConcurrencyFailureException;
 <%_ } _%>
+<%_ if (databaseType !== 'no') { _%>
 import org.springframework.dao.DataAccessException;
+<%_ } _%>
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageConversionException;
 <%_ if (reactive && databaseType === 'sql') { _%>
@@ -206,7 +208,7 @@ _%>
 
     @Override
     public ProblemBuilder prepare(final Throwable throwable, final StatusType status, final URI type) {
-        
+
         Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
 
         if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
@@ -221,7 +223,7 @@ _%>
                         .map(this::toProblem)
                         .orElse(null));
             }
-    
+            <%_ if (databaseType !== 'no') { _%>
             if (throwable instanceof DataAccessException) {
                 return Problem.builder()
                     .withType(type)
@@ -233,7 +235,7 @@ _%>
                         .map(this::toProblem)
                         .orElse(null));
             }
-    
+            <%_ } _%>
             if (containsPackageName(throwable.getMessage())) {
                 return Problem.builder()
                     .withType(type)
@@ -263,4 +265,4 @@ _%>
         // This list is for sure not complete
         return StringUtils.containsAny(message, "org.", "java.", "net.", "javax.", "com.", "io.", "de.", "<%= packageName %>");
     }
-}
+}

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs

@@ -35,7 +35,7 @@ import <%= packageName %>.service.UserService;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-<%_ if (databaseType === 'neo4j') { _%>
+<%_ if (databaseType === 'neo4j' || cacheProvider === 'redis') { _%>
 import org.junit.jupiter.api.extension.ExtendWith;
 <%_ } _%>
 import org.springframework.beans.factory.annotation.Autowired;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-jhipster",
-    "version": "6.10.4",
+    "version": "6.10.5",
     "description": "Spring Boot + Angular/React in one handy generator",
     "files": [
         "cli",