From 2d1149ca560cad7f81a7ad961ea50d039c6005d9 Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:37:47 +0100 Subject: [PATCH 1/9] Upgrade spring-boot version to 2.1.5.RELEASE --- generators/server/templates/gradle.properties.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs index f4649449ef57..e94dab330c99 100644 --- a/generators/server/templates/gradle.properties.ejs +++ b/generators/server/templates/gradle.properties.ejs @@ -28,7 +28,7 @@ yarn_version=<%= YARN_VERSION %> jhipster_dependencies_version=3.0.1 # The spring-boot version should match the one managed by # https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster_dependencies_version} -spring_boot_version=2.1.4.RELEASE +spring_boot_version=2.1.5.RELEASE # The hibernate version should match the one managed by # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} --> hibernate_version=5.3.9.Final From 88a0834c6ca645c9609c8c4b2566f91f7f0482f2 Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:38:00 +0100 Subject: [PATCH 2/9] Upgrade spring-boot version to 2.1.5.RELEASE --- generators/server/templates/pom.xml.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 6f093616027d..5725a69f2ca1 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -83,7 +83,7 @@ 3.0.1 - 2.1.4.RELEASE + 2.1.5.RELEASE <%_ if (databaseType === 'sql') { _%> From 78c79940c55a56b80389970fd5fc4860832e7f6a Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:38:26 +0100 Subject: [PATCH 3/9] Upgrade hibernate version to 5.3.10.Final --- generators/server/templates/gradle.properties.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs index e94dab330c99..2ca7098442a1 100644 --- a/generators/server/templates/gradle.properties.ejs +++ b/generators/server/templates/gradle.properties.ejs @@ -31,7 +31,7 @@ jhipster_dependencies_version=3.0.1 spring_boot_version=2.1.5.RELEASE # The hibernate version should match the one managed by # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} --> -hibernate_version=5.3.9.Final +hibernate_version=5.3.10.Final mapstruct_version=1.3.0.Final liquibase_hibernate5_version=3.6 From 56a409a8c50186234814f2f2a7b3f504750426ce Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:38:43 +0100 Subject: [PATCH 4/9] Upgrade hibernate version to 5.3.10.Final --- generators/server/templates/pom.xml.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 5725a69f2ca1..88c2fc379c41 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -87,7 +87,7 @@ <%_ if (databaseType === 'sql') { _%> - 5.3.9.Final + 5.3.10.Final 3.23.1-GA From 1e0d8f60b6153ed133895536c5b175d069d899de Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:40:56 +0100 Subject: [PATCH 5/9] Upgrade spring-framework version to 5.1.7.RELEASE --- generators/server/templates/pom.xml.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 88c2fc379c41..48ca136d76dd 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -100,7 +100,7 @@ <%_ if (devDatabaseType === 'h2Disk') { _%> 1.4.199 <%_ } _%> - 5.1.5.RELEASE + 5.1.7.RELEASE 2.0.1.Final <%_ } _%> <%_ if (databaseType === 'sql' || authenticationType === 'uaa') { _%> From c68f2d12a4f17d53cbb92a467c16e68f93e153ff Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 13:44:39 +0100 Subject: [PATCH 6/9] Upgrade spring-framework version to 5.1.7.RELEASE --- generators/server/templates/pom.xml.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 48ca136d76dd..0d79a2e96f5d 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -85,6 +85,9 @@ https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} --> 2.1.5.RELEASE <%_ if (databaseType === 'sql') { _%> + + 5.1.7.RELEASE 5.3.10.Final @@ -100,7 +103,6 @@ <%_ if (devDatabaseType === 'h2Disk') { _%> 1.4.199 <%_ } _%> - 5.1.7.RELEASE 2.0.1.Final <%_ } _%> <%_ if (databaseType === 'sql' || authenticationType === 'uaa') { _%> From d2d16f7c2ca77e34ef46561b07cb038c699a4c32 Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 23:40:35 +0100 Subject: [PATCH 7/9] Upgrade liquibase-hibernate5 version to 3.7 --- generators/server/templates/pom.xml.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 0d79a2e96f5d..1bde5a58fcb5 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -97,7 +97,7 @@ 3.6.3 - 3.6 + 3.7 5.3.8.Final <%_ if (devDatabaseType === 'h2Disk') { _%> From 576a3f699326b23c6eb5ade1d3b9ee5fcd8019e4 Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 23:40:47 +0100 Subject: [PATCH 8/9] Upgrade liquibase-hibernate5 version to 3.7 --- generators/server/templates/gradle.properties.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs index 2ca7098442a1..e0e04c0bea4c 100644 --- a/generators/server/templates/gradle.properties.ejs +++ b/generators/server/templates/gradle.properties.ejs @@ -34,7 +34,7 @@ spring_boot_version=2.1.5.RELEASE hibernate_version=5.3.10.Final mapstruct_version=1.3.0.Final -liquibase_hibernate5_version=3.6 +liquibase_hibernate5_version=3.7 liquibaseTaskPrefix=liquibase <%_ if (databaseType === 'sql' || authenticationType === 'uaa') { _%> From d7dcc5532cd77afef0ab87be60983569de05b360 Mon Sep 17 00:00:00 2001 From: DanielFran Date: Mon, 13 May 2019 23:50:08 +0100 Subject: [PATCH 9/9] Fix dependencies for liquibase-maven-plugin --- generators/server/templates/pom.xml.ejs | 41 ++----------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 1bde5a58fcb5..f0b70681558a 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -85,9 +85,6 @@ https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} --> 2.1.5.RELEASE <%_ if (databaseType === 'sql') { _%> - - 5.1.7.RELEASE 5.3.10.Final @@ -98,11 +95,6 @@ https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} --> 3.6.3 3.7 - - 5.3.8.Final - <%_ if (devDatabaseType === 'h2Disk') { _%> - 1.4.199 - <%_ } _%> 2.0.1.Final <%_ } _%> <%_ if (databaseType === 'sql' || authenticationType === 'uaa') { _%> @@ -1033,16 +1025,6 @@ <%_ } _%> - - org.hibernate - hibernate-core - ${hibernate-core.version} - - - org.javassist - javassist - ${javassist.version} - org.liquibase.ext liquibase-hibernate5 @@ -1058,27 +1040,10 @@ validation-api ${validation-api.version} - <%_ if (devDatabaseType === 'h2Disk') { _%> - com.h2database - h2 - ${h2.version} - - <%_ } _%> - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} + org.javassist + javassist + ${javassist.version}