From 9866cabaae00b8766c6e97bac61074b9b35a2909 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Fri, 5 Apr 2019 15:59:40 +0200 Subject: [PATCH] Upgraded Hibernate 5.3.9.Final to 5.4.2.Final Also configured the 5.4.2-tutorials as integration-test for the plugin --- pom.xml | 2 +- .../drop-tables-hsqldb.sql | 9 +++---- src/it/tutorials-5.4.2/annotations/pom.xml | 24 +++++++++++++++++ .../src/test/resources/hibernate.cfg.xml | 5 +--- src/it/tutorials-5.4.2/basic/pom.xml | 23 ++++++++++++++++ .../src/test/resources/hibernate.cfg.xml | 2 +- src/it/tutorials-5.4.2/entitymanager/pom.xml | 24 +++++++++++++++++ .../test/resources/META-INF/persistence.xml | 2 +- src/it/tutorials-5.4.2/envers/pom.xml | 24 +++++++++++++++++ .../test/resources/META-INF/persistence.xml | 2 +- .../tutorials-5.4.2/osgi/managed-jpa/pom.xml | 21 +++++++++++++++ .../osgi/unmanaged-jpa/pom.xml | 19 +++++++++++++ .../main/resources/META-INF/persistence.xml | 4 +-- .../osgi/unmanaged-native/pom.xml | 19 +++++++++++++ .../src/main/resources/hibernate.cfg.xml | 2 +- .../src/main/resources/pool-one.properties | 4 +-- src/it/tutorials-5.4.2/pom.xml | 1 + src/it/tutorials-5.4.2/schema-annotations.sql | 7 +++++ src/it/tutorials-5.4.2/schema-basic.sql | 7 +++++ .../tutorials-5.4.2/schema-entitymanager.sql | 7 +++++ src/it/tutorials-5.4.2/schema-envers.sql | 27 +++++++++++++++++++ .../schema-osgi-managed-jpa.sql | 7 +++++ .../schema-osgi-unmanaged-jpa.sql | 7 +++++ .../schema-osgi-unmanaged-native.sql | 26 ++++++++++++++++++ src/it/tutorials-5.4.2/verify.bsh | 19 +++++++++++++ src/it/update/update.sql | 2 +- 26 files changed, 276 insertions(+), 20 deletions(-) create mode 100644 src/it/tutorials-5.4.2/schema-annotations.sql create mode 100644 src/it/tutorials-5.4.2/schema-basic.sql create mode 100644 src/it/tutorials-5.4.2/schema-entitymanager.sql create mode 100644 src/it/tutorials-5.4.2/schema-envers.sql create mode 100644 src/it/tutorials-5.4.2/schema-osgi-managed-jpa.sql create mode 100644 src/it/tutorials-5.4.2/schema-osgi-unmanaged-jpa.sql create mode 100644 src/it/tutorials-5.4.2/schema-osgi-unmanaged-native.sql create mode 100644 src/it/tutorials-5.4.2/verify.bsh diff --git a/pom.xml b/pom.xml index 8d6e8432..d768239f 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ UTF-8 - 5.3.9.Final + 5.4.2.Final 3.0.1-b06 3.6.0 1.0.1 diff --git a/src/it/hibernate4-maven-plugin-envers-sample/drop-tables-hsqldb.sql b/src/it/hibernate4-maven-plugin-envers-sample/drop-tables-hsqldb.sql index b1387e80..c2ebbecd 100644 --- a/src/it/hibernate4-maven-plugin-envers-sample/drop-tables-hsqldb.sql +++ b/src/it/hibernate4-maven-plugin-envers-sample/drop-tables-hsqldb.sql @@ -1,12 +1,9 @@ - alter table TTL_EVENT_AUD - drop constraint FK295td34se5kaxwgo8i1ph0k4; + drop table if exists TTL_AUDIT_REVISION CASCADE ; - drop table TTL_AUDIT_REVISION if exists; + drop table if exists TTL_EVENT CASCADE ; - drop table TTL_EVENT if exists; - - drop table TTL_EVENT_AUD if exists; + drop table if exists TTL_EVENT_AUD CASCADE ; drop sequence TTL_AUDIT_REVISION_SEQ if exists; diff --git a/src/it/tutorials-5.4.2/annotations/pom.xml b/src/it/tutorials-5.4.2/annotations/pom.xml index ac85dce2..b062672c 100644 --- a/src/it/tutorials-5.4.2/annotations/pom.xml +++ b/src/it/tutorials-5.4.2/annotations/pom.xml @@ -23,6 +23,30 @@ true + @project.version@ + + + + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + + process-test-classes + + create + + + + + true + true + + + + + diff --git a/src/it/tutorials-5.4.2/annotations/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.4.2/annotations/src/test/resources/hibernate.cfg.xml index a9590c18..df29d830 100644 --- a/src/it/tutorials-5.4.2/annotations/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.4.2/annotations/src/test/resources/hibernate.cfg.xml @@ -15,7 +15,7 @@ org.h2.Driver - jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE + jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE sa @@ -31,9 +31,6 @@ true - - create - diff --git a/src/it/tutorials-5.4.2/basic/pom.xml b/src/it/tutorials-5.4.2/basic/pom.xml index 43e25859..e863c0af 100644 --- a/src/it/tutorials-5.4.2/basic/pom.xml +++ b/src/it/tutorials-5.4.2/basic/pom.xml @@ -23,6 +23,29 @@ true + @project.version@ + + + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + + process-test-classes + + create + + + + + true + true + + + + + diff --git a/src/it/tutorials-5.4.2/basic/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.4.2/basic/src/test/resources/hibernate.cfg.xml index 03d39373..df55e966 100644 --- a/src/it/tutorials-5.4.2/basic/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.4.2/basic/src/test/resources/hibernate.cfg.xml @@ -15,7 +15,7 @@ org.h2.Driver - jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE + jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE sa diff --git a/src/it/tutorials-5.4.2/entitymanager/pom.xml b/src/it/tutorials-5.4.2/entitymanager/pom.xml index b5b34ea5..be6f9ccc 100644 --- a/src/it/tutorials-5.4.2/entitymanager/pom.xml +++ b/src/it/tutorials-5.4.2/entitymanager/pom.xml @@ -23,6 +23,7 @@ true + @project.version@ @@ -33,4 +34,27 @@ + + + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + + process-test-classes + + create + + + + + true + org.hibernate.dialect.H2Dialect + true + + + + + diff --git a/src/it/tutorials-5.4.2/entitymanager/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.4.2/entitymanager/src/test/resources/META-INF/persistence.xml index 0fc95238..edf70053 100644 --- a/src/it/tutorials-5.4.2/entitymanager/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.4.2/entitymanager/src/test/resources/META-INF/persistence.xml @@ -18,7 +18,7 @@ - + diff --git a/src/it/tutorials-5.4.2/envers/pom.xml b/src/it/tutorials-5.4.2/envers/pom.xml index ea049588..bf04daab 100644 --- a/src/it/tutorials-5.4.2/envers/pom.xml +++ b/src/it/tutorials-5.4.2/envers/pom.xml @@ -23,6 +23,7 @@ true + @project.version@ @@ -33,4 +34,27 @@ + + + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + + process-test-classes + + create + + + + + true + org.hibernate.dialect.H2Dialect + true + + + + + diff --git a/src/it/tutorials-5.4.2/envers/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.4.2/envers/src/test/resources/META-INF/persistence.xml index 45a7dafe..fadc2a30 100644 --- a/src/it/tutorials-5.4.2/envers/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.4.2/envers/src/test/resources/META-INF/persistence.xml @@ -18,7 +18,7 @@ - + diff --git a/src/it/tutorials-5.4.2/osgi/managed-jpa/pom.xml b/src/it/tutorials-5.4.2/osgi/managed-jpa/pom.xml index 55ccacd3..35ad150e 100644 --- a/src/it/tutorials-5.4.2/osgi/managed-jpa/pom.xml +++ b/src/it/tutorials-5.4.2/osgi/managed-jpa/pom.xml @@ -12,6 +12,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -65,6 +69,23 @@ + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + + + create + + + + + jdbc:h2:mem:db_managed_jpa;MVCC=TRUE + true + false + + diff --git a/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/pom.xml b/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/pom.xml index ca5854ec..297fed2a 100644 --- a/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/pom.xml +++ b/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/pom.xml @@ -12,6 +12,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -76,6 +80,21 @@ + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + true + + + + + create + + + + diff --git a/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml b/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml index b0ebfe70..788ccab9 100644 --- a/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.4.2/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml @@ -15,10 +15,10 @@ - + - \ No newline at end of file + diff --git a/src/it/tutorials-5.4.2/osgi/unmanaged-native/pom.xml b/src/it/tutorials-5.4.2/osgi/unmanaged-native/pom.xml index 582ccfe5..ce9b548a 100644 --- a/src/it/tutorials-5.4.2/osgi/unmanaged-native/pom.xml +++ b/src/it/tutorials-5.4.2/osgi/unmanaged-native/pom.xml @@ -12,6 +12,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -84,6 +88,21 @@ + + de.juplo + hibernate-maven-plugin + ${hibernate-maven-plugin.version} + + true + + + + + create + + + + diff --git a/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml b/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml index 7f9f2380..175a2bf8 100644 --- a/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml @@ -12,7 +12,7 @@ org.h2.Driver - jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE + jdbc:h2:mem:db_unmanaged_native;DB_CLOSE_DELAY=-1;MVCC=TRUE sa org.hibernate.dialect.H2Dialect diff --git a/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/pool-one.properties b/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/pool-one.properties index 7e1c4cf1..0085971f 100644 --- a/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/pool-one.properties +++ b/src/it/tutorials-5.4.2/osgi/unmanaged-native/src/main/resources/pool-one.properties @@ -5,9 +5,9 @@ # See the lgpl.txt file in the root directory or . # jdbc-0.proxool.alias=pool-one -jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE +jdbc-0.proxool.driver-url=jdbc:h2:mem:db_unmanaged_native;DB_CLOSE_DELAY=-1;MVCC=TRUE jdbc-0.proxool.driver-class=org.h2.Driver jdbc-0.user=sa jdbc-0.password= jdbc-0.proxool.maximum-connection-count=2 -jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE \ No newline at end of file +jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE diff --git a/src/it/tutorials-5.4.2/pom.xml b/src/it/tutorials-5.4.2/pom.xml index 2b6add21..d20f8085 100644 --- a/src/it/tutorials-5.4.2/pom.xml +++ b/src/it/tutorials-5.4.2/pom.xml @@ -70,6 +70,7 @@ src/test/resources + true diff --git a/src/it/tutorials-5.4.2/schema-annotations.sql b/src/it/tutorials-5.4.2/schema-annotations.sql new file mode 100644 index 00000000..48eb18ef --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-annotations.sql @@ -0,0 +1,7 @@ + + create table EVENTS ( + id bigint not null, + EVENT_DATE timestamp, + title varchar(255), + primary key (id) + ); diff --git a/src/it/tutorials-5.4.2/schema-basic.sql b/src/it/tutorials-5.4.2/schema-basic.sql new file mode 100644 index 00000000..c5e2c0e7 --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-basic.sql @@ -0,0 +1,7 @@ + + create table EVENTS ( + EVENT_ID bigint not null, + EVENT_DATE timestamp, + title varchar(255), + primary key (EVENT_ID) + ); diff --git a/src/it/tutorials-5.4.2/schema-entitymanager.sql b/src/it/tutorials-5.4.2/schema-entitymanager.sql new file mode 100644 index 00000000..48eb18ef --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-entitymanager.sql @@ -0,0 +1,7 @@ + + create table EVENTS ( + id bigint not null, + EVENT_DATE timestamp, + title varchar(255), + primary key (id) + ); diff --git a/src/it/tutorials-5.4.2/schema-envers.sql b/src/it/tutorials-5.4.2/schema-envers.sql new file mode 100644 index 00000000..ecec80ef --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-envers.sql @@ -0,0 +1,27 @@ + + create table EVENTS ( + id bigint not null, + EVENT_DATE timestamp, + title varchar(255), + primary key (id) + ); + + create table EVENTS_AUD ( + id bigint not null, + REV integer not null, + REVTYPE tinyint, + EVENT_DATE timestamp, + title varchar(255), + primary key (id, REV) + ); + + create table REVINFO ( + REV integer generated by default as identity, + REVTSTMP bigint, + primary key (REV) + ); + + alter table EVENTS_AUD + add constraint FK5cembm6xahf542q8e4h0pq2t1 + foreign key (REV) + references REVINFO; diff --git a/src/it/tutorials-5.4.2/schema-osgi-managed-jpa.sql b/src/it/tutorials-5.4.2/schema-osgi-managed-jpa.sql new file mode 100644 index 00000000..de92e463 --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-osgi-managed-jpa.sql @@ -0,0 +1,7 @@ +create sequence hibernate_sequence start with 1 increment by 1; + + create table DataPoint ( + id bigint not null, + name varchar(255), + primary key (id) + ); diff --git a/src/it/tutorials-5.4.2/schema-osgi-unmanaged-jpa.sql b/src/it/tutorials-5.4.2/schema-osgi-unmanaged-jpa.sql new file mode 100644 index 00000000..de92e463 --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-osgi-unmanaged-jpa.sql @@ -0,0 +1,7 @@ +create sequence hibernate_sequence start with 1 increment by 1; + + create table DataPoint ( + id bigint not null, + name varchar(255), + primary key (id) + ); diff --git a/src/it/tutorials-5.4.2/schema-osgi-unmanaged-native.sql b/src/it/tutorials-5.4.2/schema-osgi-unmanaged-native.sql new file mode 100644 index 00000000..d89e2801 --- /dev/null +++ b/src/it/tutorials-5.4.2/schema-osgi-unmanaged-native.sql @@ -0,0 +1,26 @@ +create sequence hibernate_sequence start with 1 increment by 1; + + create table DataPoint ( + id bigint not null, + name varchar(255), + primary key (id) + ); + + create table DataPoint_AUD ( + id bigint not null, + REV integer not null, + REVTYPE tinyint, + name varchar(255), + primary key (id, REV) + ); + + create table REVINFO ( + REV integer generated by default as identity, + REVTSTMP bigint, + primary key (REV) + ); + + alter table DataPoint_AUD + add constraint FK43jw6b5mtbfxur0xhyjxynbea + foreign key (REV) + references REVINFO; diff --git a/src/it/tutorials-5.4.2/verify.bsh b/src/it/tutorials-5.4.2/verify.bsh new file mode 100644 index 00000000..9156c4af --- /dev/null +++ b/src/it/tutorials-5.4.2/verify.bsh @@ -0,0 +1,19 @@ +import de.juplo.test.FileComparator; + + +FileComparator comparator = new FileComparator(basedir); + +if (!comparator.isEqual("schema-annotations.sql","annotations/target/create.sql")) + return false; +if (!comparator.isEqual("schema-basic.sql","basic/target/create.sql")) + return false; +if (!comparator.isEqual("schema-entitymanager.sql","entitymanager/target/create.sql")) + return false; +if (!comparator.isEqual("schema-envers.sql","envers/target/create.sql")) + return false; +if (!comparator.isEqual("schema-osgi-managed-jpa.sql","osgi/managed-jpa/target/create.sql")) + return false; +if (!comparator.isEqual("schema-osgi-unmanaged-jpa.sql","osgi/unmanaged-jpa/target/create.sql")) + return false; +if (!comparator.isEqual("schema-osgi-unmanaged-native.sql","osgi/unmanaged-native/target/create.sql")) + return false; diff --git a/src/it/update/update.sql b/src/it/update/update.sql index d739136f..2d5d891f 100644 --- a/src/it/update/update.sql +++ b/src/it/update/update.sql @@ -1,3 +1,3 @@ - alter table TEST.PUBLIC.EVENTS + alter table EVENTS add column MY_NEW_EVENT_DATE_COLUMN timestamp; -- 2.20.1