From: Kai Moritz <kai@juplo.de> Date: Fri, 5 Apr 2019 11:01:23 +0000 (+0200) Subject: Configured the 5.1.17-tutorials as integration-tests for the plugin X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=a57a7eb67922b3ad35fa2b18923d34993dc3fdbe;p=hibernate-maven-plugin Configured the 5.1.17-tutorials as integration-tests for the plugin --- diff --git a/src/it/tutorials-5.1.17/annotations/pom.xml b/src/it/tutorials-5.1.17/annotations/pom.xml index 086cb85d..af825692 100644 --- a/src/it/tutorials-5.1.17/annotations/pom.xml +++ b/src/it/tutorials-5.1.17/annotations/pom.xml @@ -23,6 +23,30 @@ <properties> <!-- Skip artifact deployment --> <maven.deploy.skip>true</maven.deploy.skip> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> </properties> + + <build> + <plugins> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <executions> + <execution> + <phase>process-test-classes</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <scanTestClasses>true</scanTestClasses> + <format>true</format> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/src/it/tutorials-5.1.17/annotations/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.1.17/annotations/src/test/resources/hibernate.cfg.xml index a9590c18..df29d830 100644 --- a/src/it/tutorials-5.1.17/annotations/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.1.17/annotations/src/test/resources/hibernate.cfg.xml @@ -15,7 +15,7 @@ <!-- Database connection settings --> <property name="connection.driver_class">org.h2.Driver</property> - <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property> + <property name="connection.url">jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE</property> <property name="connection.username">sa</property> <property name="connection.password"></property> @@ -31,9 +31,6 @@ <!-- Echo all executed SQL to stdout --> <property name="show_sql">true</property> - <!-- Drop and re-create the database schema on startup --> - <property name="hbm2ddl.auto">create</property> - <!-- Names the annotated entity class --> <mapping class="org.hibernate.tutorial.annotations.Event"/> diff --git a/src/it/tutorials-5.1.17/basic/pom.xml b/src/it/tutorials-5.1.17/basic/pom.xml index 26c311c5..64589918 100644 --- a/src/it/tutorials-5.1.17/basic/pom.xml +++ b/src/it/tutorials-5.1.17/basic/pom.xml @@ -23,6 +23,29 @@ <properties> <!-- Skip artifact deployment --> <maven.deploy.skip>true</maven.deploy.skip> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> </properties> + <build> + <plugins> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <executions> + <execution> + <phase>process-test-classes</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <scanTestClasses>true</scanTestClasses> + <format>true</format> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/src/it/tutorials-5.1.17/basic/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.1.17/basic/src/test/resources/hibernate.cfg.xml index 03d39373..df55e966 100644 --- a/src/it/tutorials-5.1.17/basic/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.1.17/basic/src/test/resources/hibernate.cfg.xml @@ -15,7 +15,7 @@ <!-- Database connection settings --> <property name="connection.driver_class">org.h2.Driver</property> - <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property> + <property name="connection.url">jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE</property> <property name="connection.username">sa</property> <property name="connection.password"/> diff --git a/src/it/tutorials-5.1.17/entitymanager/pom.xml b/src/it/tutorials-5.1.17/entitymanager/pom.xml index 152590bb..b128a58b 100644 --- a/src/it/tutorials-5.1.17/entitymanager/pom.xml +++ b/src/it/tutorials-5.1.17/entitymanager/pom.xml @@ -23,6 +23,7 @@ <properties> <!-- Skip artifact deployment --> <maven.deploy.skip>true</maven.deploy.skip> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> </properties> <dependencies> @@ -33,4 +34,27 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <executions> + <execution> + <phase>process-test-classes</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <scanTestClasses>true</scanTestClasses> + <dialect>org.hibernate.dialect.H2Dialect</dialect> + <format>true</format> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/src/it/tutorials-5.1.17/entitymanager/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.1.17/entitymanager/src/test/resources/META-INF/persistence.xml index 0fc95238..edf70053 100644 --- a/src/it/tutorials-5.1.17/entitymanager/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.1.17/entitymanager/src/test/resources/META-INF/persistence.xml @@ -18,7 +18,7 @@ <properties> <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" /> - <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" /> + <property name="javax.persistence.jdbc.url" value="jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE" /> <property name="javax.persistence.jdbc.user" value="sa" /> <property name="javax.persistence.jdbc.password" value="" /> diff --git a/src/it/tutorials-5.1.17/envers/pom.xml b/src/it/tutorials-5.1.17/envers/pom.xml index 56507f83..30a1130b 100644 --- a/src/it/tutorials-5.1.17/envers/pom.xml +++ b/src/it/tutorials-5.1.17/envers/pom.xml @@ -23,6 +23,7 @@ <properties> <!-- Skip artifact deployment --> <maven.deploy.skip>true</maven.deploy.skip> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> </properties> <dependencies> @@ -38,4 +39,27 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <executions> + <execution> + <phase>process-test-classes</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <scanTestClasses>true</scanTestClasses> + <dialect>org.hibernate.dialect.H2Dialect</dialect> + <format>true</format> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/src/it/tutorials-5.1.17/envers/pom.xml.orig b/src/it/tutorials-5.1.17/envers/pom.xml.orig new file mode 100644 index 00000000..56507f83 --- /dev/null +++ b/src/it/tutorials-5.1.17/envers/pom.xml.orig @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later. + ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate.tutorials</groupId> + <artifactId>hibernate-tutorials</artifactId> + <version>5.1.17.Final</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hibernate-tutorial-envers</artifactId> + <name>Hibernate Envers Tutorial</name> + <description>Hibernate tutorial illustrating basic set up and use of Envers</description> + + <properties> + <!-- Skip artifact deployment --> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-envers</artifactId> + <version>5.1.17.Final</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>5.1.17.Final</version> + </dependency> + </dependencies> + +</project> diff --git a/src/it/tutorials-5.1.17/envers/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.1.17/envers/src/test/resources/META-INF/persistence.xml index 45a7dafe..fadc2a30 100644 --- a/src/it/tutorials-5.1.17/envers/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.1.17/envers/src/test/resources/META-INF/persistence.xml @@ -18,7 +18,7 @@ <properties> <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" /> - <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" /> + <property name="javax.persistence.jdbc.url" value="jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE" /> <property name="javax.persistence.jdbc.user" value="sa" /> <property name="javax.persistence.jdbc.password" value="" /> diff --git a/src/it/tutorials-5.1.17/osgi/managed-jpa/pom.xml b/src/it/tutorials-5.1.17/osgi/managed-jpa/pom.xml index 55ccacd3..35ad150e 100644 --- a/src/it/tutorials-5.1.17/osgi/managed-jpa/pom.xml +++ b/src/it/tutorials-5.1.17/osgi/managed-jpa/pom.xml @@ -12,6 +12,10 @@ <version>1.0.0</version> <packaging>bundle</packaging> + <properties> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> + </properties> + <dependencies> <dependency> <groupId>org.hibernate.javax.persistence</groupId> @@ -65,6 +69,23 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <executions> + <execution> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <url>jdbc:h2:mem:db_managed_jpa;MVCC=TRUE</url> + <format>true</format> + <execute>false</execute> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/pom.xml b/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/pom.xml index abb36a40..4243c138 100644 --- a/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/pom.xml +++ b/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/pom.xml @@ -12,6 +12,10 @@ <version>1.0.0</version> <packaging>bundle</packaging> + <properties> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> + </properties> + <dependencies> <dependency> <groupId>org.hibernate.javax.persistence</groupId> @@ -76,6 +80,21 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <configuration> + <format>true</format> + </configuration> + <executions> + <execution> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml b/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml index b0ebfe70..788ccab9 100644 --- a/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml +++ b/src/it/tutorials-5.1.17/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml @@ -15,10 +15,10 @@ <properties> <property name="hibernate.connection.driver_class" value="org.h2.Driver"/> <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> - <property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/> + <property name="hibernate.connection.url" value="jdbc:h2:mem:db_unmanaged_jpa;DB_CLOSE_DELAY=-1;MVCC=TRUE"/> <property name="hibernate.connection.username" value="sa"/> <property name="hibernate.connection.password" value=""/> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> </properties> </persistence-unit> -</persistence> \ No newline at end of file +</persistence> diff --git a/src/it/tutorials-5.1.17/osgi/unmanaged-native/pom.xml b/src/it/tutorials-5.1.17/osgi/unmanaged-native/pom.xml index c32e578c..7c70c48b 100644 --- a/src/it/tutorials-5.1.17/osgi/unmanaged-native/pom.xml +++ b/src/it/tutorials-5.1.17/osgi/unmanaged-native/pom.xml @@ -12,6 +12,10 @@ <version>1.0.0</version> <packaging>bundle</packaging> + <properties> + <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version> + </properties> + <dependencies> <dependency> <groupId>org.hibernate.javax.persistence</groupId> @@ -84,6 +88,21 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate-maven-plugin</artifactId> + <version>${hibernate-maven-plugin.version}</version> + <configuration> + <format>true</format> + </configuration> + <executions> + <execution> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml b/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml index 7f9f2380..175a2bf8 100644 --- a/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml +++ b/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml @@ -12,7 +12,7 @@ <hibernate-configuration> <session-factory> <property name="hibernate.connection.driver_class">org.h2.Driver</property> - <property name="hibernate.connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property> + <property name="hibernate.connection.url">jdbc:h2:mem:db_unmanaged_native;DB_CLOSE_DELAY=-1;MVCC=TRUE</property> <property name="hibernate.connection.username">sa</property> <property name="hibernate.connection.password"></property> <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property> diff --git a/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/pool-one.properties b/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/pool-one.properties index 7e1c4cf1..0085971f 100644 --- a/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/pool-one.properties +++ b/src/it/tutorials-5.1.17/osgi/unmanaged-native/src/main/resources/pool-one.properties @@ -5,9 +5,9 @@ # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. # 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.1.17/pom.xml b/src/it/tutorials-5.1.17/pom.xml index d7abcae7..c85a7e81 100644 --- a/src/it/tutorials-5.1.17/pom.xml +++ b/src/it/tutorials-5.1.17/pom.xml @@ -70,6 +70,7 @@ </testResource> <testResource> <directory>src/test/resources</directory> + <filtering>true</filtering> </testResource> </testResources> </build> diff --git a/src/it/tutorials-5.1.17/schema-annotations.sql b/src/it/tutorials-5.1.17/schema-annotations.sql new file mode 100644 index 00000000..48eb18ef --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-basic.sql b/src/it/tutorials-5.1.17/schema-basic.sql new file mode 100644 index 00000000..c5e2c0e7 --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-entitymanager.sql b/src/it/tutorials-5.1.17/schema-entitymanager.sql new file mode 100644 index 00000000..48eb18ef --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-envers.sql b/src/it/tutorials-5.1.17/schema-envers.sql new file mode 100644 index 00000000..ecec80ef --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-osgi-managed-jpa.sql b/src/it/tutorials-5.1.17/schema-osgi-managed-jpa.sql new file mode 100644 index 00000000..de92e463 --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-osgi-unmanaged-jpa.sql b/src/it/tutorials-5.1.17/schema-osgi-unmanaged-jpa.sql new file mode 100644 index 00000000..de92e463 --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/schema-osgi-unmanaged-native.sql b/src/it/tutorials-5.1.17/schema-osgi-unmanaged-native.sql new file mode 100644 index 00000000..d89e2801 --- /dev/null +++ b/src/it/tutorials-5.1.17/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.1.17/verify.bsh b/src/it/tutorials-5.1.17/verify.bsh new file mode 100644 index 00000000..9156c4af --- /dev/null +++ b/src/it/tutorials-5.1.17/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;