Merge branch 'jhipster:main' into main

mshima · Jul 26, 2024 · 574818d · 574818d
2 parents 5b691d6 + b4aa54a
commit 574818d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 26 deletions.
diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml
@@ -40,16 +40,16 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
         with:
           platforms: arm64
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.5.0
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.2.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -59,7 +59,7 @@ jobs:
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
         if: ${{env.DOCKERHUB_USERNAME != '' && startsWith(github.ref, 'refs/tags/v')}}
-        uses: docker/login-action@v3.2.0
+        uses: docker/login-action@v3.3.0
         id: login-hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -72,7 +72,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.4.1
+        uses: docker/build-push-action@v6.5.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
-    "husky": "9.1.1",
+    "husky": "9.1.2",
     "lint-staged": "15.2.7"
   }
 }
diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile
@@ -40,10 +40,10 @@ FROM memcached:1.6.29-alpine
 
 FROM redis:7.2.5
 
-FROM confluentinc/cp-kafka:7.6.2
+FROM confluentinc/cp-kafka:7.7.0
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.6.2
+FROM confluentinc/cp-zookeeper:7.7.0
 LABEL ALIAS=zookeeper
 
 FROM apachepulsar/pulsar:3.2.3
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:11.1.0
+FROM grafana/grafana:11.1.1
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ typesafe = { module = 'com.typesafe:config', version = '1.4.3' }
 # hazelcast
 hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.2.0' }
 
-hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.4.0' }
+hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.5.0' }
 
 # memcached
 xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemcached-provider', version = '4.1.3' }

diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json
@@ -59,13 +59,13 @@
     "ts-loader": "9.5.1",
     "typescript": "5.5.4",
     "typescript-eslint": "7.17.0",
-    "vite": "5.3.4",
+    "vite": "5.3.5",
     "vite-plugin-static-copy": "1.0.6",
     "vitest": "2.0.4",
     "vitest-sonar-reporter": "2.0.0",
     "vue-loader": "17.4.2",
     "vue-style-loader": "4.1.3",
-    "vue-tsc": "2.0.28",
+    "vue-tsc": "2.0.29",
     "webpack": "5.93.0",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-cli": "5.1.4",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -177,10 +177,10 @@
   "devDependencies": {
     "@actions/core": "1.10.1",
     "@node-loaders/esbuildx": "1.4.0",
-    "@types/chai": "4.3.11",
+    "@types/chai": "4.3.16",
     "@types/node": "20.11.25",
     "@types/sinon-chai": "3.2.12",
-    "chai": "4.4.1",
+    "chai": "4.5.0",
     "cpy-cli": "5.0.0",
     "ejs-lint": "2.0.0",
     "eslint-config-prettier": "9.1.0",