Skip to content

Commit

Permalink
automatic project update for v8.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Jun 24, 2024
1 parent ab5116f commit 8b2d343
Show file tree
Hide file tree
Showing 105 changed files with 309 additions and 329 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// maven and gradle wrappers are used by default, we don't need them installed globally
// "INSTALL_MAVEN": "true",
// "INSTALL_GRADLE": "false",
"NODE_VERSION": "20.14.0"
"NODE_VERSION": "20.15.0"
}
},

Expand Down
3 changes: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,5 @@ src/main/docker/
jest.conf.js
webpack/
target/
build/
node/
coverage/
postcss.config.js
target/classes/static/
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"entitySuffix": "",
"hibernateCache": "ehcache",
"jhiPrefix": "jhi",
"jhipsterVersion": "8.5.0",
"jhipsterVersion": "8.6.0",
"jwtSecretKey": "bXktc2VjcmV0LWtleS13aGljaC1zaG91bGQtYmUtY2hhbmdlZC1pbi1wcm9kdWN0aW9uLWFuZC1iZS1iYXNlNjQtZW5jb2RlZAo=",
"languages": ["en"],
"messageBroker": false,
Expand Down
43 changes: 20 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# jhipsterSampleApplication

This application was generated using JHipster 8.5.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.5.0](https://www.jhipster.tech/documentation-archive/v8.5.0).
This application was generated using JHipster 8.6.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.6.0](https://www.jhipster.tech/documentation-archive/v8.6.0).

## Project Structure

Expand All @@ -22,16 +22,13 @@ In the project root, JHipster generates configuration files for tools like git,

## Development

Before you can build this project, you must install and configure the following dependencies on your machine:
The build system will install automatically the recommended version of Node and npm.

1. [Node.js](https://nodejs.org/): We use Node to run a development web server and build the project.
Depending on your system, you can install Node either from source or as a pre-packaged bundle.

After installing Node, you should be able to run the following command to install development tools.
We provide a wrapper to launch npm.
You will only need to run this command when dependencies change in [package.json](package.json).

```
npm install
./npmw install
```

We use npm scripts and [Angular CLI][] with [Webpack][] as our build system.
Expand All @@ -41,14 +38,14 @@ auto-refreshes when files change on your hard drive.

```
./mvnw
npm start
./npmw start
```

Npm is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
specifying a newer version in [package.json](package.json). You can also run `npm update` and `npm install` to manage dependencies.
Add the `help` flag on any command to see how you can use it. For example, `npm help update`.
specifying a newer version in [package.json](package.json). You can also run `./npmw update` and `./npmw install` to manage dependencies.
Add the `help` flag on any command to see how you can use it. For example, `./npmw help update`.

The `npm run` command will list all of the scripts available to run for this project.
The `./npmw run` command will list all the scripts available to run for this project.

### PWA Support

Expand All @@ -65,13 +62,13 @@ ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command:

```
npm install --save --save-exact leaflet
./npmw install --save --save-exact leaflet
```

To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command:

```
npm install --save-dev --save-exact @types/leaflet
./npmw install --save-dev --save-exact @types/leaflet
```

Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
Expand Down Expand Up @@ -171,15 +168,15 @@ You can execute all Gatling tests with
Unit tests are run by [Jest][]. They're located in [src/test/javascript/](src/test/javascript/) and can be run with:

```
npm test
./npmw test
```

UI end-to-end tests are powered by [Cypress][]. They're located in [src/test/javascript/cypress](src/test/javascript/cypress)
and can be run by starting Spring Boot in one terminal (`./mvnw spring-boot:run`) and running the tests (`npm run e2e`) in a second one.
and can be run by starting Spring Boot in one terminal (`./mvnw spring-boot:run`) and running the tests (`./npmw run e2e`) in a second one.

#### Lighthouse audits

You can execute automated [lighthouse audits][https://developers.google.com/web/tools/lighthouse/] with [cypress audits][https://github.com/mfrachet/cypress-audit] by running `npm run e2e:cypress:audits`.
You can execute automated [Lighthouse audits](https://developers.google.com/web/tools/lighthouse/) with [cypress-audit](https://github.com/mfrachet/cypress-audit) by running `./npmw run e2e:cypress:audits`.
You should only run the audits when your application is packaged with the production profile.
The lighthouse report is created in `target/cypress/lhreport.html`

Expand Down Expand Up @@ -262,13 +259,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.

[JHipster Homepage and latest documentation]: https://www.jhipster.tech
[JHipster 8.5.0 archive]: https://www.jhipster.tech/documentation-archive/v8.5.0
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.5.0/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.5.0/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.5.0/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.5.0/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.5.0/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.5.0/setting-up-ci/
[JHipster 8.6.0 archive]: https://www.jhipster.tech/documentation-archive/v8.6.0
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.6.0/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.6.0/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.6.0/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.6.0/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.6.0/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.6.0/setting-up-ci/
[Node.js]: https://nodejs.org/
[NPM]: https://www.npmjs.com/
[Gatling]: https://gatling.io/
Expand Down
6 changes: 1 addition & 5 deletions npmw
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
#!/bin/sh

basedir=`dirname "$0"`
basedir=$(dirname "$0")

if [ -f "$basedir/mvnw" ]; then
bindir="$basedir/target/node"
repodir="$basedir/target/node/node_modules"
installCommand="$basedir/mvnw --batch-mode -ntp -Pwebapp frontend:install-node-and-npm@install-node-and-npm"

PATH="$basedir/$builddir/:$PATH"
NPM_EXE="$basedir/$builddir/node_modules/npm/bin/npm-cli.js"
NODE_EXE="$basedir/$builddir/node"
elif [ -f "$basedir/gradlew" ]; then
bindir="$basedir/build/node/bin"
repodir="$basedir/build/node/lib/node_modules"
Expand Down
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,83 +83,83 @@
"packaging": "jar"
},
"dependencies": {
"@angular/common": "17.3.9",
"@angular/compiler": "17.3.9",
"@angular/core": "17.3.9",
"@angular/forms": "17.3.9",
"@angular/localize": "17.3.9",
"@angular/platform-browser": "17.3.9",
"@angular/platform-browser-dynamic": "17.3.9",
"@angular/router": "17.3.9",
"@fortawesome/angular-fontawesome": "0.14.1",
"@angular/common": "18.0.4",
"@angular/compiler": "18.0.4",
"@angular/core": "18.0.4",
"@angular/forms": "18.0.4",
"@angular/localize": "18.0.4",
"@angular/platform-browser": "18.0.4",
"@angular/platform-browser-dynamic": "18.0.4",
"@angular/router": "18.0.4",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@ng-bootstrap/ng-bootstrap": "16.0.0",
"@ng-bootstrap/ng-bootstrap": "17.0.0",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.3",
"dayjs": "1.11.11",
"ngx-infinite-scroll": "17.0.0",
"ngx-infinite-scroll": "18.0.0",
"rxjs": "7.8.1",
"tslib": "2.6.2",
"zone.js": "0.14.6"
"tslib": "2.6.3",
"zone.js": "0.14.7"
},
"devDependencies": {
"@angular-builders/custom-webpack": "17.0.2",
"@angular-builders/jest": "17.0.3",
"@angular-devkit/build-angular": "17.3.7",
"@angular-eslint/eslint-plugin": "17.5.2",
"@angular/cli": "17.3.7",
"@angular/compiler-cli": "17.3.9",
"@angular/service-worker": "17.3.9",
"@angular-builders/custom-webpack": "18.0.0",
"@angular-builders/jest": "18.0.0",
"@angular-devkit/build-angular": "18.0.5",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular/cli": "18.0.5",
"@angular/compiler-cli": "18.0.4",
"@angular/service-worker": "18.0.4",
"@types/jest": "29.5.12",
"@types/node": "20.11.25",
"@typescript-eslint/eslint-plugin": "7.11.0",
"@typescript-eslint/parser": "7.11.0",
"@typescript-eslint/eslint-plugin": "7.13.1",
"@typescript-eslint/parser": "7.13.1",
"browser-sync": "3.0.2",
"browser-sync-webpack-plugin": "2.3.0",
"buffer": "6.0.3",
"concurrently": "8.2.2",
"copy-webpack-plugin": "12.0.2",
"cypress": "13.10.0",
"cypress": "13.12.0",
"cypress-audit": "1.1.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "3.3.0",
"eslint-webpack-plugin": "4.2.0",
"folder-hash": "4.0.4",
"generator-jhipster": "8.5.0",
"generator-jhipster": "8.6.0",
"husky": "9.0.11",
"jest": "29.7.0",
"jest-date-mock": "1.0.10",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "16.0.0",
"jest-preset-angular": "14.1.0",
"jest-preset-angular": "14.1.1",
"jest-sonar": "0.2.16",
"lighthouse": "12.0.0",
"lint-staged": "15.2.5",
"lighthouse": "12.1.0",
"lint-staged": "15.2.7",
"merge-jsons-webpack-plugin": "2.0.1",
"prettier": "3.2.5",
"prettier": "3.3.2",
"prettier-plugin-java": "2.6.0",
"prettier-plugin-packagejson": "2.5.0",
"rimraf": "5.0.7",
"swagger-ui-dist": "5.17.14",
"ts-jest": "29.1.4",
"ts-jest": "29.1.5",
"typescript": "5.4.5",
"wait-on": "7.2.0",
"webpack-bundle-analyzer": "4.10.2",
"webpack-merge": "5.10.0",
"webpack-notifier": "1.15.0"
},
"engines": {
"node": ">=20.14.0"
"node": ">=20.15.0"
},
"cacheDirectories": [
"node_modules"
],
"overrides": {
"browser-sync": "3.0.2",
"webpack": "5.91.0"
"webpack": "5.92.1"
}
}
59 changes: 16 additions & 43 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
Expand All @@ -24,7 +24,7 @@
-->
<maven.version>3.2.5</maven.version>
<java.version>17</java.version>
<node.version>v20.14.0</node.version>
<node.version>v20.15.0</node.version>
<npm.version>10.8.1</npm.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -40,14 +40,14 @@
<checkstyle.version>10.17.0</checkstyle.version>
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
<gatling-maven-plugin.version>4.9.1</gatling-maven-plugin.version>
<gatling.version>3.11.3</gatling.version>
<git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
<gatling-maven-plugin.version>4.9.4</gatling-maven-plugin.version>
<gatling.version>3.11.4</gatling.version>
<git-commit-id-maven-plugin.version>9.0.0</git-commit-id-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<jhipster-framework.version>8.5.0</jhipster-framework.version>
<jhipster-framework.version>8.6.0</jhipster-framework.version>
<jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
<jib-maven-plugin.image>eclipse-temurin:17-jre-focal</jib-maven-plugin.image>
<jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
<jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<liquibase-plugin.driver/>
<liquibase-plugin.hibernate-dialect/>
Expand All @@ -56,16 +56,16 @@
<liquibase-plugin.username/>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
<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.2.5</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-failsafe-plugin.version>3.3.0</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.7.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.2.5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.3.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 All @@ -75,7 +75,7 @@
<profile.test/>
<profile.tls/>
<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
<sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
<springdoc-openapi-starter-webmvc-api.version>2.5.0</springdoc-openapi-starter-webmvc-api.version>
</properties>
Expand Down Expand Up @@ -457,7 +457,6 @@
<version>${gatling-maven-plugin.version}</version>
<configuration>
<runMultipleSimulations>true</runMultipleSimulations>
<resourcesFolder>${project.basedir}/src/test/gatling/conf</resourcesFolder>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -587,8 +586,8 @@
<version>[${maven.version},)</version>
</requireMavenVersion>
<requireJavaVersion>
<message>You are running an incompatible version of Java. JHipster supports JDK 17 to 21.</message>
<version>[17,18),[18,19),[19,20),[20,21),[21,22)</version>
<message>You are running an incompatible version of Java. JHipster supports JDK 17 to 22.</message>
<version>[17,18),[18,19),[19,20),[20,21),[21,22),[22,23)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -637,32 +636,6 @@
<source>${maven.compiler.source}</source>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>config-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/</directory>
<filtering>true</filtering>
<includes>
<include>config/*.yml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: jhipstersampleapplication
services:
prometheus:
image: prom/prometheus:v2.52.0
image: prom/prometheus:v2.53.0
volumes:
- ./prometheus/:/etc/prometheus/
command:
Expand Down
Loading

0 comments on commit 8b2d343

Please sign in to comment.