Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into spring-boot-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima committed Jan 27, 2025
2 parents c6cefa4 + 35893a1 commit 2d8fd52
Show file tree
Hide file tree
Showing 304 changed files with 6,176 additions and 6,088 deletions.
2 changes: 1 addition & 1 deletion .blueprint/cli/commands.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013-2024 the original author or authors from the JHipster project.
* Copyright 2013-2025 the original author or authors from the JHipster project.
*
* This file is part of the JHipster project, see https://www.jhipster.tech/
* for more information.
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/generate-sample/command.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013-2024 the original author or authors from the JHipster project.
* Copyright 2013-2025 the original author or authors from the JHipster project.
*
* This file is part of the JHipster project, see https://www.jhipster.tech/
* for more information.
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/synchronize/command.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013-2024 the original author or authors from the JHipster project.
* Copyright 2013-2025 the original author or authors from the JHipster project.
*
* This file is part of the JHipster project, see https://www.jhipster.tech/
* for more information.
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/synchronize/generator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013-2024 the original author or authors from the JHipster project.
* Copyright 2013-2025 the original author or authors from the JHipster project.
*
* This file is part of the JHipster project, see https://www.jhipster.tech/
* for more information.
Expand Down
2 changes: 1 addition & 1 deletion .blueprint/synchronize/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013-2024 the original author or authors from the JHipster project.
* Copyright 2013-2025 the original author or authors from the JHipster project.
*
* This file is part of the JHipster project, see https://www.jhipster.tech/
* for more information.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

## KHipster Version(s)

- [] Checking this box is mandatory (this is just to show you read everything)
- [] Checking this box is mandatory (this is just to show you read everything)
2 changes: 1 addition & 1 deletion .github/actions/build-matrix/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2013-2024 the original author or authors from the JHipster project.
# Copyright 2013-2025 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/compare-base/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2013-2024 the original author or authors from the JHipster project.
# Copyright 2013-2025 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/compare/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2013-2024 the original author or authors from the JHipster project.
# Copyright 2013-2025 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/generate/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2013-2024 the original author or authors from the JHipster project.
# Copyright 2013-2025 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2013-2024 the original author or authors from the JHipster project.
# Copyright 2013-2025 the original author or authors from the JHipster project.
#
# This file is part of the JHipster project, see https://www.jhipster.tech/
# for more information.
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ Desktop.ini
######################
# Code coverage
######################
/coverage/
/.nyc_output/
coverage/
.nyc_output/

.blueprint/**/*.png
# added by generate-blueprint:
generators/**/package-lock.json
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install lint-staged
lint-staged
2 changes: 1 addition & 1 deletion .lintstagedrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
'{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'],
'{,**/}*.{md,json,yml,js,cjs,mjs,ts,cts,mts}': ['prettier --write'],
};
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"written": true
}
},
"jhipsterVersion": "8.5.0",
"jhipsterVersion": "8.8.0",
"localBlueprint": false,
"packageJsonType": "module",
"prettierTabWidth": 4,
Expand Down
5 changes: 3 additions & 2 deletions .yo-resolve
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
generators/*.*
.blueprint/cli/commands.mjs
.blueprint/generate-sample/**
.github/workflows/generator.yml
.prettierrc.yml skip
cli/cli.cjs skip
README.md skip
Loading

0 comments on commit 2d8fd52

Please sign in to comment.