Skip to content

Commit

Permalink
automatic project update for v8.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
deepu105 committed Oct 14, 2023
1 parent e8caaf9 commit 706eac8
Show file tree
Hide file tree
Showing 71 changed files with 630 additions and 332 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": "false",
// "INSTALL_GRADLE": "true",
"NODE_VERSION": "18.17.1"
"NODE_VERSION": "18.18.1"
}
},

Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ build/
node/
coverage/
postcss.config.js
build/resources/main/static/
10 changes: 7 additions & 3 deletions .prettierignore
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
node_modules
target
build
package-lock.json
.git
.mvn
build/

# Generated by jhipster:client
build/resources/main/static/

# Generated by jhipster:gradle
build
gradle
.gradle
26 changes: 14 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ create src/main/webapp/app/my-component/my-component.component.ts
update src/main/webapp/app/app.module.ts
```

### JHipster Control Center

JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:

```
docker compose -f src/main/docker/jhipster-control-center.yml up
```

## Building for production

### Packaging as jar
Expand Down Expand Up @@ -146,8 +138,18 @@ To package your application as a war in order to deploy it to an application ser
./gradlew -Pprod -Pwar clean bootWar
```

### JHipster Control Center

JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:

```
docker compose -f src/main/docker/jhipster-control-center.yml up
```

## Testing

### Spring Boot tests

To launch your application's tests, run:

```
Expand All @@ -171,7 +173,7 @@ You can execute automated [lighthouse audits][https://developers.google.com/web/
You should only run the audits when your application is packaged with the production profile.
The lighthouse report is created in `build/cypress/lhreport.html`

### Other tests
### Gatling

Performance tests are run by [Gatling][] and written in Scala. They're located in [src/test/java/gatling/simulations](src/test/java/gatling/simulations).

Expand All @@ -181,9 +183,9 @@ You can execute all Gatling tests with
./gradlew gatlingRun.
```

For more information, refer to the [Running tests page][].
## Others

### Code quality
### Code quality using Sonar

