diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5d35f260..8449af94 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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" } }, diff --git a/.yo-rc.json b/.yo-rc.json index c37792c2..ad475eba 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -26,7 +26,7 @@ "entitySuffix": "", "hibernateCache": "ehcache", "jhiPrefix": "jhi", - "jhipsterVersion": "8.3.0", + "jhipsterVersion": "8.4.0", "jwtSecretKey": "bXktc2VjcmV0LWtleS13aGljaC1zaG91bGQtYmUtY2hhbmdlZC1pbi1wcm9kdWN0aW9uLWFuZC1iZS1iYXNlNjQtZW5jb2RlZAo=", "languages": ["en"], "messageBroker": false, diff --git a/README.md b/README.md index 11a43b47..dbb0bac8 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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/ diff --git a/package.json b/package.json index 7a9a36d2..630fc769 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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" diff --git a/pom.xml b/pom.xml index 4ca046cb..238dacdb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 3.2.5 @@ -24,8 +24,8 @@ --> 3.2.5 17 - v20.12.1 - 10.5.1 + v20.12.2 + 10.6.0 UTF-8 UTF-8 yyyyMMddHHmmss @@ -36,15 +36,15 @@ jdt_apt false ${project.parent.version} - 1.2.1 - 10.15.0 + 1.3.0 + 10.16.0 1.11 1.15.0 - 4.8.2 - 3.10.5 + 4.9.0 + 3.11.1 8.0.2 0.8.12 - 8.3.0 + 8.4.0 amd64 eclipse-temurin:17-jre-focal 3.4.2 @@ -61,7 +61,7 @@ 3.13.0 3.4.1 3.2.5 - 3.3.0 + 3.4.1 3.6.3 3.3.1 3.12.1 @@ -654,10 +654,6 @@ ${project.build.directory}/classes - false - - # - src/main/resources/ diff --git a/src/main/docker/monitoring.yml b/src/main/docker/monitoring.yml index be802621..21ab8f0a 100644 --- a/src/main/docker/monitoring.yml +++ b/src/main/docker/monitoring.yml @@ -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: @@ -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: diff --git a/src/main/docker/sonar.yml b/src/main/docker/sonar.yml index fbbc4ab8..4e819106 100644 --- a/src/main/docker/sonar.yml +++ b/src/main/docker/sonar.yml @@ -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: diff --git a/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java b/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java index fd3056d2..c8f14900 100644 --- a/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java +++ b/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java @@ -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 { diff --git a/src/main/java/io/github/jhipster/sample/config/LocaleConfiguration.java b/src/main/java/io/github/jhipster/sample/config/LocaleConfiguration.java deleted file mode 100644 index 0391e521..00000000 --- a/src/main/java/io/github/jhipster/sample/config/LocaleConfiguration.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.github.jhipster.sample.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.LocaleResolver; -import org.springframework.web.servlet.config.annotation.*; -import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; -import tech.jhipster.config.locale.AngularCookieLocaleResolver; - -@Configuration -public class LocaleConfiguration implements WebMvcConfigurer { - - @Bean - public LocaleResolver localeResolver() { - return new AngularCookieLocaleResolver("NG_TRANSLATE_LANG_KEY"); - } - - @Override - public void addInterceptors(InterceptorRegistry registry) { - LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor(); - localeChangeInterceptor.setParamName("language"); - registry.addInterceptor(localeChangeInterceptor); - } -} diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 33a0fe6a..b04c0bb6 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -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 diff --git a/src/main/resources/config/tls/keystore.p12 b/src/main/resources/config/tls/keystore.p12 index 3d132166..5c4c1ce4 100644 Binary files a/src/main/resources/config/tls/keystore.p12 and b/src/main/resources/config/tls/keystore.p12 differ diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html index a28b1124..fa4dbf1e 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html @@ -34,7 +34,7 @@

Reset password

@if (key() && !success()) {
-
+
Reset your password
Enter the email address you used to register
- +
+
Registration
@if (!success()) { - +
+
- +

Create or edit a user

diff --git a/src/main/webapp/app/entities/admin/authority/update/authority-update.component.html b/src/main/webapp/app/entities/admin/authority/update/authority-update.component.html index 5d58e9cd..29b43fb9 100644 --- a/src/main/webapp/app/entities/admin/authority/update/authority-update.component.html +++ b/src/main/webapp/app/entities/admin/authority/update/authority-update.component.html @@ -1,6 +1,6 @@
- +

- +

- +

- +

Sign in

Failed to sign in! Please check your credentials and try again.
} - +
{ } // 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 }); }