Skip to content

Commit

Permalink
automatic project update for v8.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Apr 30, 2024
1 parent 381372d commit bf7d532
Show file tree
Hide file tree
Showing 23 changed files with 61 additions and 89 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.12.1"
"NODE_VERSION": "20.12.2"
}
},

Expand Down
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.3.0",
"jhipsterVersion": "8.4.0",
"jwtSecretKey": "bXktc2VjcmV0LWtleS13aGljaC1zaG91bGQtYmUtY2hhbmdlZC1pbi1wcm9kdWN0aW9uLWFuZC1iZS1iYXNlNjQtZW5jb2RlZAo=",
"languages": ["en"],
"messageBroker": false,
Expand Down
16 changes: 8 additions & 8 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.3.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.3.0](https://www.jhipster.tech/documentation-archive/v8.3.0).
This application was generated using JHipster 8.4.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.4.0](https://www.jhipster.tech/documentation-archive/v8.4.0).

## Project Structure

Expand Down Expand Up @@ -262,13 +262,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.3.0 archive]: https://www.jhipster.tech/documentation-archive/v8.3.0
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.3.0/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.3.0/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.3.0/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.3.0/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.3.0/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.3.0/setting-up-ci/
[JHipster 8.4.0 archive]: https://www.jhipster.tech/documentation-archive/v8.4.0
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.4.0/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.4.0/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.4.0/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.4.0/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.4.0/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.4.0/setting-up-ci/
[Node.js]: https://nodejs.org/
[NPM]: https://www.npmjs.com/
[Webpack]: https://webpack.github.io/
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@
"packaging": "jar"
},
"dependencies": {
"@angular/common": "17.3.3",
"@angular/compiler": "17.3.3",
"@angular/core": "17.3.3",
"@angular/forms": "17.3.3",
"@angular/localize": "17.3.3",
"@angular/platform-browser": "17.3.3",
"@angular/platform-browser-dynamic": "17.3.3",
"@angular/router": "17.3.3",
"@angular/common": "17.3.6",
"@angular/compiler": "17.3.6",
"@angular/core": "17.3.6",
"@angular/forms": "17.3.6",
"@angular/localize": "17.3.6",
"@angular/platform-browser": "17.3.6",
"@angular/platform-browser-dynamic": "17.3.6",
"@angular/router": "17.3.6",
"@fortawesome/angular-fontawesome": "0.14.1",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
Expand All @@ -99,7 +99,7 @@
"@ngx-translate/http-loader": "8.0.0",
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.3",
"dayjs": "1.11.10",
"dayjs": "1.11.11",
"ngx-infinite-scroll": "17.0.0",
"rxjs": "7.8.1",
"tslib": "2.6.2",
Expand All @@ -108,52 +108,52 @@
"devDependencies": {
"@angular-builders/custom-webpack": "17.0.2",
"@angular-builders/jest": "17.0.3",
"@angular-devkit/build-angular": "17.3.3",
"@angular-devkit/build-angular": "17.3.6",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular/cli": "17.3.3",
"@angular/compiler-cli": "17.3.3",
"@angular/service-worker": "17.3.3",
"@angular/cli": "17.3.6",
"@angular/compiler-cli": "17.3.6",
"@angular/service-worker": "17.3.6",
"@types/jest": "29.5.12",
"@types/node": "20.11.25",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.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.7.2",
"cypress": "13.8.1",
"cypress-audit": "1.1.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-cypress": "3.0.2",
"eslint-webpack-plugin": "4.1.0",
"folder-hash": "4.0.4",
"generator-jhipster": "8.3.0",
"generator-jhipster": "8.4.0",
"husky": "9.0.11",
"jest": "29.7.0",
"jest-date-mock": "1.0.9",
"jest-date-mock": "1.0.10",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "16.0.0",
"jest-preset-angular": "14.0.3",
"jest-sonar": "0.2.16",
"lighthouse": "11.7.0",
"lighthouse": "12.0.0",
"lint-staged": "15.2.2",
"merge-jsons-webpack-plugin": "2.0.1",
"prettier": "3.2.5",
"prettier-plugin-java": "2.6.0",
"prettier-plugin-packagejson": "2.4.14",
"prettier-plugin-packagejson": "2.5.0",
"rimraf": "5.0.5",
"swagger-ui-dist": "5.13.0",
"swagger-ui-dist": "5.17.2",
"ts-jest": "29.1.2",
"typescript": "5.4.4",
"typescript": "5.4.5",
"wait-on": "7.2.0",
"webpack-bundle-analyzer": "4.10.1",
"webpack-bundle-analyzer": "4.10.2",
"webpack-merge": "5.10.0",
"webpack-notifier": "1.15.0"
},
"engines": {
"node": ">=20.12.1"
"node": ">=20.12.2"
},
"cacheDirectories": [
"node_modules"
Expand Down
22 changes: 9 additions & 13 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.2.4</version>
<version>3.2.5</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
Expand All @@ -24,8 +24,8 @@
-->
<maven.version>3.2.5</maven.version>
<java.version>17</java.version>
<node.version>v20.12.1</node.version>
<npm.version>10.5.1</npm.version>
<node.version>v20.12.2</node.version>
<npm.version>10.6.0</npm.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
Expand All @@ -36,15 +36,15 @@
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
<run.addResources>false</run.addResources>
<spring-boot.version>${project.parent.version}</spring-boot.version>
<archunit-junit5.version>1.2.1</archunit-junit5.version>
<checkstyle.version>10.15.0</checkstyle.version>
<archunit-junit5.version>1.3.0</archunit-junit5.version>
<checkstyle.version>10.16.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.8.2</gatling-maven-plugin.version>
<gatling.version>3.10.5</gatling.version>
<gatling-maven-plugin.version>4.9.0</gatling-maven-plugin.version>
<gatling.version>3.11.1</gatling.version>
<git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<jhipster-framework.version>8.3.0</jhipster-framework.version>
<jhipster-framework.version>8.4.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>
Expand All @@ -61,7 +61,7 @@
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-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-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
Expand Down Expand Up @@ -654,10 +654,6 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>#</delimiter>
</delimiters>
<resources>
<resource>
<directory>src/main/resources/</directory>
Expand Down
4 changes: 2 additions & 2 deletions 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.51.1
image: prom/prometheus:v2.51.2
volumes:
- ./prometheus/:/etc/prometheus/
command:
Expand All @@ -15,7 +15,7 @@ services:
# grafana/provisioning/datasources/datasource.yml
network_mode: 'host' # to test locally running service
grafana:
image: grafana/grafana:10.4.1
image: grafana/grafana:10.4.2
volumes:
- ./grafana/provisioning/:/etc/grafana/provisioning/
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: jhipstersampleapplication
services:
sonar:
container_name: sonarqube
image: sonarqube:10.4.1-community
image: sonarqube:10.5.0-community
# Forced authentication redirect for UI is turned off for out of the box experience while trying out SonarQube
# For real use cases delete SONAR_FORCEAUTHENTICATION variable or set SONAR_FORCEAUTHENTICATION=true
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Generated(value = "JHipster", comments = "Generated by JHipster 8.3.0")
@Generated(value = "JHipster", comments = "Generated by JHipster 8.4.0")
@Retention(RetentionPolicy.SOURCE)
@Target({ ElementType.TYPE })
public @interface GeneratedByJHipster {
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spring:
# The commented value for `active` can be replaced with valid Spring profiles to load.
# Otherwise, it will be filled in by maven when building the JAR file
# Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
active: #spring.profiles.active#
active: '@spring.profiles.active@'
group:
dev:
- dev
Expand Down
Binary file modified src/main/resources/config/tls/keystore.p12
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h1 jhiTranslate="reset.finish.title">Reset password</h1>

@if (key() && !success()) {
<div>
<form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
<form name="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
<div class="mb-3">
<label class="form-label" for="newPassword" jhiTranslate="global.form.newpassword.label">New password</label>
<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1 jhiTranslate="reset.request.title">Reset your password</h1>
<div class="alert alert-warning">
<span jhiTranslate="reset.request.messages.info">Enter the email address you used to register</span>
</div>
<form name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
<form name="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
<div class="mb-3">
<label class="form-label" for="email" jhiTranslate="global.form.email.label">Email</label>
<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2 jhiTranslate="password.title" [translateValues]="{ username: account.login }
</div>
}

<form name="form" role="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
<form name="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
<div class="mb-3">
<label class="form-label" for="currentPassword" jhiTranslate="global.form.currentpassword.label">Current password</label>
<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1 data-cy="registerTitle" jhiTranslate="register.title">Registration</h1>
<div class="d-flex justify-content-center">
<div class="col-md-8">
@if (!success()) {
<form name="form" role="form" (ngSubmit)="register()" [formGroup]="registerForm">
<form name="form" (ngSubmit)="register()" [formGroup]="registerForm">
<div class="mb-3">
<label class="form-label" for="login" jhiTranslate="global.form.username.label">Username</label>
<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2 jhiTranslate="settings.title" [translateValues]="{ username: settingsForm.va
<jhi-alert-error></jhi-alert-error>

@if (settingsForm.value.login) {
<form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
<form name="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
<div class="mb-3">
<label class="form-label" for="firstName" jhiTranslate="settings.form.firstname">First Name</label>
<input
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-center">
<div class="col-8">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<h2 id="myUserLabel" jhiTranslate="userManagement.home.createOrEditLabel">Create or edit a user</h2>

<jhi-alert-error></jhi-alert-error>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-center">
<div class="col-8">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<h2
id="jhi-authority-heading"
data-cy="AuthorityCreateUpdateHeading"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-center">
<div class="col-8">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<h2
id="jhi-bank-account-heading"
data-cy="BankAccountCreateUpdateHeading"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-center">
<div class="col-8">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<h2
id="jhi-label-heading"
data-cy="LabelCreateUpdateHeading"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-center">
<div class="col-8">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
<h2
id="jhi-operation-heading"
data-cy="OperationCreateUpdateHeading"
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h1 data-cy="loginTitle" jhiTranslate="login.title">Sign in</h1>
<strong>Failed to sign in!</strong> Please check your credentials and try again.
</div>
}
<form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
<form class="form" (ngSubmit)="login()" [formGroup]="loginForm">
<div class="mb-3">
<label class="username-label" for="username" jhiTranslate="global.form.username.label">Username</label>
<input
Expand Down
2 changes: 1 addition & 1 deletion webpack/webpack.custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = async (config, options, targetOptions) => {
}

// configuring proxy for back end service
const tls = Boolean(config.devServer && config.devServer.https);
const tls = config.devServer?.server?.type === 'https';
if (config.devServer) {
config.devServer.proxy = proxyConfig({ tls });
}
Expand Down

0 comments on commit bf7d532

Please sign in to comment.