Sonar is used to analyse code quality. You can start a local Sonar server (accessible on http://localhost:9001) with:

Expand All @@ -210,7 +212,7 @@ sonar.password=admin

For more information, refer to the [Code quality page][].

## Using Docker to simplify development (optional)
### Using Docker to simplify development (optional)

You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.

Expand Down
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"configPath": "jest.conf.js"
"configPath": "jest.conf.js",
"tsConfig": "tsconfig.spec.json"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ task cleanResources(type: Delete) {
}

wrapper {
gradleVersion = "8.3"
gradleVersion = "8.4"
}

task webapp_test(type: NpmTask) {
Expand Down Expand Up @@ -273,8 +273,8 @@ task webapp_test(type: NpmTask) {

if (project.hasProperty("nodeInstall")) {
node {
version = "18.17.1"
npmVersion = "10.0.0"
version = "18.18.1"
npmVersion = "10.2.0"
download = true
}

Expand Down
1 change: 1 addition & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
async setupNodeEvents(on, config) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
return (await import('./src/test/javascript/cypress/plugins/index')).default(on, config);
},
baseUrl: 'http://localhost:8080/',
Expand Down
32 changes: 16 additions & 16 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ rootProject.name=jhipster-gradle-sample-application
profile=dev

# Dependency versions
jhipsterDependenciesVersion=8.0.0-beta.3
jhipsterDependenciesVersion=8.0.0-rc.1
# The spring-boot version should match the one managed by
# https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/8.0.0-beta.3
springBootVersion=3.1.3
# https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/8.0.0-rc.1
springBootVersion=3.1.4
# The hibernate version should match the one managed by
# https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/3.1.3 -->
hibernateVersion=6.2.7.Final
# https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/3.1.4 -->
hibernateVersion=6.2.9.Final
mapstructVersion=1.5.5.Final
archunitJunit5Version=1.1.0

Expand All @@ -17,23 +17,23 @@ archunitJunit5Version=1.1.0
jaxbRuntimeVersion=4.0.3

# gradle plugin version
jibPluginVersion=3.3.2
jibPluginVersion=3.4.0
gitPropertiesPluginVersion=2.4.1
gradleNodePluginVersion=7.0.0
sonarqubePluginVersion=4.3.1.3277
spotlessPluginVersion=6.21.0
gradleNodePluginVersion=7.0.1
sonarqubePluginVersion=4.4.1.3373
spotlessPluginVersion=6.22.0
noHttpCheckstyleVersion=0.0.11
checkstyleVersion=10.12.3
modernizerPluginVersion=1.8.0
gradleEnterprisePluginVersion=3.14.1
gradleCommonCustomUserDataPluginVersion=1.11.1
checkstyleVersion=10.12.4
modernizerPluginVersion=1.9.0
gradleEnterprisePluginVersion=3.15.1
gradleCommonCustomUserDataPluginVersion=1.11.3
gatlingVersion=3.9.5
gatlingPluginVersion=3.9.5.5
gatlingPluginVersion=3.9.5.6

liquibaseTaskPrefix=liquibase
liquibasePluginVersion=2.2.0
liquibaseVersion=4.23.1
liquibaseHibernate6Version=4.23.1
liquibaseVersion=4.24.0
liquibaseHibernate6Version=4.24.0
# jhipster-needle-gradle-property - JHipster will add additional properties here

## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default
Expand Down
6 changes: 3 additions & 3 deletions gradle/liquibase.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ liquibase {
activities {
main {
driver "org.h2.Driver"
url "jdbc:h2:tcp://localhost:18080/mem:jhipstergradlesampleapplication"
url "jdbc:h2:tcp://localhost:18080/mem:jhipsterGradleSampleApplication"
username "jhipsterGradleSampleApplication"
changelogFile "src/main/resources/config/liquibase/master.xml"
logLevel "debug"
classpath "src/main/resources/"
}
diffLog {
driver "org.h2.Driver"
url "jdbc:h2:tcp://localhost:18080/mem:jhipstergradlesampleapplication"
url "jdbc:h2:tcp://localhost:18080/mem:jhipsterGradleSampleApplication"
username "jhipsterGradleSampleApplication"
changelogFile project.ext.diffChangelogFile
referenceUrl "hibernate:spring:io.github.jhipster.sample.domain?dialect=org.hibernate.dialect.H2Dialect&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
Expand All @@ -51,7 +51,7 @@ configurations {
resolutionStrategy {
// Inherited version from Spring Boot can't be used because of regressions:
// To be removed as soon as spring-boot use the same version
force 'org.liquibase:liquibase-core:4.23.1'
force 'org.liquibase:liquibase-core:4.24.0'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"ci:e2e:teardown:docker": "docker compose -f src/main/docker/services.yml down -v && docker ps -a",
"ci:frontend:build": "npm run webapp:build:$npm_package_config_default_environment",
"ci:frontend:test": "npm run ci:frontend:build && npm test",
"ci:server:await": "echo \"Waiting for server at port $npm_package_config_backend_port to start\" && wait-on -t 180000 http-get://localhost:$npm_package_config_backend_port/management/health && echo \"Server at port $npm_package_config_backend_port started\"",
"clean-www": "rimraf build/resources/main/static/app/{src,build/}",
"cleanup": "rimraf build/resources/main/static/",
"ci:server:await": "echo \"Waiting for server at port $npm_package_config_backend_port to start\" && wait-on -t 180000 http-get://127.0.0.1:$npm_package_config_backend_port/management/health && echo \"Server at port $npm_package_config_backend_port started\"",
"clean-www": "rimraf build/resources/main/static/",
"cleanup": "rimraf build/",
"cypress": "cypress open --e2e",
"cypress:audits": "cypress open --e2e --config-file cypress-audits.config.js",
"docker:db:down": "docker compose -f src/main/docker/mysql.yml down -v",
Expand All @@ -41,7 +41,7 @@
"e2e:cypress:headed": "npm run e2e:cypress -- --headed",
"e2e:cypress:record": "npm run e2e:cypress -- --record",
"e2e:dev": "concurrently -k -s first \"./gradlew\" \"npm run e2e\"",
"e2e:devserver": "concurrently -k -s first \"npm run backend:start\" \"npm start\" \"wait-on -t 180000 http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000\"",
"e2e:devserver": "concurrently -k -s first \"npm run backend:start\" \"npm start\" \"wait-on -t 180000 http-get://127.0.0.1:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000\"",
"pree2e:headless": "npm run ci:server:await",
"e2e:headless": "npm run e2e:cypress --",
"java:docker": "./gradlew bootJar -Pprod jibDockerBuild",
Expand Down Expand Up @@ -83,68 +83,68 @@
"packaging": "jar"
},
"dependencies": {
"@angular/common": "16.2.3",
"@angular/compiler": "16.2.3",
"@angular/core": "16.2.3",
"@angular/forms": "16.2.3",
"@angular/localize": "16.2.3",
"@angular/platform-browser": "16.2.3",
"@angular/platform-browser-dynamic": "16.2.3",
"@angular/router": "16.2.3",
"@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",
"@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",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.1",
"dayjs": "1.11.9",
"bootstrap": "5.3.2",
"dayjs": "1.11.10",
"ngx-infinite-scroll": "16.0.0",
"rxjs": "7.8.1",
"tslib": "2.6.2",
"zone.js": "0.13.1"
"zone.js": "0.13.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "16.0.1",
"@angular-builders/jest": "16.0.1",
"@angular-devkit/build-angular": "16.2.1",
"@angular-eslint/eslint-plugin": "16.1.1",
"@angular/cli": "16.2.1",
"@angular/compiler-cli": "16.2.3",
"@angular/service-worker": "16.2.3",
"@types/jest": "29.5.4",
"@types/node": "18.17.14",
"@typescript-eslint/eslint-plugin": "6.6.0",
"@typescript-eslint/parser": "6.6.0",
"@angular-devkit/build-angular": "16.2.6",
"@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",
"browser-sync": "2.29.3",
"browser-sync-webpack-plugin": "2.3.0",
"buffer": "6.0.3",
"concurrently": "8.2.1",
"copy-webpack-plugin": "11.0.0",
"cypress": "13.1.0",
"cypress": "13.3.1",
"cypress-audit": "1.1.0",
"eslint": "8.48.0",
"eslint": "8.51.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-cypress": "2.14.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-webpack-plugin": "4.0.1",
"folder-hash": "4.0.4",
"generator-jhipster": "7.9.4",
"husky": "8.0.3",
"jest": "29.6.4",
"jest": "29.7.0",
"jest-date-mock": "1.0.8",
"jest-environment-jsdom": "29.6.4",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "16.0.0",
"jest-preset-angular": "13.1.1",
"jest-preset-angular": "13.1.2",
"jest-sonar": "0.2.16",
"lighthouse": "11.0.0",
"lighthouse": "11.2.0",
"lint-staged": "14.0.1",
"merge-jsons-webpack-plugin": "2.0.1",
"prettier": "3.0.3",
"prettier-plugin-java": "2.3.1",
"prettier-plugin-packagejson": "2.4.5",
"rimraf": "5.0.1",
"swagger-ui-dist": "5.5.0",
"prettier-plugin-packagejson": "2.4.6",
"rimraf": "5.0.5",
"swagger-ui-dist": "5.9.0",
"ts-jest": "29.1.1",
"typescript": "5.1.6",
"wait-on": "7.0.1",
Expand All @@ -153,7 +153,7 @@
"webpack-notifier": "1.15.0"
},
"engines": {
"node": ">=18.17.1"
"node": ">=18.18.1"
},
"cacheDirectories": [
"node_modules"
Expand Down
Empty file modified src/main/docker/jib/entrypoint.sh
100755 → 100644
Empty file.
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: jhipstergradlesampleapplication
services:
prometheus:
image: prom/prometheus:v2.46.0
image: prom/prometheus:v2.47.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.1.1
image: grafana/grafana:10.1.5
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: jhipstergradlesampleapplication
services:
sonar:
container_name: sonarqube
image: sonarqube:10.2.0-community
image: sonarqube:10.2.1-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 @@ -83,7 +83,7 @@ public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
.error(
"Exception in {}() with cause = {}",
joinPoint.getSignature().getName(),
e.getCause() != null ? e.getCause() : "NULL"
e.getCause() != null ? String.valueOf(e.getCause()) : "NULL"
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ public class LocaleConfiguration implements WebMvcConfigurer {

@Bean
public LocaleResolver localeResolver() {
AngularCookieLocaleResolver cookieLocaleResolver = new AngularCookieLocaleResolver();
cookieLocaleResolver.setCookieName("NG_TRANSLATE_LANG_KEY");
return cookieLocaleResolver;
return new AngularCookieLocaleResolver("NG_TRANSLATE_LANG_KEY");
}

@Override
Expand Down
Loading

0 comments on commit 706eac8

Please sign in to comment.