Skip to content

Commit 8b26a85

Browse files
author
Matt Raible
committed
Upgrade to use JHipster 7.0.0
1 parent e3f2dc2 commit 8b26a85

File tree

239 files changed

+12722
-13289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+12722
-13289
lines changed

reactive-jhipster/blog/.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ insert_final_newline = true
1616
indent_style = space
1717
indent_size = 4
1818

19-
[*.{ts,tsx,js,jsx,json,css,scss,yml,html}]
19+
[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}]
2020
indent_size = 2
2121

2222
[*.md]

reactive-jhipster/blog/.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ out/
6868
######################
6969
# Visual Studio Code
7070
######################
71-
.vscode/
71+
.vscode/*
72+
!.vscode/settings.json
73+
!.vscode/tasks.json
74+
!.vscode/launch.json
75+
!.vscode/extensions.json
76+
*.code-workspace
7277

7378
######################
7479
# Maven

reactive-jhipster/blog/.jhipster/Blog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
"microserviceName": "blog",
3636
"clientRootFolder": "blog",
3737
"databaseType": "neo4j",
38-
"changelogDate": "20210117205641"
38+
"changelogDate": "20210325055622"
3939
}

reactive-jhipster/blog/.jhipster/Post.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
"microserviceName": "blog",
4848
"clientRootFolder": "blog",
4949
"databaseType": "neo4j",
50-
"changelogDate": "20210117205741"
50+
"changelogDate": "20210325055722"
5151
}

reactive-jhipster/blog/.jhipster/Tag.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
"microserviceName": "blog",
3030
"clientRootFolder": "blog",
3131
"databaseType": "neo4j",
32-
"changelogDate": "20210117205541"
32+
"changelogDate": "20210325055522"
3333
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
'{,src/**/}*.{md,json,yml,html,java}': ['prettier --write']
2+
'{,src/**/}*.{md,json,yml,html,java}': ['prettier --write'],
33
};

reactive-jhipster/blog/.yo-rc.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
"enableSwaggerCodegen": false,
1414
"enableTranslation": true,
1515
"jhiPrefix": "jhi",
16-
"languages": [
17-
"en"
18-
],
16+
"languages": ["en"],
1917
"messageBroker": false,
2018
"prodDatabaseType": "neo4j",
2119
"searchEngine": false,
@@ -26,7 +24,7 @@
2624
"packageName": "com.okta.developer.blog",
2725
"packageFolder": "com/okta/developer/blog",
2826
"applicationType": "microservice",
29-
"jhipsterVersion": "7.0.0-beta.1",
27+
"jhipsterVersion": "7.0.0",
3028
"clientPackageManager": "npm",
3129
"dtoSuffix": "DTO",
3230
"entitySuffix": "",
@@ -41,14 +39,10 @@
4139
"clientThemeVariant": "",
4240
"withAdminUi": true,
4341
"nativeLanguage": "en",
44-
"creationTimestamp": 1610916881976,
45-
"jwtSecretKey": "NDVmYjZkMjcwZjVjNGNlYWVmMjdmOGUwODg3Y2Q3NzJmOGYyYWE1ZDAyY2QxMDc5YjQyYTNmNWJiZGU5Y2ZhNWM3OWY2Mzg2YzI5YmFkZTY3MDQxOThkZDg3YWQ3MGFiMmEwMzc3NjE2OTcyMTY3MGIwYzRkMjhjY2QwNWE4NGI=",
46-
"lastLiquibaseTimestamp": 1610917061000,
47-
"entities": [
48-
"Tag",
49-
"Blog",
50-
"Post"
51-
],
42+
"creationTimestamp": 1616651662172,
43+
"jwtSecretKey": "MzcwNGVlOTc5MjM1OGQ4ZjY4MzcwZTNlMGI5NzdlODExNTZmMzg2M2NjZjM5N2U4ZjhjNWJkZjc0YjJmYmRmMzNjZGQ0MDEwNDMxYzA2MDVlOWIyZGRjZmQ0NTIxN2UyZjQwYTZjMDE1YzRlNjc2NTMwMWMyZjk1MDNhYTA4YmQ=",
44+
"entities": ["Tag", "Blog", "Post"],
45+
"lastLiquibaseTimestamp": 1616651842000,
5246
"appFolder": "blog"
5347
}
5448
}

