diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index faf383fe3..7ab1165b6 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": "18.18.1" + "NODE_VERSION": "18.18.2" } }, diff --git a/.lintstagedrc.cjs b/.lintstagedrc.cjs new file mode 100644 index 000000000..0531990f3 --- /dev/null +++ b/.lintstagedrc.cjs @@ -0,0 +1,3 @@ +module.exports = { + '{,**/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'], +}; diff --git a/.lintstagedrc.js b/.lintstagedrc.js deleted file mode 100644 index 687687837..000000000 --- a/.lintstagedrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - '{,src/**/,webpack/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'], -}; diff --git a/package.json b/package.json index 8e02cde4f..5cefcaa6c 100644 --- a/package.json +++ b/package.json @@ -83,18 +83,18 @@ "packaging": "jar" }, "dependencies": { - "@angular/common": "16.2.9", - "@angular/compiler": "16.2.9", - "@angular/core": "16.2.9", - "@angular/forms": "16.2.9", - "@angular/localize": "16.2.9", - "@angular/platform-browser": "16.2.9", - "@angular/platform-browser-dynamic": "16.2.9", - "@angular/router": "16.2.9", + "@angular/common": "16.2.11", + "@angular/compiler": "16.2.11", + "@angular/core": "16.2.11", + "@angular/forms": "16.2.11", + "@angular/localize": "16.2.11", + "@angular/platform-browser": "16.2.11", + "@angular/platform-browser-dynamic": "16.2.11", + "@angular/router": "16.2.11", "@fortawesome/angular-fontawesome": "0.13.0", "@fortawesome/fontawesome-svg-core": "6.4.2", "@fortawesome/free-solid-svg-icons": "6.4.2", - "@ng-bootstrap/ng-bootstrap": "15.1.1", + "@ng-bootstrap/ng-bootstrap": "15.1.2", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", "@popperjs/core": "2.11.8", @@ -108,23 +108,23 @@ "devDependencies": { "@angular-builders/custom-webpack": "16.0.1", "@angular-builders/jest": "16.0.1", - "@angular-devkit/build-angular": "16.2.6", + "@angular-devkit/build-angular": "16.2.9", "@angular-eslint/eslint-plugin": "16.2.0", - "@angular/cli": "16.2.6", - "@angular/compiler-cli": "16.2.9", - "@angular/service-worker": "16.2.9", - "@types/jest": "29.5.5", - "@types/node": "18.18.5", - "@typescript-eslint/eslint-plugin": "6.7.5", - "@typescript-eslint/parser": "6.7.5", + "@angular/cli": "16.2.9", + "@angular/compiler-cli": "16.2.11", + "@angular/service-worker": "16.2.11", + "@types/jest": "29.5.7", + "@types/node": "18.18.8", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "browser-sync": "2.29.3", "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", - "concurrently": "8.2.1", + "concurrently": "8.2.2", "copy-webpack-plugin": "11.0.0", - "cypress": "13.3.1", + "cypress": "13.4.0", "cypress-audit": "1.1.0", - "eslint": "8.51.0", + "eslint": "8.52.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-cypress": "2.15.1", "eslint-webpack-plugin": "4.0.1", @@ -138,27 +138,27 @@ "jest-preset-angular": "13.1.2", "jest-sonar": "0.2.16", "lighthouse": "11.2.0", - "lint-staged": "14.0.1", + "lint-staged": "15.0.2", "merge-jsons-webpack-plugin": "2.0.1", "prettier": "3.0.3", "prettier-plugin-java": "2.3.1", "prettier-plugin-packagejson": "2.4.6", "rimraf": "5.0.5", - "swagger-ui-dist": "5.9.0", + "swagger-ui-dist": "5.9.1", "ts-jest": "29.1.1", "typescript": "5.1.6", "wait-on": "7.0.1", "webpack-bundle-analyzer": "4.9.1", - "webpack-merge": "5.9.0", + "webpack-merge": "5.10.0", "webpack-notifier": "1.15.0" }, "engines": { - "node": ">=18.18.1" + "node": ">=18.18.2" }, "cacheDirectories": [ "node_modules" ], "overrides": { - "webpack": "5.88.2" + "webpack": "5.89.0" } } diff --git a/pom.xml b/pom.xml index 0bede8236..1841bd7ac 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ --> 3.2.5 17 - v18.18.1 - 10.2.0 + v18.18.2 + 10.2.2 UTF-8 UTF-8 yyyyMMddHHmmss @@ -28,19 +28,19 @@ -Djava.security.egd=file:/dev/./urandom -Xmx1G jdt_apt false - 8.0.0-rc.1 - 3.1.4 + 8.0.0 + 3.1.5 1.1.0 10.12.4 1.11 - 1.14.0 + 1.14.2 4.6.0 3.9.5 - 6.0.0 + 7.0.0 2.2.224 - 6.2.9.Final - 0.8.10 - 4.0.3 + 6.2.13.Final + 0.8.11 + 4.0.4 amd64 eclipse-temurin:17-jre-focal 3.4.0 @@ -53,18 +53,18 @@ 4.24.0 1.5.5.Final 3.1.0 - 3.3.0 - 3.3.1 + 3.3.1 + 3.3.2 3.11.0 2.1 3.4.1 - 3.1.2 + 3.2.1 2.2.1 3.3.0 3.6.0 3.3.1 3.12.1 - 3.1.2 + 3.2.1 3.4.0 2.7.0 0.0.11 @@ -73,7 +73,7 @@ - 1.2.0 + 1.2.1 3.10.0.2594 2.40.0 3.0.2 @@ -647,7 +647,7 @@ ${maven-resources-plugin.version} - default-resources + config-resources validate copy-resources @@ -666,13 +666,6 @@ config/*.yml - - src/main/resources/ - false - - config/*.yml - - diff --git a/src/main/docker/monitoring.yml b/src/main/docker/monitoring.yml index 9b8cc4d31..24ed60088 100644 --- a/src/main/docker/monitoring.yml +++ b/src/main/docker/monitoring.yml @@ -15,7 +15,7 @@ services: # grafana/provisioning/datasources/datasource.yml network_mode: 'host' # to test locally running service grafana: - image: grafana/grafana:10.1.5 + image: grafana/grafana:10.2.0 volumes: - ./grafana/provisioning/:/etc/grafana/provisioning/ environment: diff --git a/src/main/java/io/github/jhipster/sample/config/JacksonConfiguration.java b/src/main/java/io/github/jhipster/sample/config/JacksonConfiguration.java index 1941d23f1..c021dee85 100644 --- a/src/main/java/io/github/jhipster/sample/config/JacksonConfiguration.java +++ b/src/main/java/io/github/jhipster/sample/config/JacksonConfiguration.java @@ -1,6 +1,7 @@ package io.github.jhipster.sample.config; import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module; +import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module.Feature; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.springframework.context.annotation.Bean; @@ -28,6 +29,6 @@ public Jdk8Module jdk8TimeModule() { */ @Bean public Hibernate6Module hibernate6Module() { - return new Hibernate6Module(); + return new Hibernate6Module().configure(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS, true); } } diff --git a/src/main/java/io/github/jhipster/sample/config/SecurityConfiguration.java b/src/main/java/io/github/jhipster/sample/config/SecurityConfiguration.java index ff68c84a8..913fdd756 100644 --- a/src/main/java/io/github/jhipster/sample/config/SecurityConfiguration.java +++ b/src/main/java/io/github/jhipster/sample/config/SecurityConfiguration.java @@ -65,7 +65,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Buil .authorizeHttpRequests(authz -> // prettier-ignore authz - .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll() + .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.txt"), mvc.pattern("/*.json"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll() .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll() .requestMatchers(mvc.pattern("/app/**")).permitAll() .requestMatchers(mvc.pattern("/i18n/**")).permitAll() diff --git a/src/main/java/io/github/jhipster/sample/domain/Operation.java b/src/main/java/io/github/jhipster/sample/domain/Operation.java index 2797f8bf8..6edc4aee0 100644 --- a/src/main/java/io/github/jhipster/sample/domain/Operation.java +++ b/src/main/java/io/github/jhipster/sample/domain/Operation.java @@ -135,13 +135,11 @@ public Operation labels(Set