Spring boot 2.1.0 #9222

deepu105 · 2019-02-08T11:28:32Z

Fix #8683

Please make sure the below checklist is followed for Pull Requests.
Travis tests are green
Tests are added where necessary
Documentation is added/updated where necessary
Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

@DanielFran @jdubois @pascalgrimaud are you ok with this

Target travis to jhipster-generator 'spring-boot_2.1.0' branch

Spring boot 2.1.0

SB2 branch: fix CI

Removed liquibase-slf4j since liquibase 3.6 it is used slf4j

…starter-embedded

Update infinispan cache configuration

Upgrade dropwizard metrics version to 4.0.3

Use infinispan-hibernate-cache-v53 instead of infinispan-hibernate-cache

Added metrics-jmx

Review metrics imports

Update from Master

Downgrade maven-enforcer-plugin version to 3.0.0-M1 due to regression issue

Upgrade jacoco-maven-plugin version to 0.8.3

Upgrade consul version to 1.4.1

Upgrade traefik version to 1.7.8

Upgrade consul version to 1.4.2

Upgrade sonar-maven-plugin version to 3.6.0.1398

deepu105 · 2019-02-08T11:29:08Z

We have conflicts that needs to be resolved. @DanielFran can you rebase this branch from master?

pascalgrimaud · 2019-02-08T11:43:34Z

I'm ok to start the merge in master.
But I have few points:

is jhipster lib already released ?
we switch to JDK11, is it what we want by default ?
once it's merged, we need to change the branch in Travis and Azure config

deepu105 · 2019-02-08T12:24:16Z

I think we can have JDK11 by default but we should make it very easy to switch to JDK8 as well Thanks & Regards, Deepu

…

On Fri, Feb 8, 2019 at 12:43 PM Pascal Grimaud ***@***.***> wrote: I'm ok to start the merge in master. But I have few points: - is jhipster lib already released ? - we switch to JDK11, is it what we want by default ? - once it's merged, we need to change the branch in Travis and Azure config — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#9222 (comment)>, or mute the thread <https:/notifications/unsubscribe-auth/ABDlF2Sij3bBwEZcRBFFWK7-a6L2USkVks5vLWLqgaJpZM4avHp2> .

Switch to FixedPostgreSQL95Dialect

Merge branch 'master' into spring-boot_2.1.0 and resolve conflicts

DanielFran · 2019-02-09T00:27:52Z

@deepu105 I rebase from master branch! Let's wait to see if tests are green ;)

DanielFran · 2019-02-09T00:35:20Z

@pascalgrimaud

