Merge remote-tracking branch 'upstream/main' into angular-esbuild

jhipster · Dec 2, 2024 · d71bbe9 · d71bbe9
2 parents 3f4d47d + e3c235e
commit d71bbe9
Show file tree

Hide file tree

Showing 25 changed files with 203 additions and 114 deletions.
diff --git a/.blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap b/.blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap
@@ -106,6 +106,45 @@ exports[`generator - github-build-matrix with angular should match matrix value
       "jhipster-bom-branch": "main",
       "jhipster-bom-cicd-version": "0.0.0-CICD"
     },
+    {
+      "job-name": "ng-couchbase (n[1]/j[0])",
+      "sample": "ng-couchbase",
+      "os": "ubuntu-latest",
+      "node-version": "[1]",
+      "java-version": "[0]",
+      "npm-version": "NPM-VERSION",
+      "default-environment": "prod",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "skip-backend-tests": "false",
+      "skip-frontend-tests": "false",
+      "name": "ng-couchbase",
+      "app-sample": "ng-couchbase",
+      "entity": "couchbase",
+      "workspaces": "false",
+      "build-jhipster-bom": true,
+      "jhipster-bom-branch": "main",
+      "jhipster-bom-cicd-version": "0.0.0-CICD"
+    },
+    {
+      "job-name": "ng-gradle-couchbase-search (n[0]/j[1])",
+      "sample": "ng-gradle-couchbase-search",
+      "os": "ubuntu-latest",
+      "node-version": "[0]",
+      "java-version": "[1]",
+      "npm-version": "NPM-VERSION",
+      "default-environment": "prod",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "skip-backend-tests": "false",
+      "skip-frontend-tests": "false",
+      "gradle-cache": true,
+      "name": "ng-gradle-couchbase-search",
+      "app-sample": "ng-gradle-couchbase-search",
+      "entity": "couchbase",
+      "workspaces": "false",
+      "build-jhipster-bom": true,
+      "jhipster-bom-branch": "main",
+      "jhipster-bom-cicd-version": "0.0.0-CICD"
+    },
     {
       "job-name": "ng-gradle-fr (n[2]/j[3])",
       "sample": "ng-gradle-fr",
@@ -272,6 +311,25 @@ exports[`generator - github-build-matrix with angular should match matrix value
       "jhipster-bom-branch": "main",
       "jhipster-bom-cicd-version": "0.0.0-CICD"
     },
+    {
+      "job-name": "ng-webflux-couchbase (n[1]/j[3])",
+      "sample": "ng-webflux-couchbase",
+      "os": "ubuntu-latest",
+      "node-version": "[1]",
+      "java-version": "[3]",
+      "npm-version": "NPM-VERSION",
+      "default-environment": "prod",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "skip-backend-tests": "false",
+      "skip-frontend-tests": "false",
+      "name": "ng-webflux-couchbase",
+      "app-sample": "webflux-couchbase",
+      "entity": "couchbase",
+      "workspaces": "false",
+      "build-jhipster-bom": true,
+      "jhipster-bom-branch": "main",
+      "jhipster-bom-cicd-version": "0.0.0-CICD"
+    },
     {
       "job-name": "ms-ng-oauth2-mongodb-caffeine (n[1]/j[1])",
       "sample": "ms-ng-oauth2-mongodb-caffeine",
@@ -922,6 +980,29 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
       "jhipster-bom-branch": "main",
       "jhipster-bom-cicd-version": "0.0.0-CICD"
     },
