Skip to content

Commit

Permalink
automatic project update for v8.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Oct 29, 2024
1 parent 37a702c commit 6409e57
Show file tree
Hide file tree
Showing 75 changed files with 259 additions and 219 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.17.0"
"NODE_VERSION": "20.18.0"
}
},

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

## Project Structure

Expand Down Expand Up @@ -215,57 +215,65 @@ sonar.password=admin

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

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

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.
JHipster generates a number of Docker Compose configuration files in the [src/main/docker/](src/main/docker/) folder to launch required third party services.

For example, to start a postgresql database in a docker container, run:
For example, to start required services in Docker containers, run:

```
docker compose -f src/main/docker/postgresql.yml up -d
docker compose -f src/main/docker/services.yml up -d
```

To stop it and remove the container, run:
To stop and remove the containers, run:

```
docker compose -f src/main/docker/postgresql.yml down
docker compose -f src/main/docker/services.yml down
```

You can also fully dockerize your application and all the services that it depends on.
To achieve this, first build a docker image of your app by running:
[Spring Docker Compose Integration](https://docs.spring.io/spring-boot/reference/features/dev-services.html) is enable by default. It's possible to disable it in application.yml:

```yaml
spring:
...
docker:
compose:
enabled: false
```
You can also fully dockerize your application and all the services that it depends on.
To achieve this, first build a Docker image of your app by running:
```sh
npm run java:docker
```

Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
Or build a arm64 Docker image when using an arm64 processor os like MacOS with M1 processor family running:

```
```sh
npm run java:docker:arm64
```

Then run:

```
```sh
docker compose -f src/main/docker/app.yml up -d
```

When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental `Use the new Virtualization framework` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).

For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the Docker Compose sub-generator (`jhipster docker-compose`), which is able to generate Docker configurations for one or several JHipster applications.

