Skip to content

Commit

Permalink
Merge branch 'jhipster:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima authored Aug 19, 2024
2 parents 4f2d8af + e9fc638 commit fddd85d
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-publish-github-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.1
uses: docker/build-push-action@v6.7.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion generators/server/resources/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-da

gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.5.2' }

gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.7.0' }
gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.8.0' }
6 changes: 3 additions & 3 deletions generators/server/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
<maven-failsafe-plugin.version>3.4.0</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<maven-site-plugin.version>3.20.0</maven-site-plugin.version>
<maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
Expand Down
2 changes: 1 addition & 1 deletion generators/vue/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rxjs": "7.8.1",
"sockjs-client": "1.6.1",
"vue": "3.4.38",
"vue-i18n": "9.13.1",
"vue-i18n": "9.14.0",
"vue-router": "4.4.3"
},
"devDependencies": {
Expand Down
143 changes: 128 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"latest-version": "9.0.0",
"lodash-es": "4.17.21",
"mem-fs": "4.1.0",
"mem-fs-editor": "11.0.1",
"mem-fs-editor": "11.1.1",
"minimatch": "9.0.5",
"normalize-path": "3.0.0",
"os-locale": "6.0.2",
Expand All @@ -167,7 +167,7 @@
"semver": "7.6.3",
"simple-git": "3.25.0",
"sort-keys": "5.0.0",
"type-fest": "4.24.0",
"type-fest": "4.25.0",
"typescript": "5.4.5",
"typescript-eslint": "8.1.0",
"winston": "3.14.2",
Expand Down

0 comments on commit fddd85d

Please sign in to comment.