The following commit has been merged in the master branch:
commit bccf866ea228f9d5371b0332b53466a406fa9c60
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sat May 11 00:54:42 2013 +0200
Refreshed the patches
diff --git a/debian/patches/0002-disable-tests-for-entitymanager.patch
b/debian/patches/0002-disable-tests-for-entitymanager.patch
index b2dd3d1..95dfceb 100644
--- a/debian/patches/0002-disable-tests-for-entitymanager.patch
+++ b/debian/patches/0002-disable-tests-for-entitymanager.patch
@@ -11,11 +11,9 @@ org.hibernate:hibernate-jpamodelgen
entitymanager/pom.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
-diff --git a/project/entitymanager/pom.xml b/project/entitymanager/pom.xml
-index f6fc20c..4ba655d 100644
--- a/project/hibernate-entitymanager/pom.xml
+++ b/project/hibernate-entitymanager/pom.xml
-@@ -51,6 +51,7 @@
+@@ -74,6 +74,7 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -23,7 +21,7 @@ index f6fc20c..4ba655d 100644
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
-@@ -64,24 +65,29 @@
+@@ -87,24 +88,29 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -53,7 +51,7 @@ index f6fc20c..4ba655d 100644
</dependencies>
<build>
-@@ -114,10 +120,13 @@
+@@ -137,10 +143,13 @@
</bytecodeInjections>
</configuration>
</plugin>
@@ -67,7 +65,7 @@ index f6fc20c..4ba655d 100644
<configuration>
<tasks>
<property name="target.dir"
value="${project.build.directory}/generated-src/jpamodelgen"/>
-@@ -134,7 +143,9 @@
+@@ -157,7 +166,9 @@
<id>process_annotations</id>
<phase>process-test-sources</phase>
<configuration>
@@ -77,7 +75,7 @@ index f6fc20c..4ba655d 100644
<testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot>
</configuration>
<goals>
-@@ -143,10 +154,12 @@
+@@ -166,10 +177,12 @@
</execution>
</executions>
</plugin>
@@ -90,7 +88,7 @@ index f6fc20c..4ba655d 100644
<source>1.5</source>
<target>1.5</target>
</configuration>
-@@ -155,6 +168,7 @@
+@@ -178,6 +191,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -98,4 +96,3 @@ index f6fc20c..4ba655d 100644
<excludes>
<exclude>**/*TestCase.java</exclude>
</excludes>
---
diff --git a/debian/patches/0003-fix-up-jdbc4-testing.patch
b/debian/patches/0003-fix-up-jdbc4-testing.patch
index afb870a..d6d0191 100644
--- a/debian/patches/0003-fix-up-jdbc4-testing.patch
+++ b/debian/patches/0003-fix-up-jdbc4-testing.patch
@@ -6,11 +6,9 @@ Subject: [PATCH] fix up jdbc4-testing
jdbc4-testing/pom.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
-diff --git a/project/jdbc4-testing/pom.xml b/project/jdbc4-testing/pom.xml
-index 062c09c..5f94032 100644
--- a/project/hibernate-jdbc4-testing/pom.xml
+++ b/project/hibernate-jdbc4-testing/pom.xml
-@@ -45,11 +45,14 @@
+@@ -50,11 +50,14 @@
<source>1.6</source>
<target>1.6</target>
<compilerVersion>1.6</compilerVersion>
@@ -25,7 +23,7 @@ index 062c09c..5f94032 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
-@@ -57,6 +60,7 @@
+@@ -62,6 +65,7 @@
<jvm>${jdk16_home}/bin/java</jvm>
</configuration>
</plugin>
@@ -33,4 +31,3 @@ index 062c09c..5f94032 100644
</plugins>
</build>
---
--
packaging libhibernate3-java
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