jhipster lib is not released. Can we target master jhispter lib (after we merge in lib Spring boot 2.1.0 jhipster#174 to master) without make a release? Would like to wait for spring-boot 2.1.3 expected next Feb-15
With the rebase I keeped JDK11 for now

pascalgrimaud · 2019-02-09T08:27:02Z

@DanielFran : yes it is possible, exactly what we did with spring boot 2.1 branch, now we can point to master

murdos · 2019-02-09T09:35:54Z

generators/generator-base-private.js

- );
+ if (
+ !javaVersion.match(new RegExp('11'.replace('.', '\\.'))) &&
+ !javaVersion.match(new RegExp(constants.JAVA_VERSION.replace('.', '\\.')))


If java11 become the default version, we should change the value of JAVA_VERSION in generator-constants.js.
It is used in particular in pom.xml.

murdos · 2019-02-09T09:37:22Z

generators/generator-base-private.js

+ !javaVersion.match(new RegExp('11'.replace('.', '\\.'))) &&
+ !javaVersion.match(new RegExp(constants.JAVA_VERSION.replace('.', '\\.')))
+ ) {
+ this.warning(`Java 8 or Java 11 are not found on your computer. Your Java version is: ${chalk.yellow(javaVersion)}`);


Use constants.JAVA_VERSION rather than hardcoding java version here.
Ex : Java 8 or Java ${constants.JAVA_VERSION} are not found on your computer

murdos · 2019-02-09T09:45:55Z

generators/server/templates/build.gradle.ejs

@@ -54,8 +54,7 @@ plugins {
 apply plugin: 'java'
 sourceCompatibility=<%= JAVA_VERSION %>
 targetCompatibility=<%= JAVA_VERSION %>
-// Until JHipster supports JDK 9
-assert System.properties['java.specification.version'] == '1.8'
+assert System.properties['java.specification.version'] == '1.8' || '11'


Is this still needed?
It it is, we should use a constant:

assert System.properties['java.specification.version'] == '1.8' || '<%= JAVA_VERSION %>'

murdos · 2019-02-09T09:47:14Z

generators/server/templates/build.gradle.ejs

@@ -235,6 +234,10 @@ repositories {
 // more information at https://blogs.oracle.com/dev2dev/entry/how_to_get_oracle_jdbc
 maven { url "https://maven.oracle.com" }
 <%_ } _%>
+ // TODO To remove after final JHipster release
+ maven { url "http://oss.sonatype.org/content/repositories/snapshots" }
+ // TODO To remove after final Spring-cloud 2.1 release


It should be removed now since Spring Cloud has been released.

murdos · 2019-02-09T09:47:53Z

generators/server/templates/build.gradle.ejs

@@ -235,6 +234,10 @@ repositories {
 // more information at https://blogs.oracle.com/dev2dev/entry/how_to_get_oracle_jdbc
 maven { url "https://maven.oracle.com" }
 <%_ } _%>
+ // TODO To remove after final JHipster release


We should create an issue to be sure to not forget this task.

generators/server/templates/pom.xml.ejs

...server/templates/src/main/java/package/config/lazy/LazyInitBeanFactoryPostProcessor.java.ejs

murdos · 2019-02-09T10:06:28Z

...rators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs

 http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">

 <%_ if (prodDatabaseType === 'mysql' || prodDatabaseType === 'mariadb') { _%>
 <property name="autoIncrement" value="true"/>
 <%_ } _%>
 <%_ if (prodDatabaseType === 'postgresql' || prodDatabaseType === 'oracle' || prodDatabaseType === 'mssql') { _%>
 <changeSet id="00000000000000" author="jhipster">
- <createSequence sequenceName="hibernate_sequence" startValue="1000" incrementBy="50"/>
+ <createSequence sequenceName="sequence_generator" startValue="1000" incrementBy="50"/>


Just wondering: has Hibernate changed the default name of its database sequence?

deepu105 · 2019-02-09T11:27:49Z

@DanielFran I see that you have merged master instead of rebasing from master. Normally I prefer rebasing as it keeps history in order. But if its harder to rebase its fine

DanielFran · 2019-02-09T12:09:01Z

@deepu105 sorry I am still learning using Git.

Is this ok to merge?

DanielFran · 2019-02-28T22:16:51Z

Bounty claimed https://opencollective.com/generator-jhipster/expenses/6950

DanielFran and others added 30 commits October 30, 2018 23:15

Target travis to jhipster-generator 'spring-boot_2.1.0' branch

268cb98

Update jhipster-dependencies version to 2.1.0-SNAPSHOT

a3e5eb3

Merge pull request #8684 from DanielFran/spring-boot_2.1.0

e51286d

Target travis to jhipster-generator 'spring-boot_2.1.0' branch

Update spring-boot version to 2.1.0.RELEASE

9b18dd7

Update hibernate version to 5.3.7.Final

e0dca59

Update javassist version to 3.23.1-GA

276ca71

Update liquibase version to 3.6.2

7d2e05c

Update liquibase dbchangelog xsd version to 3.6

b9e4c3b

Merge pull request #8713 from DanielFran/spring-boot_2.1.0

f0d2ae3

Spring boot 2.1.0

CI: use correct script to change version of jhipster lib

ee5ced3

Azure: switch to spring-boot_2.1.0 branch

b7d4737

Merge pull request #8715 from pascalgrimaud/spring-boot_2.1.0

e920113

SB2 branch: fix CI

Removed liquibase-slf4j since liquibase 3.6 it is used slf4j

54b8bbf

Merge pull request #8719 from DanielFran/spring-boot_2.1.0

72df21d

Removed liquibase-slf4j since liquibase 3.6 it is used slf4j

Use infinispan-hibernate-cache instead of hibernate-infinispan

b20a776

Switch from infinispan-spring-boot-starter to infinispan-spring-boot-…

37f224a

…starter-embedded

Update infinispan cache configuration

2ef8996

Merge pull request #8720 from DanielFran/spring-boot_2.1.0

41c7dd0

Update infinispan cache configuration

Upgrade dropwizard metrics version to 4.0.3

a941d9c

Merge pull request #8721 from DanielFran/spring-boot_2.1.0

4a4ad71

Upgrade dropwizard metrics version to 4.0.3

Use infinispan-hibernate-cache-v53 instead of infinispan-hibernate-cache

8c0fcb2

Merge pull request #8722 from DanielFran/spring-boot_2.1.0

ba214df

Use infinispan-hibernate-cache-v53 instead of infinispan-hibernate-cache

Added metrics-jmx

e58e442

Merge pull request #8723 from DanielFran/spring-boot_2.1.0

acd1059

Added metrics-jmx

Review metrics imports

7efc061

Merge pull request #8724 from DanielFran/spring-boot_2.1.0

e328ee9

Review metrics imports

Merge pull request #1 from jhipster/master

d9b2d8a

Update from Master

Merge branch 'spring-boot_2.1.0' into master

25b6cd0

Merge pull request #2 from DanielFran/master

e50cdc7

Update from Master

Merge pull request #8753 from DanielFran/spring-boot_2.1.0

33b2e47

Update from Master

DanielFran added 11 commits January 23, 2019 09:46

Merge pull request #9109 from DanielFran/spring-boot_2.1.0

5e18b21

Downgrade maven-enforcer-plugin version to 3.0.0-M1 due to regression issue

Upgrade jacoco-maven-plugin version to 0.8.3

713a8fa

Merge pull request #9115 from DanielFran/spring-boot_2.1.0

2ea0153

Upgrade jacoco-maven-plugin version to 0.8.3

Upgrade consul version to 1.4.1

62dcf87

Merge pull request #9116 from DanielFran/spring-boot_2.1.0

83ce65a

Upgrade consul version to 1.4.1

Upgrade traefik version to 1.7.8

a58412a

Upgrade consul version to 1.4.2

68274d9

Merge pull request #9149 from DanielFran/spring-boot_2.1.0

89baccf

Upgrade traefik version to 1.7.8

Merge pull request #9150 from DanielFran/spring-boot_2.1.0

fc03932

Upgrade consul version to 1.4.2

Upgrade sonar-maven-plugin version to 3.6.0.1398

3bed3dd

Merge pull request #9169 from DanielFran/spring-boot_2.1.0

992626e

Upgrade sonar-maven-plugin version to 3.6.0.1398

atomfrede added the v6 label Feb 8, 2019

DanielFran added 5 commits February 8, 2019 23:23

Switch to FixedPostgreSQL95Dialect

75ec026

Merge pull request #9226 from DanielFran/spring-boot_2.1.0

08808ee

Switch to FixedPostgreSQL95Dialect

Switch to FixedPostgreSQL95Dialect

3238046

Merge pull request #9227 from DanielFran/spring-boot_2.1.0

e012148

Switch to FixedPostgreSQL95Dialect

Merge branch 'master' into spring-boot_2.1.0

44fecd3

Merge branch 'master' into spring-boot_2.1.0 and resolve conflicts

murdos reviewed Feb 9, 2019

View reviewed changes

deepu105 merged commit c3803e5 into master Feb 9, 2019

deepu105 deleted the spring-boot_2.1.0 branch February 9, 2019 12:34

jdubois added this to the 6.0.0-beta.0 milestone Apr 4, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spring boot 2.1.0 #9222

Spring boot 2.1.0 #9222

deepu105 commented Feb 8, 2019 •

edited by DanielFran

Loading

deepu105 commented Feb 8, 2019

pascalgrimaud commented Feb 8, 2019

deepu105 commented Feb 8, 2019 via email

DanielFran commented Feb 9, 2019

DanielFran commented Feb 9, 2019 •

edited

Loading

pascalgrimaud commented Feb 9, 2019

murdos Feb 9, 2019

murdos Feb 9, 2019

murdos Feb 9, 2019

murdos Feb 9, 2019

DanielFran Feb 10, 2019

murdos Feb 9, 2019

DanielFran Feb 10, 2019

murdos Feb 9, 2019

deepu105 commented Feb 9, 2019

DanielFran commented Feb 9, 2019

DanielFran commented Feb 28, 2019

Spring boot 2.1.0 #9222

Spring boot 2.1.0 #9222

Conversation

deepu105 commented Feb 8, 2019 • edited by DanielFran Loading

deepu105 commented Feb 8, 2019

pascalgrimaud commented Feb 8, 2019

deepu105 commented Feb 8, 2019 via email

DanielFran commented Feb 9, 2019

DanielFran commented Feb 9, 2019 • edited Loading

pascalgrimaud commented Feb 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deepu105 commented Feb 9, 2019

DanielFran commented Feb 9, 2019

DanielFran commented Feb 28, 2019

deepu105 commented Feb 8, 2019 •

edited by DanielFran

Loading

DanielFran commented Feb 9, 2019 •

edited

Loading