bump generator-jhipster to v8.1.0

hide212131 · Dec 12, 2023 · 2b596fb · 2b596fb
1 parent 58bafb4
commit 2b596fb
Show file tree

Hide file tree

Showing 6 changed files with 651 additions and 567 deletions.
diff --git a/generators/ci-cd/__snapshots__/generator.spec.js.snap b/generators/ci-cd/__snapshots__/generator.spec.js.snap
@@ -14,7 +14,7 @@ jobs:
   pipeline:
     name: jhipster native pipeline
     runs-on: \${{ matrix.os }}
-    if: \\"!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')\\"
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')"
     timeout-minutes: 90
     env:
       SPRING_OUTPUT_ANSI_ENABLED: DETECT
@@ -68,7 +68,7 @@ jobs:
           HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask docker
           sudo /Applications/Docker.app/Contents/MacOS/Docker --unattended --install-privileged-components
           open -a /Applications/Docker.app --args --unattended --accept-license
-          #echo \\"We are waiting for Docker to be up and running. It can take over 2 minutes...\\"
+          #echo "We are waiting for Docker to be up and running. It can take over 2 minutes..."
           #while ! /Applications/Docker.app/Contents/Resources/bin/docker info &>/dev/null; do sleep 1; done
         if: runner.os == 'macOS'
 
@@ -97,7 +97,7 @@ jobs:
       - name: Install node.js packages
         run: npm install
       - name: 'E2E: Package'
-        run: npm run native-package -- \\"-Dnative-build-args=\${{ matrix.native-build-args }}\\"
+        run: npm run native-package -- "-Dnative-build-args=\${{ matrix.native-build-args }}"
       - name: 'E2E: Prepare'
         if: matrix.e2e != false
         run: npm run ci:e2e:prepare
@@ -168,7 +168,7 @@ jobs:
 
       - uses: actions/checkout@v3
       - id: executable
-        run: echo \\"name=jhipster-\${{ runner.os }}-\${{ github.event.release.tag_name || 'snapshot' }}-x86_64\\" >> $GITHUB_OUTPUT
+        run: echo "name=jhipster-\${{ runner.os }}-\${{ github.event.release.tag_name || 'snapshot' }}-x86_64" >> $GITHUB_OUTPUT
       - uses: actions/setup-node@v3
         with:
           node-version: 18.18.2
@@ -192,7 +192,7 @@ jobs:
           key: \${{ runner.os }}-npm-\${{ hashFiles('**/package-lock.json') }}
       - run: npm install
       - name: Build \${{ steps.executable.outputs.name }} native image
-        run: npm run native-package -- \\"-Dnative-image-name=\${{ steps.executable.outputs.name }}\\" \\"-Dnative-build-args=\${{ matrix.native-build-args }}\\"
+        run: npm run native-package -- "-Dnative-image-name=\${{ steps.executable.outputs.name }}" "-Dnative-build-args=\${{ matrix.native-build-args }}"
       - name: Archive binary
         uses: actions/upload-artifact@v3
         with:

diff --git a/generators/server/__snapshots__/generator.spec.js.snap b/generators/server/__snapshots__/generator.spec.js.snap
@@ -356,13 +356,13 @@ exports[`SubGenerator server of native JHipster blueprint > run > should succeed
   "src/main/resources/config/liquibase/master.xml": {
     "stateCleared": "modified",
   },
-  "src/main/resources/i18n/messages.properties": {
+  "src/main/resources/config/tls/keystore.p12": {
     "stateCleared": "modified",
   },
-  "src/main/resources/i18n/messages_en.properties": {
+  "src/main/resources/i18n/messages.properties": {
     "stateCleared": "modified",
   },
-  "src/main/resources/i18n/messages_fr.properties": {
+  "src/main/resources/i18n/messages_en.properties": {
     "stateCleared": "modified",
   },
   "src/main/resources/logback-spring.xml": {
@@ -425,51 +425,6 @@ exports[`SubGenerator server of native JHipster blueprint > run > should succeed
   "src/main/webapp/i18n/en/user-management.json": {
     "stateCleared": "modified",
   },
-  "src/main/webapp/i18n/fr/activate.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/configuration.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/error.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/global.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/health.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/home.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/login.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/logs.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/metrics.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/password.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/register.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/reset.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/sessions.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/settings.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/webapp/i18n/fr/user-management.json": {
-    "stateCleared": "modified",
-  },
   "src/test/java/com/mycompany/myapp/IntegrationTest.java": {
     "stateCleared": "modified",
   },
@@ -584,9 +539,6 @@ exports[`SubGenerator server of native JHipster blueprint > run > should succeed
   "src/test/resources/i18n/messages_en.properties": {
     "stateCleared": "modified",
   },
-  "src/test/resources/i18n/messages_fr.properties": {
-    "stateCleared": "modified",
-  },
   "src/test/resources/junit-platform.properties": {
     "stateCleared": "modified",
   },

diff --git a/generators/server/generator.js b/generators/server/generator.js
@@ -477,14 +477,6 @@ class `,
               .replaceAll(
                 `@PathVariable ${entity.primaryKey.type} ${entity.primaryKey.name}`,
                 `@PathVariable("${entity.primaryKey.name}") ${entity.primaryKey.type} ${entity.primaryKey.name}`,
-              )
-              .replaceAll(
-                `@RequestParam(required = false, defaultValue = "false") boolean eagerload`,
-                `@RequestParam(name = "eagerload", required = false, defaultValue = "false") boolean eagerload`,
-              )
-              .replaceAll(
-                `@RequestParam(required = false, defaultValue = "true") boolean eagerload`,
-                `@RequestParam(name = "eagerload", required = false, defaultValue = "true") boolean eagerload`,
               ),
           );