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 committed Sep 11, 2023
2 parents ebe2033 + 638adda commit e52725f
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
workflow-vue: ${{ steps.build.outputs.workflow-vue }}
steps:
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: 'Build matrix'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
working-directory: ${{ github.workspace }}/app
steps:
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
- name: 'SETUP: environment'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copyright-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
timeout-minutes: 40
steps:
# Checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/depsreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
if: ${{ github.repository == 'jhipster/generator-jhipster' }}
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
4 changes: 2 additions & 2 deletions .github/workflows/devserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
matrix: ${{ steps.build.outputs.matrix }}
steps:
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: 'Build matrix'
Expand All @@ -65,7 +65,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-publish-github-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/[email protected]
Expand Down 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@v4.1.1
uses: docker/build-push-action@v4.2.1
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
- name: 'SETUP: environment'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generator-generate-blueprint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18.17.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ jobs:
github.event.action != 'closed' &&
!contains(github.event.pull_request.user.login, 'dependabot')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
2 changes: 1 addition & 1 deletion .github/workflows/issue-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock-maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
node-version: 18
- run: npm install -g npm@latest
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: ~/.npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
workflow-vue: ${{ steps.build.outputs.workflow-vue }}
steps:
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: 'Build matrix'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/vue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
workflow-vue: ${{ steps.build.outputs.workflow-vue }}
steps:
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: 'Build matrix'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
# Install all tools and check configuration
#----------------------------------------------------------------------
- name: 'SETUP: Checkout generator-jhipster'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: generator-jhipster
fetch-depth: 2
Expand Down
4 changes: 2 additions & 2 deletions generators/angular/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@angular-eslint/eslint-plugin": "16.1.2",
"@angular/cli": "16.2.1",
"@types/jest": "29.5.4",
"@types/node": "18.17.14",
"@types/node": "18.17.15",
"@typescript-eslint/eslint-plugin": "6.6.0",
"browser-sync": "2.29.3",
"browser-sync-webpack-plugin": "2.3.0",
"buffer": "6.0.3",
"copy-webpack-plugin": "11.0.0",
"eslint": "8.48.0",
"eslint": "8.49.0",
"eslint-config-prettier": "9.0.0",
"eslint-webpack-plugin": "4.0.1",
"folder-hash": "4.0.4",
Expand Down
2 changes: 1 addition & 1 deletion generators/common/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"concurrently": "8.2.1",
"husky": "8.0.3",
"lint-staged": "14.0.1",
"npm": "10.0.0",
"npm": "10.1.0",
"wait-on": "7.0.1"
}
}
4 changes: 2 additions & 2 deletions generators/react/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@testing-library/react": "14.0.0",
"@types/jest": "29.5.4",
"@types/lodash": "4.14.198",
"@types/node": "18.17.14",
"@types/node": "18.17.15",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/react-redux": "7.1.26",
Expand All @@ -46,7 +46,7 @@
"cross-env": "7.0.3",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"eslint": "8.48.0",
"eslint": "8.49.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-react": "7.33.2",
"eslint-webpack-plugin": "4.0.1",
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 @@ -13,6 +13,6 @@ gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plu

gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.14.1' }

common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.1' }
common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.2' }

gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.5' }
2 changes: 1 addition & 1 deletion generators/server/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-enforcer-plugin.version>3.4.0</maven-enforcer-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
Expand Down
6 changes: 3 additions & 3 deletions generators/vue/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@pinia/testing": "0.1.3",
"@rushstack/eslint-patch": "1.3.3",
"@types/node": "18.17.14",
"@types/node": "18.17.15",
"@types/sinon": "10.0.16",
"@vitejs/plugin-vue": "4.3.4",
"@vue/eslint-config-prettier": "8.0.0",
Expand All @@ -31,7 +31,7 @@
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"eslint": "8.48.0",
"eslint": "8.49.0",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-vue": "8.7.1",
"folder-hash": "4.0.4",
Expand All @@ -50,7 +50,7 @@
"terser-webpack-plugin": "5.3.9",
"ts-loader": "9.4.4",
"typescript": "5.2.2",
"vitest": "0.34.3",
"vitest": "0.34.4",
"vitest-sonar-reporter": "0.4.1",
"vue-loader": "17.2.2",
"vue-style-loader": "4.1.3",
Expand Down

0 comments on commit e52725f

Please sign in to comment.