From b3f8db2fdd9eddbaac002f94068dd1b4e6aef9a8 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Tue, 5 May 2015 12:43:15 +0200 Subject: [PATCH] Configured hibernate-tutorials to use the plugin --- src/it/tutorials/annotations/pom.xml | 23 ++++++++++++++++++ .../src/test/resources/hibernate.cfg.xml | 5 +--- src/it/tutorials/basic/pom.xml | 22 +++++++++++++++++ .../src/test/resources/hibernate.cfg.xml | 2 +- src/it/tutorials/entitymanager/pom.xml | 23 ++++++++++++++++++ .../test/resources/META-INF/persistence.xml | 2 +- src/it/tutorials/envers/pom.xml | 23 ++++++++++++++++++ .../test/resources/META-INF/persistence.xml | 2 +- src/it/tutorials/osgi/managed-jpa/pom.xml | 24 +++++++++++++++++++ src/it/tutorials/osgi/unmanaged-jpa/pom.xml | 16 +++++++++++++ .../tutorials/osgi/unmanaged-native/pom.xml | 16 +++++++++++++ src/it/tutorials/pom.xml | 1 + 12 files changed, 152 insertions(+), 7 deletions(-) diff --git a/src/it/tutorials/annotations/pom.xml b/src/it/tutorials/annotations/pom.xml index 50a9a9ee..fc816f65 100644 --- a/src/it/tutorials/annotations/pom.xml +++ b/src/it/tutorials/annotations/pom.xml @@ -40,6 +40,29 @@ true + @project.version@ + + + + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + process-test-classes + + export + + + + + true + + + + + diff --git a/src/it/tutorials/annotations/src/test/resources/hibernate.cfg.xml b/src/it/tutorials/annotations/src/test/resources/hibernate.cfg.xml index aa1abfde..d9ae1f53 100644 --- a/src/it/tutorials/annotations/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials/annotations/src/test/resources/hibernate.cfg.xml @@ -32,7 +32,7 @@ org.h2.Driver - jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE + jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE sa @@ -48,9 +48,6 @@ true - - create - diff --git a/src/it/tutorials/basic/pom.xml b/src/it/tutorials/basic/pom.xml index 49d26352..5a064d44 100644 --- a/src/it/tutorials/basic/pom.xml +++ b/src/it/tutorials/basic/pom.xml @@ -40,6 +40,28 @@ true + @project.version@ + + + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + process-test-classes + + export + + + + + true + + + + + diff --git a/src/it/tutorials/basic/src/test/resources/hibernate.cfg.xml b/src/it/tutorials/basic/src/test/resources/hibernate.cfg.xml index dc795840..8144f2d2 100644 --- a/src/it/tutorials/basic/src/test/resources/hibernate.cfg.xml +++ b/src/it/tutorials/basic/src/test/resources/hibernate.cfg.xml @@ -32,7 +32,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/entitymanager/pom.xml b/src/it/tutorials/entitymanager/pom.xml index 6df92404..5ec5b691 100644 --- a/src/it/tutorials/entitymanager/pom.xml +++ b/src/it/tutorials/entitymanager/pom.xml @@ -40,6 +40,7 @@ true + @project.version@ @@ -50,4 +51,26 @@ + + + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + process-test-classes + + export + + + + + true + org.hibernate.dialect.H2Dialect + + + + + diff --git a/src/it/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml b/src/it/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml index 07a891da..ac112251 100644 --- a/src/it/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml @@ -35,7 +35,7 @@ - + diff --git a/src/it/tutorials/envers/pom.xml b/src/it/tutorials/envers/pom.xml index 595df378..9980de39 100644 --- a/src/it/tutorials/envers/pom.xml +++ b/src/it/tutorials/envers/pom.xml @@ -40,6 +40,7 @@ true + @project.version@ @@ -55,4 +56,26 @@ + + + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + process-test-classes + + export + + + + + true + org.hibernate.dialect.H2Dialect + + + + + diff --git a/src/it/tutorials/envers/src/test/resources/META-INF/persistence.xml b/src/it/tutorials/envers/src/test/resources/META-INF/persistence.xml index ddafb8b7..fae72760 100644 --- a/src/it/tutorials/envers/src/test/resources/META-INF/persistence.xml +++ b/src/it/tutorials/envers/src/test/resources/META-INF/persistence.xml @@ -35,7 +35,7 @@ - + diff --git a/src/it/tutorials/osgi/managed-jpa/pom.xml b/src/it/tutorials/osgi/managed-jpa/pom.xml index 18102862..08ef2fea 100755 --- a/src/it/tutorials/osgi/managed-jpa/pom.xml +++ b/src/it/tutorials/osgi/managed-jpa/pom.xml @@ -6,6 +6,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -27,6 +31,11 @@ org.apache.karaf.shell.console 2.3.0 + + com.h2database + h2 + 1.4.187 + @@ -59,6 +68,21 @@ + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + + export + + + + + jdbc:h2:mem:db1;MVCC=TRUE + + diff --git a/src/it/tutorials/osgi/unmanaged-jpa/pom.xml b/src/it/tutorials/osgi/unmanaged-jpa/pom.xml index 9b6592fa..259540e5 100755 --- a/src/it/tutorials/osgi/unmanaged-jpa/pom.xml +++ b/src/it/tutorials/osgi/unmanaged-jpa/pom.xml @@ -6,6 +6,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -70,6 +74,18 @@ + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + + export + + + + diff --git a/src/it/tutorials/osgi/unmanaged-native/pom.xml b/src/it/tutorials/osgi/unmanaged-native/pom.xml index c0126bf6..cd337360 100755 --- a/src/it/tutorials/osgi/unmanaged-native/pom.xml +++ b/src/it/tutorials/osgi/unmanaged-native/pom.xml @@ -6,6 +6,10 @@ 1.0.0 bundle + + @project.version@ + + org.hibernate.javax.persistence @@ -78,6 +82,18 @@ + + de.juplo + hibernate4-maven-plugin + ${h4mp.version} + + + + export + + + + diff --git a/src/it/tutorials/pom.xml b/src/it/tutorials/pom.xml index 37e4f1ff..e899e4ce 100644 --- a/src/it/tutorials/pom.xml +++ b/src/it/tutorials/pom.xml @@ -89,6 +89,7 @@ src/test/resources + true -- 2.20.1