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

Update liquibase version to 4.15.0 #19242

Merged
merged 14 commits into from
Aug 27, 2022
Merged

Update liquibase version to 4.15.0 #19242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fcea1e6
Update liquibase version to 4.14.0
DanielFran Jul 26, 2022
ac67aee
Update h2 version to 2.1.214
DanielFran Jul 26, 2022
b668b34
Update h2-rdbc version to 0.9.1.RELEASE
DanielFran Jul 26, 2022
4ffb31f
Remove override of H2 and H2 R2DBC version
DanielFran Jul 27, 2022
337b790
liquibase reactive types should match imperative ones
mshima Jul 28, 2022
98f28df
Merge remote-tracking branch 'upstream/main' into skip-ci_liquibase-4…
DanielFran Jul 31, 2022
2a25689
Update liquibase version to 4.15.0
DanielFran Aug 5, 2022
818a347
Update generators/server/templates/build.gradle.ejs
mshima Aug 5, 2022
643270a
revert r2dbc driver
mshima Aug 6, 2022
be6897c
Merge remote-tracking branch 'origin/skip-ci_liquibase-4.14.0' into s…
DanielFran Aug 18, 2022
5c2aaea
Merge branch 'main' into skip-ci_liquibase-4.14.0
Aug 23, 2022
b438ee9
Update pom.xml.ejs
mshima Aug 24, 2022
d46d470
test with legacy mode
mshima Aug 26, 2022
c27bf47
adjust test
mshima Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions generators/generator-constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,13 @@ const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
const JHIPSTER_DEPENDENCIES_VERSION = '7.9.3-SNAPSHOT';
// The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
const SPRING_BOOT_VERSION = '2.7.3';
const LIQUIBASE_VERSION = '4.12.0';
const LIQUIBASE_VERSION = '4.15.0';
// TODO v8: Remove this constant
const LIQUIBASE_DTD_VERSION = 'latest';
const HIBERNATE_VERSION = '5.6.10.Final';
const JACOCO_VERSION = '0.8.8';
const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.3';
const JIB_VERSION = '3.2.1';
// TODO upgrade to h2 v2 once liquibase issues has been addressed
const H2_VERSION = '1.4.200';
// Version 0.9.x is not compatible with h2 v1
const H2_R2DBC_VERSION = '0.8.5.RELEASE';

