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.

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

Update liquibase-hibernate5 version to 3.7 & fix liquibase dependencies #9740

Closed
wants to merge 9 commits into from
6 changes: 3 additions & 3 deletions generators/server/templates/gradle.properties.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ 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
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') { _%>
Expand Down
45 changes: 6 additions & 39 deletions generators/server/templates/pom.xml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,18 @@
<jhipster-dependencies.version>3.0.1</jhipster-dependencies.version>
<!-- 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>
<spring-boot.version>2.1.5.RELEASE</spring-boot.version>
<%_ if (databaseType === 'sql') { _%>
<!-- 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>
<hibernate.version>5.3.10.Final</hibernate.version>
<!-- The javassist version should match the one managed by
https://mvnrepository.com/artifact/org.hibernate/hibernate-core/${hibernate.version} -->
<javassist.version>3.23.1-GA</javassist.version>
<!-- The liquibase version should match the one managed by
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
<liquibase.version>3.6.3</liquibase.version>
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
<!-- The hibernate version to be used to override default version of liquibase maven plugin -->
<hibernate-core.version>5.3.8.Final</hibernate-core.version>
<%_ if (devDatabaseType === 'h2Disk') { _%>
<h2.version>1.4.199</h2.version>
<%_ } _%>
<spring.version>5.1.5.RELEASE</spring.version>
<liquibase-hibernate5.version>3.7</liquibase-hibernate5.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<%_ } _%>
<%_ if (databaseType === 'sql' || authenticationType === 'uaa') { _%>
Expand Down Expand Up @@ -1031,16 +1025,6 @@
<%_ } _%>
</configuration>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-hibernate5</artifactId>
Expand All @@ -1056,27 +1040,10 @@
<artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency>
<%_ if (devDatabaseType === 'h2Disk') { _%>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
<%_ } _%>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down