+    {
+      "job-name": "ms-vue-eureka-jwt-couchbase-hazelcast (n[0]/j[0])",
+      "sample": "ms-vue-eureka-jwt-couchbase-hazelcast",
+      "os": "ubuntu-latest",
+      "node-version": "[0]",
+      "java-version": "[0]",
+      "npm-version": "NPM-VERSION",
+      "default-environment": "prod",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "skip-backend-tests": "false",
+      "skip-frontend-tests": "false",
+      "gradle-cache": true,
+      "name": "ms-vue-eureka-jwt-couchbase-hazelcast",
+      "jdl-samples": "ms-vue-eureka-jwt-couchbase-hazelcast",
+      "generatorOptions": {
+        "workspaces": true,
+        "monorepository": true
+      },
+      "workspaces": "true",
+      "build-jhipster-bom": true,
+      "jhipster-bom-branch": "main",
+      "jhipster-bom-cicd-version": "0.0.0-CICD"
+    },
     {
       "job-name": "ms-mf-vue-consul-oauth2-mysql-memcached (n[2]/j[2])",
       "sample": "ms-mf-vue-consul-oauth2-mysql-memcached",

diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml
@@ -74,7 +74,7 @@ jobs:
           images: ghcr.io/${{ github.repository }}${{ (steps.login-hub.outcome == 'success' && ',jhipster/jhipster') || ''}}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.10.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json
@@ -25,7 +25,7 @@
     "@angular-builders/custom-webpack": "18.0.0",
     "@angular-builders/jest": "18.0.0",
     "@angular/cli": "18.2.12",
-    "@eslint/js": "9.15.0",
+    "@eslint/js": "9.16.0",
     "@types/jest": "29.5.14",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
@@ -35,12 +35,12 @@
     "buffer": "6.0.3",
     "copy-webpack-plugin": "12.0.2",
     "deepmerge": "4.3.1",
-    "eslint": "9.15.0",
+    "eslint": "9.16.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
-    "globals": "15.12.0",
+    "globals": "15.13.0",
     "globby": "14.0.2",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.10",

diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json
@@ -3,7 +3,7 @@
     "dayjs": "1.11.13"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.13.7",
+    "@cypress/code-coverage": "3.13.8",
     "babel-loader": "9.2.1",
     "babel-plugin-istanbul": "7.0.0",
     "cypress": "13.16.0",

diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap
@@ -1092,12 +1092,10 @@ jhipster:
       - BUCKET=mscouchbase
     healthcheck:
       test:
-        - CMD
-        - curl
-        - -f
-        - http://localhost:8091/ui/index.html
+        - CMD-SHELL
+        - curl -f "http://localhost:8091/ui/index.html" && sleep 20
       interval: 5s
-      timeout: 5s
+      timeout: 25s
       retries: 10
   
   msmariadb:
@@ -1832,12 +1830,10 @@ jhipster:
       - BUCKET=mscouchbase
     healthcheck:
       test:
-        - CMD
-        - curl
-        - -f
-        - http://localhost:8091/ui/index.html
+        - CMD-SHELL
+        - curl -f "http://localhost:8091/ui/index.html" && sleep 20
       interval: 5s
-      timeout: 5s
+      timeout: 25s
       retries: 10
   
   msmariadb:

diff --git a/generators/docker/templates/docker/couchbase.yml.ejs b/generators/docker/templates/docker/couchbase.yml.ejs
@@ -34,9 +34,9 @@ services:
     environment:
       - BUCKET=<%= baseName %>
     healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:8091/ui/index.html']
+      test: ['CMD-SHELL', 'curl -f "http://localhost:8091/ui/index.html" && sleep 20']
       interval: 5s
-      timeout: 5s
+      timeout: 25s
       retries: 10
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName.toLowerCase() %>/couchbase/:/opt/couchbase/var
diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.15.0",
-    "globals": "15.12.0",
-    "vitest": "2.1.6"
+    "eslint": "9.16.0",
+    "globals": "15.13.0",
+    "vitest": "2.1.7"
   }
 }
