Merge branch 'jhipster:main' into main

.github/workflows/issue-check.yml

@@ -38,11 +38,11 @@ jobs:
     steps:
       - uses: mshick/[email protected]
         with:
-          issue: ${{ inputs.issue || github.event.issue.id }}
+          issue: ${{ inputs.issue || github.event.issue.number }}
           message: |
             JHipster is [checking sample](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
   application:
-    name: Check issue ${{ inputs.issue || github.event.issue.id }}
+    name: Check issue ${{ inputs.issue || github.event.issue.number }}
     needs: comment
     runs-on: 'ubuntu-20.04'
     defaults:
@@ -100,7 +100,7 @@ jobs:
         run: $JHI_SCRIPTS/10-install-jhipster.sh
       - name: 'GENERATION: project'
         id: project
-        run: jhipster from-issue ${{ inputs.issue || github.event.issue.id }} --no-code-workspace
+        run: jhipster from-issue ${{ inputs.issue || github.event.issue.number }} --no-code-workspace
       - name: 'GENERATION: jhipster info'
         run: $JHI_SCRIPTS/14-jhipster-info.sh
       #----------------------------------------------------------------------
@@ -133,16 +133,16 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always() && steps.backend.outcome == 'failure'
         with:
-          name: log-${{ inputs.issue || github.event.issue.id }}
+          name: log-${{ inputs.issue || github.event.issue.number }}
           path: ${{ steps.setup.outputs.application-path }}/**/test-results/**/*.xml
       - name: 'E2E: Store failure screenshots'
         uses: actions/upload-artifact@v3
         if: always() && steps.e2e.outcome == 'failure'
         with:
-          name: screenshots-${{ inputs.issue || github.event.issue.id }}
+          name: screenshots-${{ inputs.issue || github.event.issue.number }}
           path: ${{ steps.setup.outputs.application-path }}/**/cypress/screenshots
       - name: Dump docker logs
-        if: success() || failure()
+        if: always()
         uses: jwalton/gh-docker-logs@v2
     outputs:
       yo-rc: ${{ steps.project.outputs.yo-rc }}
@@ -154,13 +154,26 @@ jobs:
   result-comment:
     runs-on: ubuntu-latest
     needs: application
-    if: always()
+    if: success() || failure()
     permissions:
       issues: write
     steps:
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const issue = { owner: context.issue.owner, repo: context.issue.repo, issue_number: context.issue.number }
+            github.rest.issues.listLabelsOnIssue({...issue}).then(response => {
+              const labels = response.data
+              for (const label of labels) {
+                  if (label.name == 'area: check') {
+                      github.rest.issues.removeLabel({...issue, name: label.name})
+                  }
+              }
+            })
       - uses: mshick/[email protected]
         with:
-          issue: ${{ inputs.issue || github.event.issue.id }}
+          issue: ${{ inputs.issue || github.event.issue.number }}
           message: |
             JHipster has completed the [sample check](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
             `.yo-rc.json`: ${{ needs.application.outputs.yo-rc }}

generators/angular/resources/package.json

@@ -23,13 +23,13 @@
     "@angular-eslint/eslint-plugin": "16.1.1",
     "@angular/cli": "16.2.0",
     "@types/jest": "29.5.4",
-    "@types/node": "18.17.11",
+    "@types/node": "18.17.12",
     "@typescript-eslint/eslint-plugin": "6.4.1",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.47.0",
+    "eslint": "8.48.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",

generators/react/resources/package.json

@@ -4,7 +4,7 @@
     "@fortawesome/free-solid-svg-icons": "6.4.2",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@reduxjs/toolkit": "1.9.5",
-    "axios": "1.4.0",
+    "axios": "1.5.0",
     "bootstrap": "5.3.1",
     "bootswatch": "5.3.1",
     "lodash": "4.17.21",
@@ -30,7 +30,7 @@
     "@testing-library/react": "14.0.0",
     "@types/jest": "29.5.4",
     "@types/lodash": "4.14.197",
-    "@types/node": "18.17.11",
+    "@types/node": "18.17.12",
     "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",
     "@types/react-redux": "7.1.26",
@@ -46,7 +46,7 @@
     "cross-env": "7.0.3",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.47.0",
+    "eslint": "8.48.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-react": "7.33.2",
     "eslint-webpack-plugin": "4.0.1",

generators/server/resources/Dockerfile

@@ -40,10 +40,10 @@ FROM memcached:1.6.21-alpine
 
 FROM redis:7.2.0
 
-FROM confluentinc/cp-kafka:7.4.1
+FROM confluentinc/cp-kafka:7.5.0
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.4.1
+FROM confluentinc/cp-zookeeper:7.5.0
 LABEL ALIAS=zookeeper
 
 FROM apachepulsar/pulsar:3.0.1

generators/server/resources/pom.xml

@@ -22,13 +22,13 @@
         <liquibase.version>4.23.1</liquibase.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <micrometer-context-propagation.version>1.0.5</micrometer-context-propagation.version>
-        <picocli.version>4.7.4</picocli.version>
+        <picocli.version>4.7.5</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
         <typesafe.version>1.4.2</typesafe.version>
         <validation-api.version>3.0.2</validation-api.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.12.2</checkstyle.version>
+        <checkstyle.version>10.12.3</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.13.4</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.5.0</gatling-maven-plugin.version>

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

@@ -194,9 +194,9 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     public <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findByCriteria(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
         log.debug("Request to get all <%= entityClassPlural %> by Criteria");
     <%_ if (paginationNo) { _%>
-        return <%= entityInstance %>Repository.findByCriteria(criteria, null);
+        return <%= entityInstance %>Repository.findByCriteria(criteria, null)<% if (dtoMapstruct) { %>.map(<%= entityToDtoReference  %>)<% } %>;
     <%_ } else { _%>
-        return <%= entityInstance %>Repository.findByCriteria(criteria, pageable);
+        return <%= entityInstance %>Repository.findByCriteria(criteria, pageable)<% if (dtoMapstruct) { %>.map(<%= entityToDtoReference  %>)<% } %>;
     <%_ } _%>
     }
 

generators/server/templates/src/main/java/package/domain/User.java.ejs

@@ -134,7 +134,7 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ if (searchEngineElasticsearch) { _%>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "user")
 <%_ } _%>
-public class <%= user.persistClass %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable<% if (databaseTypeSql && reactive && requiresPersistableImplementation) { %>, Persistable<String><% } %> {
+public class <%= user.persistClass %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable<% if (databaseTypeSql && reactive && requiresPersistableImplementation) { %>, Persistable<<% if (user.primaryKey.hasUUID) { %>UUID<% } else { %>String<% } %>><% } %> {
 
     private static final long serialVersionUID = 1L;
 

generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs

@@ -288,7 +288,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
 }
 <%_ } else if (databaseTypeSql && reactive) { _%>
 @Repository
-public interface UserRepository extends R2dbcRepository<<%= user.persistClass %>, <% if (authenticationTypeOauth2) { %>String<% } else { %>Long<% } %>>, UserRepositoryInternal {
+public interface UserRepository extends R2dbcRepository<<%= user.persistClass %>, <% if (authenticationTypeOauth2) { %>String<% } else { %><%= user.primaryKey.type %><% } %>>, UserRepositoryInternal {
 
   <%_ if (!authenticationTypeOauth2) { _%>
     Mono<<%= user.persistClass %>> findOneByActivationKey(String activationKey);

generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs

@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.stream.Stream;
 <%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
+<%_ if (databaseTypeCassandra || user.primaryKey.hasUUID) { _%>
 
 import java.util.UUID;
 <%_ } _%>

generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/UserRowMapper_reactive.java.ejs

@@ -20,6 +20,9 @@ package <%= packageName %>.repository.rowmapper;
 
 
 import java.time.Instant;
+<%_ if (user.primaryKey.hasUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
 import java.util.function.BiFunction;
 
 import org.springframework.stereotype.Service;

generators/vue/resources/package.json

@@ -4,9 +4,9 @@
     "@fortawesome/free-solid-svg-icons": "6.4.2",
     "@fortawesome/vue-fontawesome": "3.0.3",
     "@vuelidate/core": "2.0.3",
-    "@vuelidate/validators": "2.0.3",
-    "@vueuse/core": "10.3.0",
-    "axios": "1.4.0",
+    "@vuelidate/validators": "2.0.4",
+    "@vueuse/core": "10.4.1",
+    "axios": "1.5.0",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",
     "bootswatch": "5.3.1",
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@pinia/testing": "0.1.3",
     "@rushstack/eslint-patch": "1.3.3",
-    "@types/node": "18.17.11",
+    "@types/node": "18.17.12",
     "@types/sinon": "10.0.16",
     "@vitejs/plugin-vue": "4.3.3",
     "@vue/eslint-config-prettier": "8.0.0",
@@ -31,7 +31,7 @@
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.47.0",
+    "eslint": "8.48.0",
     "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-vue": "8.7.1",
     "folder-hash": "4.0.4",
@@ -50,7 +50,7 @@
     "terser-webpack-plugin": "5.3.9",
     "ts-loader": "9.4.4",
     "typescript": "5.2.2",
-    "vitest": "0.34.2",
+    "vitest": "0.34.3",
     "vitest-sonar-reporter": "0.4.1",
     "vue-loader": "17.2.2",
     "vue-style-loader": "4.1.3",