Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spring Boot 2.3 #11682

Merged
merged 62 commits into from
Sep 3, 2020
Merged

Spring Boot 2.3 #11682

merged 62 commits into from
Sep 3, 2020

Conversation

murdos
Copy link
Contributor

@murdos murdos commented May 1, 2020 •
edited
Loading

Fixes #11681

Associated jhipster PR: jhipster/jhipster#689

@murdos murdos mentioned this pull request May 1, 2020
Merged
@murdos murdos changed the title Spring Boot 2.3 update Spring Boot 2.3 May 1, 2020
@murdos murdos force-pushed the spring-boot-2.3 branch 2 times, most recently from 2d04635 to 9d6396e Compare May 7, 2020 21:00
@murdos murdos force-pushed the spring-boot-2.3 branch from 9d6396e to 3a6cc79 Compare May 9, 2020 17:01
@murdos murdos force-pushed the spring-boot-2.3 branch from 38f5d27 to 7568d9f Compare May 17, 2020 08:35
vishal423 and others added 17 commits May 21, 2020 16:48
@vishal423
Update hazelcast cache configuration, remove obsolete props, update r…
794a2d7 
…esources
@murdos
Improve template logic
4a1b238
@murdos
Cassandra: remove home-made health indicator
e9658f2 
Spring Boot already provides one
@murdos
Cassandra: move CassandraConfiguration in main config directory
e4d70f9
@murdos
Cassandra: update to Spring Data Cassandra 3.0 and DataStax Driver 4.6
7cf45dc
@murdos
Cassandra: reactive changes for update to Spring Data Cassandra 3.0 a…
9fd98fa 
…nd DataStax Driver 4.6
@murdos
Replace MongoBee with Mongock
e53874f
@murdos
MongoDB: upgrade to Mongock v4 supporting MongoDB driver v4
4093d52
@murdos
Gradle: Spring Boot 2.3 compatibility changes
72faacf
@murdos
Elasticsearch: Upgrade to Spring Data Elasticsearch 4.0 and Elasticse…
ca2116b 
…arch 7.6

Remove Jest since Spring Data now fully support RestHighLevelClient.
Fixes #10003
@murdos
Elasticsearch: Remove use of SpringBoot configuration spring.data.ela…
94bdcb6 
…sticsearch.home.path

Spring Boot does not support starting embedded node since version 2.0
@murdos
Elasticsearch: clean Jest config in deployment subgenerators
3673894
@murdos
Elasticsearch: custom converters for java.time classes
afecc89
@DanielFran
Change kubernetes probes
bb1bb6b
@DanielFran
Define graceful shutdown
1704d4d
@murdos
Merge pull request #11683 from murdos/spring-boot-2.3-elasticsearch
b0330bc 
[SpringBoot 2.3] Upgrade to Spring Data Elasticsearch 4.0 and Elasticsearch 7.6
@murdos
Update Spring Boot version to 2.3.1
70641d3
murdos and others added 7 commits August 24, 2020 22:07
@murdos
Merge branch 'master' into spring-boot-2.3
90f1a8f 
# Conflicts:
#	generators/cleanup.js
#	generators/generator-constants.js
#	generators/languages/index.js
#	generators/server/templates/build.gradle.ejs
#	generators/server/templates/gradle.properties.ejs
#	generators/server/templates/pom.xml.ejs
#	generators/server/templates/src/main/java/package/config/cassandra/CassandraConfiguration.java.ejs
#	generators/server/templates/src/main/java/package/repository/PersistenceAuditEventRepository.java.ejs
#	generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs
#	generators/server/templates/src/test/java/package/config/CassandraConfigurationIT.java.ejs
#	generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs
@DanielFran
Merge pull request #12301 from murdos/spring-boot-2.3-disable-couchbase
3b042c1 
SB 2.3/Couchbase: disable CI tests and advertise option as broken
@murdos
Merge remote-tracking branch 'upstream/spring-boot-2.3' into spring-b…
2222f0d 
…oot-2.3
@murdos
Update jhipster-lib version to 3.10.0-SNAPSHOT
2f9d733
@murdos
Cassandra: fix test code compilation following merge with master
368a256
@murdos
CI: update jhipster lib branch for vue
cd9212e
@murdos
CI: disable vue-couchbase integration test
4b6f470 
See #12300
@murdos murdos closed this Aug 26, 2020
@murdos murdos reopened this Aug 26, 2020
@mshima mshima closed this Aug 26, 2020
@mshima mshima reopened this Aug 26, 2020
@DanielFran DanielFran closed this Aug 26, 2020
@DanielFran DanielFran reopened this Aug 26, 2020
murdos and others added 4 commits August 28, 2020 00:05
@murdos
Merge branch 'master' into spring-boot-2.3
e97e69a 
# Conflicts:
#	.github/workflows/react.yml
#	.github/workflows/vue.yml
#	.github/workflows/webflux.yml
@vishal423
Explicit hazelcast versions to match JHipster bom
ebb818a
@vishal423
Remove runtime dependency to resolve conflicting libraries
212a29d
@murdos
Merge pull request #12368 from vishal423/fix-gradle-hazelcast-ver
24891cd 
Remove properties migrator runtime dependency to resolve lib conflicts
@murdos murdos marked this pull request as ready for review September 2, 2020 12:35
@murdos
Copy link
Contributor Author

murdos commented Sep 3, 2020

I think, we should only comment the couchbase matrix configuration. It will be easier to get it back and let people know that we have some options in "wait mode".

Yes, it was my first intent, but I deleted them because of (unrelated?) issues when they were commented.
I've restored them ;-)

DanielFran
DanielFran approved these changes Sep 3, 2020
View reviewed changes
Copy link
Member

@DanielFran DanielFran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@murdos murdos merged commit 5a547f2 into master Sep 3, 2020
@murdos murdos deleted the spring-boot-2.3 branch September 3, 2020 19:51
@pascalgrimaud pascalgrimaud added this to the 7.0.0 milestone Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mshima mshima mshima approved these changes

@DanielFran DanielFran DanielFran approved these changes

Assignees
No one assigned
Labels
theme: java
Projects
None yet
Milestone
7.0.0-beta.0
Development

Successfully merging this pull request may close these issues.

Migration to Spring Boot 2.3
7 participants
@murdos @mshima @DanielFran @avdev4j @pascalgrimaud @vishal423 @vivekmore