diff --git a/generators/languages/prompts.ts b/generators/languages/prompts.ts
@@ -54,6 +54,7 @@ export async function askForLanguages(this: LanguagesGenerator, { control }) {
   const currentLanguages = this.jhipsterConfig.languages ?? [];
   const answers = await this.prompt([
     {
+      when: this.jhipsterConfigWithDefaults.enableTranslation,
       type: 'checkbox',
       name: 'languages',
       message: 'Please choose additional languages to install',
@@ -67,9 +68,11 @@ export async function askForLanguages(this: LanguagesGenerator, { control }) {
       default: () => this.jhipsterConfigWithDefaults.languages,
     },
   ]);
-  if (control.existingProject) {
-    this.languagesToApply.push(...answers.languages.filter(newLang => !currentLanguages.includes(newLang)));
-  } else {
-    this.languagesToApply.push(...answers.languages);
+  if (answers.languages) {
+    if (control.existingProject) {
+      this.languagesToApply.push(...answers.languages.filter(newLang => !currentLanguages.includes(newLang)));
+    } else {
+      this.languagesToApply.push(...answers.languages);
+    }
   }
 }
diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json
@@ -3,7 +3,7 @@
     "@fortawesome/fontawesome-svg-core": "6.7.1",
     "@fortawesome/free-solid-svg-icons": "6.7.1",
     "@fortawesome/react-fontawesome": "0.2.2",
-    "@reduxjs/toolkit": "2.3.0",
+    "@reduxjs/toolkit": "2.4.0",
     "axios": "1.7.8",
     "bootstrap": "5.3.3",
     "bootswatch": "5.3.3",
@@ -29,9 +29,9 @@
     "webstomp-client": "1.2.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.15.0",
-    "@module-federation/enhanced": "0.7.7",
-    "@module-federation/utilities": "3.1.30",
+    "@eslint/js": "9.16.0",
+    "@module-federation/enhanced": "0.8.0",
+    "@module-federation/utilities": "3.1.31",
     "@testing-library/react": "16.0.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.13",
@@ -49,7 +49,7 @@
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.15.0",
+    "eslint": "9.16.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.37.2",

diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile
@@ -40,10 +40,10 @@ FROM memcached:1.6.32-alpine
 
 FROM redis:7.4.1
 
-FROM confluentinc/cp-kafka:7.7.1
+FROM confluentinc/cp-kafka:7.7.2
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.7.1
+FROM confluentinc/cp-zookeeper:7.7.2
 LABEL ALIAS=zookeeper
 
 FROM apachepulsar/pulsar:4.0.0
@@ -55,7 +55,7 @@ LABEL ALIAS=sonar
 FROM docker.io/bitnami/consul:1.20.1
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v3.0.0
+FROM prom/prometheus:v3.0.1
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.27.0

diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.20.1' }
 
 mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.5.0' }
 
-neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.13.4' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.14.1' }
 
 # Cassandra
 lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
@@ -30,7 +30,7 @@ node-gradle = { id = 'com.github.node-gradle.node', version = '7.1.0' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.1' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '6.0.0.5145' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '6.0.1.5171' }
 
 spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 

diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml
@@ -18,7 +18,7 @@
         <picocli.version>4.7.6</picocli.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.20.1</checkstyle.version>
+        <checkstyle.version>10.20.2</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.11.0</gatling-maven-plugin.version>

diff --git a/generators/spring-boot/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs
@@ -264,10 +264,15 @@ task cleanResources(type: Delete) {
     delete "build/resources"
 }
 
-<%_ if (embeddableLaunchScript) { _%>
+<%_ if ( embeddableLaunchScript || databaseTypeCouchbase ) { _%>
 
 bootJar {
+<%_ if ( databaseTypeCouchbase ) { _%>
+    loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC
+<%_ } _%>
+<%_ if ( embeddableLaunchScript ) { _%>
     launchScript()
+<%_ } _%>
 }
 <%_ } _%>
 

diff --git a/generators/spring-boot/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs
@@ -528,6 +528,9 @@
                     </executions>
                     <configuration>
                         <mainClass>${start-class}</mainClass>
+<%_ if (databaseTypeCouchbase) { _%>
+                        <loaderImplementation>CLASSIC</loaderImplementation>
+<%_ } _%>
 <%_ if (embeddableLaunchScript) { _%>
                         <executable>true</executable>
 <%_ } _%>

diff --git a/...pring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/...pring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs
@@ -54,6 +54,9 @@ import org.slf4j.LoggerFactory;
 <%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 import org.springframework.cache.CacheManager;
+<%_ if (databaseTypeCouchbase) { _%>
+import org.springframework.cache.annotation.CacheEvict;
+<%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
@@ -573,6 +576,9 @@ public class UserService {
             .map(<%= user.adminUserDto %>::new);
     }
 
+    <%_ if (databaseTypeCouchbase && cacheProviderAny) { _%>
+    @CacheEvict(cacheNames =  UserRepository.USERS_BY_LOGIN_CACHE, key = "#login")
+    <%_ } _%>
     <%_ if (reactive) { _%>
       <%_ if (databaseTypeSql) { _%>
     @Transactional