Merge branch 'jhipster:main' into main

mshima · Oct 16, 2023 · ec3f8a6 · ec3f8a6
2 parents 634473a + e409970
commit ec3f8a6
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 121 deletions.
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.1
       - name: 'SETUP: load npm cache'
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -28,9 +28,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@b69b346013879cedbf50c69f572cd85439a41936
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          ascending: true
           stale-issue-label: 'area: stale'
           stale-issue-message: |
             This issue is stale because it has been open for too long without any activity.

diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json
@@ -43,7 +43,7 @@
     "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
     "typescript": "5.1.6",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-bundle-analyzer": "4.9.1",
     "webpack-merge": "5.9.0",
     "webpack-notifier": "1.15.0"

diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json
@@ -3,7 +3,7 @@
     "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.3",
+    "@cypress/code-coverage": "3.12.4",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
     "cypress": "13.3.1",

diff --git a/generators/generate-blueprint/templates/vitest.config.ts.ejs b/generators/generate-blueprint/templates/vitest.config.ts.ejs
@@ -3,7 +3,7 @@ import { defineConfig, defaultExclude } from 'vitest/config';
 export default defineConfig({
   test: {
     threads: false,
-    hookTimeout: 15000,
+    hookTimeout: 20000,
     exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
   },
 });
diff --git a/generators/generator-constants.mts b/generators/generator-constants.mts
@@ -26,7 +26,7 @@ export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 
 // Version of Node, NPM
-export const NODE_VERSION = '18.17.1';
+export const NODE_VERSION = '18.18.1';
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 
 export const javaDependencies: Record<string, string> = {

diff --git a/...java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs b/...java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs
@@ -343,7 +343,7 @@ _%>
             return false;
         }
 <%_ if (!embedded) { _%>
-        return <%= primaryKey.name %> != null && <%= primaryKey.name %>.equals(((<%= persistClass %>) o).<%= primaryKey.name %>);
+        return get<%= primaryKey.nameCapitalized %>() != null && get<%= primaryKey.nameCapitalized %>().equals(((<%= persistClass %>) o).get<%= primaryKey.nameCapitalized %>());
 <%_ } else { _%>
         return false;
 <%_ } _%>

diff --git a/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties b/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json
@@ -78,7 +78,7 @@
     "ts-jest": "29.1.1",
     "ts-loader": "9.5.0",
     "typescript": "5.2.2",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.9.0",

diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json
@@ -12,7 +12,7 @@
     "bootswatch": "5.3.2",
     "deepmerge": "4.3.1",
     "js-cookie": "3.0.5",
-    "pinia": "2.1.6",
+    "pinia": "2.1.7",
     "vue": "3.3.4",
     "vue-i18n": "9.5.0",
     "vue-router": "4.2.5"
@@ -61,7 +61,7 @@
     "vue-loader": "17.3.0",
     "vue-style-loader": "4.1.3",
     "vue-tsc": "1.8.19",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-bundle-analyzer": "4.9.1",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",