reactive-jhipster/blog/README.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# blog
22

3-
This application was generated using JHipster 7.0.0-beta.1, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1](https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1).
3+
This application was generated using JHipster 7.0.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v7.0.0](https://www.jhipster.tech/documentation-archive/v7.0.0).
44

55
This is a "microservice" application intended to be part of a microservice architecture, please refer to the [Doing microservices with JHipster][] page of the documentation for more information.
6-
76
This application is configured for Service Discovery and Configuration with the JHipster-Registry. On launch, it will refuse to start if it is not able to connect to the JHipster-Registry at [http://localhost:8761](http://localhost:8761). For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].
87

98
## Development
@@ -108,12 +107,12 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
108107
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.
109108

110109
[jhipster homepage and latest documentation]: https://www.jhipster.tech
111-
[jhipster 7.0.0-beta.1 archive]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1
112-
[doing microservices with jhipster]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/microservices-architecture/
113-
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/development/
114-
[service discovery and configuration with the jhipster-registry]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/microservices-architecture/#jhipster-registry
115-
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/docker-compose
116-
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/production/
117-
[running tests page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/running-tests/
118-
[code quality page]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/code-quality/
119-
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v7.0.0-beta.1/setting-up-ci/
110+
[jhipster 7.0.0 archive]: https://www.jhipster.tech/documentation-archive/v7.0.0
111+
[doing microservices with jhipster]: https://www.jhipster.tech/documentation-archive/v7.0.0/microservices-architecture/
112+
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v7.0.0/development/
113+
[service discovery and configuration with the jhipster-registry]: https://www.jhipster.tech/documentation-archive/v7.0.0/microservices-architecture/#jhipster-registry
114+
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v7.0.0/docker-compose
115+
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v7.0.0/production/
116+
[running tests page]: https://www.jhipster.tech/documentation-archive/v7.0.0/running-tests/
117+
[code quality page]: https://www.jhipster.tech/documentation-archive/v7.0.0/code-quality/
118+
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v7.0.0/setting-up-ci/

reactive-jhipster/blog/build.gradle

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
buildscript {
22
repositories {
3-
mavenLocal()
4-
mavenCentral()
53
gradlePluginPortal()
6-
maven { url "https://repo.spring.io/plugins-release" }
74
}
85
dependencies {
96
//jhipster-needle-gradle-buildscript-dependency - JHipster will add additional gradle build script plugins here
@@ -14,13 +11,11 @@ plugins {
1411
id "java"
1512
id "maven-publish"
1613
id "idea"
14+
id "eclipse"
1715
id "jacoco"
1816
id "org.springframework.boot"
1917
id "com.google.cloud.tools.jib"
2018
id "com.gorylenko.gradle-git-properties"
21-
id "net.ltgt.apt-eclipse"
22-
id "net.ltgt.apt-idea"
23-
id "net.ltgt.apt"
2419
id "org.sonarqube"
2520
id "io.spring.nohttp"
2621
//jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here
@@ -151,15 +146,14 @@ configurations {
151146
resolutionStrategy {
152147
// Inherited version from Spring Boot can't be used because of regressions:
153148
// To be removed as soon as spring-boot use the same version
154-
force 'org.liquibase:liquibase-core:4.2.2'
149+
force 'org.liquibase:liquibase-core:4.3.1'
155150
}
156151
}
157152
}
158153

159154
repositories {
160155
mavenLocal()
161156
mavenCentral()
162-
jcenter()
163157
//jhipster-needle-gradle-repositories - JHipster will add additional repositories
164158
}
165159

@@ -187,7 +181,7 @@ dependencies {
187181
implementation "org.springframework.boot:spring-boot-starter-mail"
188182
implementation "org.springframework.boot:spring-boot-starter-logging"
189183
implementation "org.springframework.boot:spring-boot-starter-actuator"
190-
implementation "org.neo4j.springframework.data:spring-data-neo4j-rx-spring-boot-starter"
184+
implementation "org.springframework.boot:spring-boot-starter-data-neo4j"
191185
implementation "eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter"
192186
// This is done here explicitly as dependency resolution seems to have changed recently such that the validation starter
193187
// and therefore hibernate validators is not included anymore
@@ -203,14 +197,13 @@ dependencies {
203197
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
204198
implementation "org.zalando:problem-spring-webflux"
205199
implementation "org.springframework.cloud:spring-cloud-starter"
206-
implementation "org.springframework.cloud:spring-cloud-starter-netflix-ribbon"
207200
implementation "org.springframework.cloud:spring-cloud-starter-netflix-hystrix"
208201
implementation "org.springframework.retry:spring-retry"
202+
implementation "org.springframework.cloud:spring-cloud-starter-bootstrap"
209203
implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client"
210204
implementation "org.springframework.cloud:spring-cloud-starter-config"
211205
implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
212206
implementation "org.springframework.security:spring-security-config"
213-
implementation "org.springframework.security:spring-security-data"
214207
implementation "org.springframework.security:spring-security-web"
215208
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
216209
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
@@ -220,9 +213,7 @@ dependencies {
220213
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
221214
annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
222215
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
223-
testImplementation ("org.springframework.boot:spring-boot-starter-test") {
224-
exclude group: "org.junit.vintage", module: "junit-vintage-engine"
225-
}
216+
testImplementation "org.springframework.boot:spring-boot-starter-test"
226217
testImplementation "org.springframework.security:spring-security-test"
227218
testImplementation "org.springframework.boot:spring-boot-test"
228219
testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockhoundJunitPlatformVersion}"
@@ -249,7 +240,7 @@ task cleanResources(type: Delete) {
249240
}
250241

251242
wrapper {
252-
gradleVersion = "6.8"
243+
gradleVersion = "6.8.3"
253244
}
254245

255246
compileJava.dependsOn processResources

reactive-jhipster/blog/gradle.properties

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
11
rootProject.name=blog
22
profile=dev
33

4-
# Build properties
5-
nodeVersion=14.15.0
6-
npmVersion=6.14.11
7-
84
# Dependency versions
9-
jhipsterDependenciesVersion=7.0.0-beta.1
5+
jhipsterDependenciesVersion=7.0.0
106
# The spring-boot version should match the one managed by
11-
# https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/7.0.0-beta.1
12-
springBootVersion=2.3.8.RELEASE
7+
# https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/7.0.0
8+
springBootVersion=2.4.4
139
# The hibernate version should match the one managed by
14-
# https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/2.3.8.RELEASE -->
15-
hibernateVersion=5.4.27.Final
16-
mapstructVersion=1.4.1.Final
17-
archunitJunit5Version=0.15.0
10+
# https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/2.4.4 -->
11+
hibernateVersion=5.4.29.Final
12+
mapstructVersion=1.4.2.Final
13+
archunitJunit5Version=0.17.0
1814

1915
blockhoundJunitPlatformVersion=1.0.4.RELEASE
20-
junitPlatformLauncherVersion=1.7.0
21-
r2dbcMariadbVersion=1.0.0
16+
junitPlatformLauncherVersion=1.7.1
2217

2318

2419
# gradle plugin version
25-
jibPluginVersion=2.7.1
20+
jibPluginVersion=2.8.0
2621
gitPropertiesPluginVersion=2.2.4
27-
aptPluginVersion=0.21
28-
sonarqubePluginVersion=3.1
22+
sonarqubePluginVersion=3.1.1
2923
springNoHttpPluginVersion=0.0.5.RELEASE
30-
checkstyleVersion=8.39
24+
checkstyleVersion=8.40
3125

3226
# jhipster-needle-gradle-property - JHipster will add additional properties here
3327

3428
## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default
3529

3630
## The Gradle daemon aims to improve the startup and execution time of Gradle.
3731
## The daemon is enabled by default in Gradle 3+ setting this to false will disable this.
38-
## TODO: disable daemon on CI, since builds should be clean and reliable on servers
3932
## https://docs.gradle.org/current/userguide/gradle_daemon.html#sec:ways_to_disable_gradle_daemon
4033
## uncomment the below line to disable the daemon
4134

0 commit comments

Comments
 (0)