// Version of docker images
const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
Expand Down Expand Up @@ -416,8 +412,6 @@ const constants = {
JIB_VERSION,
JACOCO_VERSION,
JACKSON_DATABIND_NULLABLE_VERSION,
H2_VERSION,
H2_R2DBC_VERSION,

// Docker
DOCKER_COMPOSE_FORMAT_VERSION,
Expand Down
2 changes: 0 additions & 2 deletions generators/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
this.JACKSON_DATABIND_NULLABLE_VERSION = constants.JACKSON_DATABIND_NULLABLE_VERSION;
this.JACOCO_VERSION = constants.JACOCO_VERSION;
this.JIB_VERSION = constants.JIB_VERSION;
this.H2_VERSION = constants.H2_VERSION;
this.H2_R2DBC_VERSION = constants.H2_R2DBC_VERSION;

this.ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
this.VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
Expand Down
6 changes: 0 additions & 6 deletions generators/server/templates/build.gradle.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,6 @@ configurations {
// Inherited version from Spring Boot can't be used because of regressions:
// To be removed as soon as spring-boot use the same version
force 'org.liquibase:liquibase-core:<%= LIQUIBASE_VERSION %>'
mshima marked this conversation as resolved.
Show resolved Hide resolved
<%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
force 'com.h2database:h2:<%= H2_VERSION %>'
<%_ if (reactive) { _%>
force 'io.r2dbc:r2dbc-h2:<%= H2_R2DBC_VERSION %>'
<%_ } _%>
<%_ } _%>
}
}
}
Expand Down
13 changes: 0 additions & 13 deletions generators/server/templates/pom.xml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@
<liquibase.version><%= LIQUIBASE_VERSION %></liquibase.version>
<%_ if (!reactive) { _%>
<liquibase-hibernate5.version><%= LIQUIBASE_VERSION %></liquibase-hibernate5.version>
<%_ } _%>
<%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
<h2.version><%= H2_VERSION %></h2.version>
<%_ if (reactive) { _%>
<h2-r2dbc.version><%= H2_R2DBC_VERSION %></h2-r2dbc.version>
<%_ } _%>
<%_ } _%>
<validation-api.version>2.0.1.Final</validation-api.version>
<%_ if (reactive) { _%>
Expand Down Expand Up @@ -1585,15 +1579,11 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<%_ if (prodDatabaseTypeMysql || reactive) { _%>
<version>${h2.version}</version>
<%_ } _%>
</dependency>
<%_ if (reactive) { _%>
<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-h2</artifactId>
<version>${h2-r2dbc.version}</version>
</dependency>
<%_ } _%>
<%_ } _%>
Expand Down Expand Up @@ -1782,9 +1772,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<%_ if (prodDatabaseTypeMysql || reactive) { _%>
<version>${h2.version}</version>
<%_ } _%>
</dependency>
<%_ } _%>
</dependencies>
Expand Down
11 changes: 3 additions & 8 deletions generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@
<property name="uuidType" value="uuid" dbms="h2"/>
<%_ } _%>
<property name="datetimeType" value="datetime" dbms="h2"/>
<%_ if (reactive) { _%>
<property name="clobType" value="varchar(1000000)" dbms="h2"/>
<property name="blobType" value="varchar(1000000)" dbms="h2"/>
<%_ } else { _%>
<%_ if (prodDatabaseTypePostgres) { _%>
<%_ if (prodDatabaseTypePostgres) { _%>
<property name="clobType" value="longvarchar" dbms="h2"/>
<%_ } else { _%>
<%_ } else { _%>
<property name="clobType" value="clob" dbms="h2"/>
<%_ } _%>
<property name="blobType" value="blob" dbms="h2"/>
<%_ } _%>
<property name="blobType" value="blob" dbms="h2"/>
<%_ } _%>
<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
<property name="now" value="now()" dbms="mysql"/>
Expand Down
4 changes: 2 additions & 2 deletions generators/sql-constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ const databaseData = {
[H2_DISK]: {
protocolSuffix: 'h2:file:',
useDirectory: true,
extraOptions: ';DB_CLOSE_DELAY=-1',
extraOptions: ';DB_CLOSE_DELAY=-1;MODE=LEGACY',
r2dbc: {
protocolSuffix: 'h2:file://',
},
},
[H2_MEMORY]: {
protocolSuffix: 'h2:mem:',
extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE',
extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY',
r2dbc: {
protocolSuffix: 'h2:mem:///',
},
Expand Down
8 changes: 4 additions & 4 deletions test/generator-base.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ describe('Generator Base', () => {
describe('when called for h2Disk', () => {
it('return jdbc:h2:file:./build/h2db/db/test;DB_CLOSE_DELAY=-1', () => {
expect(BaseGenerator.getJDBCUrl(H2_DISK, { databaseName: 'test', localDirectory: './build/h2db/db' })).to.equal(
'jdbc:h2:file:./build/h2db/db/test;DB_CLOSE_DELAY=-1'
'jdbc:h2:file:./build/h2db/db/test;DB_CLOSE_DELAY=-1;MODE=LEGACY'
);
});
});
Expand All @@ -622,7 +622,7 @@ describe('Generator Base', () => {
describe('when called for h2Memory', () => {
it('return jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE', () => {
expect(BaseGenerator.getJDBCUrl(H2_MEMORY, { databaseName: 'test' })).to.equal(
'jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE'
'jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY'
);
});
});
Expand Down Expand Up @@ -696,7 +696,7 @@ describe('Generator Base', () => {
describe('when called for h2Disk', () => {
it('return r2dbc:h2:file:./build/h2db/db/test;DB_CLOSE_DELAY=-1', () => {
expect(BaseGenerator.getR2DBCUrl(H2_DISK, { databaseName: 'test', localDirectory: './build/h2db/db' })).to.equal(
'r2dbc:h2:file://./build/h2db/db/test;DB_CLOSE_DELAY=-1'
'r2dbc:h2:file://./build/h2db/db/test;DB_CLOSE_DELAY=-1;MODE=LEGACY'
);
});
});
Expand All @@ -717,7 +717,7 @@ describe('Generator Base', () => {
describe('when called for h2Memory', () => {
it('return r2dbc:h2:mem:///test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE', () => {
expect(BaseGenerator.getR2DBCUrl(H2_MEMORY, { databaseName: 'test' })).to.equal(
'r2dbc:h2:mem:///test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE'
'r2dbc:h2:mem:///test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY'
);
});
});
Expand Down