## Continuous Integration (optional)

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.7.1 archive]: https://www.jhipster.tech/documentation-archive/v8.7.1
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.7.1/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.7.1/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.7.1/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.7.1/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.7.1/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.7.1/setting-up-ci/
[JHipster 8.7.2 archive]: https://www.jhipster.tech/documentation-archive/v8.7.2
[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.7.2/development/
[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.7.2/docker-compose
[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.7.2/production/
[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.7.2/running-tests/
[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.7.2/code-quality/
[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.7.2/setting-up-ci/
[Node.js]: https://nodejs.org/
[NPM]: https://www.npmjs.com/
[Gatling]: https://gatling.io/
Expand Down
55 changes: 27 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"private": true,
"description": "Description for Jhipster Sample Application",
"license": "UNLICENSED",
"type": "commonjs",
"scripts": {
"app:start": "./mvnw",
"app:up": "docker compose -f src/main/docker/app.yml up --wait",
Expand Down Expand Up @@ -85,14 +84,14 @@
"packaging": "jar"
},
"dependencies": {
"@angular/common": "18.2.5",
"@angular/compiler": "18.2.5",
"@angular/core": "18.2.5",
"@angular/forms": "18.2.5",
"@angular/localize": "18.2.5",
"@angular/platform-browser": "18.2.5",
"@angular/platform-browser-dynamic": "18.2.5",
"@angular/router": "18.2.5",
"@angular/common": "18.2.9",
"@angular/compiler": "18.2.9",
"@angular/core": "18.2.9",
"@angular/forms": "18.2.9",
"@angular/localize": "18.2.9",
"@angular/platform-browser": "18.2.9",
"@angular/platform-browser-dynamic": "18.2.9",
"@angular/router": "18.2.9",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-solid-svg-icons": "6.6.0",
Expand All @@ -104,34 +103,34 @@
"dayjs": "1.11.13",
"ngx-infinite-scroll": "18.0.0",
"rxjs": "7.8.1",
"tslib": "2.7.0",
"tslib": "2.8.0",
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-builders/custom-webpack": "18.0.0",
"@angular-builders/jest": "18.0.0",
"@angular-devkit/build-angular": "18.2.5",
"@angular/cli": "18.2.5",
"@angular/compiler-cli": "18.2.5",
"@angular/service-worker": "18.2.5",
"@types/jest": "29.5.13",
"@angular-devkit/build-angular": "18.2.10",
"@angular/cli": "18.2.10",
"@angular/compiler-cli": "18.2.9",
"@angular/service-worker": "18.2.9",
"@types/jest": "29.5.14",
"@types/node": "20.11.25",
"angular-eslint": "18.3.1",
"browser-sync": "3.0.2",
"angular-eslint": "18.4.0",
"browser-sync": "3.0.3",
"browser-sync-webpack-plugin": "2.3.0",
"buffer": "6.0.3",
"concurrently": "9.0.1",
"copy-webpack-plugin": "12.0.2",
"cypress": "13.14.2",
"cypress": "13.15.1",
"cypress-audit": "1.1.0",
"eslint": "9.10.0",
"eslint": "9.13.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "3.5.0",
"eslint-plugin-cypress": "4.0.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-webpack-plugin": "4.2.0",
"folder-hash": "4.0.4",
"generator-jhipster": "8.7.1",
"globals": "15.9.0",
"generator-jhipster": "8.7.2",
"globals": "15.11.0",
"husky": "9.1.6",
"jest": "29.7.0",
"jest-date-mock": "1.0.10",
Expand All @@ -143,26 +142,26 @@
"lint-staged": "15.2.10",
"merge-jsons-webpack-plugin": "2.0.1",
"prettier": "3.3.3",
"prettier-plugin-java": "2.6.4",
"prettier-plugin-packagejson": "2.5.2",
"prettier-plugin-java": "2.6.5",
"prettier-plugin-packagejson": "2.5.3",
"rimraf": "5.0.8",
"swagger-ui-dist": "5.17.14",
"ts-jest": "29.2.5",
"typescript": "5.5.4",
"typescript-eslint": "8.6.0",
"typescript-eslint": "8.11.0",
"wait-on": "8.0.1",
"webpack-bundle-analyzer": "4.10.2",
"webpack-merge": "6.0.1",
"webpack-notifier": "1.15.0"
},
"engines": {
"node": ">=20.17.0"
"node": ">=20.18.0"
},
"cacheDirectories": [
"node_modules"
],
"overrides": {
"browser-sync": "3.0.2",
"webpack": "5.94.0"
"browser-sync": "3.0.3",
"webpack": "5.95.0"
}
}
40 changes: 20 additions & 20 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.4</version>
<version>3.3.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.17.0</node.version>
<npm.version>10.8.3</npm.version>
<node.version>v20.18.0</node.version>
<npm.version>10.9.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 @@ -37,17 +37,17 @@
<run.addResources>false</run.addResources>
<spring-boot.version>${project.parent.version}</spring-boot.version>
<archunit-junit5.version>1.3.0</archunit-junit5.version>
<checkstyle.version>10.18.1</checkstyle.version>
<checkstyle.version>10.19.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.6</gatling-maven-plugin.version>
<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
<gatling-maven-plugin.version>4.10.1</gatling-maven-plugin.version>
<gatling.version>3.12.0</gatling.version>
<git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<jhipster-framework.version>8.7.1</jhipster-framework.version>
<jhipster-framework.version>8.7.2</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.3</jib-maven-plugin.version>
<jib-maven-plugin.version>3.4.4</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.6.2</mapstruct.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
<maven-checkstyle-plugin.version>3.6.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.5.0</maven-failsafe-plugin.version>
<maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-site-plugin.version>3.20.0</maven-site-plugin.version>
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-surefire-plugin.version>3.5.1</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 Down Expand Up @@ -296,11 +296,6 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
Expand Down Expand Up @@ -489,8 +484,8 @@
<version>[${maven.version},)</version>
</requireMavenVersion>
<requireJavaVersion>
<message>You are running an incompatible version of Java. JHipster supports JDK 17 to 22.</message>
<version>[17,18),[21,22),[22,23)</version>
<message>You are running an incompatible version of Java. JHipster supports JDK 17 to 23.</message>
<version>[17,18),[21,22),[23,24)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -1032,6 +1027,11 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
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.54.1
image: prom/prometheus:v2.55.0
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:11.2.0
image: grafana/grafana:11.3.0
volumes:
- ./grafana/provisioning/:/etc/grafana/provisioning/
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: jhipstersampleapplication
services:
postgresql:
image: postgres:16.4
image: postgres:17.0
# volumes:
# - ~/volumes/jhipster/jhipsterSampleApplication/postgresql/:/var/lib/postgresql/data/
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.6.0-community
image: sonarqube:10.7.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.7.1")
@Generated(value = "JHipster", comments = "Generated by JHipster 8.7.2")
@Retention(RetentionPolicy.SOURCE)
@Target({ ElementType.TYPE })
public @interface GeneratedByJHipster {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration;
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.core.env.Environment;
import tech.jhipster.config.DefaultProfileUtil;
import tech.jhipster.config.JHipsterConstants;

@SpringBootApplication
@SpringBootApplication(exclude = { H2ConsoleAutoConfiguration.class })
@EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class })
public class JhipsterSampleApplicationApp {

Expand Down
Loading

0 comments on commit 6409e57

Please sign in to comment.