[SCM] Hibernate Validator branch, master, updated. debian/4.0.2.GA-4-1-g38a8168

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 38a8168fbdd89303deb66239b1ac47cab24bb25b
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Wed Oct 12 14:15:10 2011 -0430

    Fix several possible causes of FTBFS bugs
    
    * Add Build-Depends on libmaven-reporting-impl-java. (Closes: #644341).
    * Disable maven-surefire-report-plugin usage during build time.
    * Fix clean target to allow two builds in a row.

diff --git a/debian/changelog b/debian/changelog
index 1d2dcd2..0973d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libhibernate-validator-java (4.0.2.GA-5) unstable; urgency=low
+
+  * Team upload.
+  * Add Build-Depends on libmaven-reporting-impl-java. (Closes: #644341).
+  * Disable maven-surefire-report-plugin usage during build time.
+  * Fix clean target to allow two builds in a row.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 12 Oct 2011 13:49:57 -0430
+
 libhibernate-validator-java (4.0.2.GA-4) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 25c0ca7..12c30e1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org
 Build-Depends: debhelper (>= 5), cdbs, maven-debian-helper
 Build-Depends-Indep: default-jdk, libhibernate3-java, libmaven-shade-plugin-java,
  glassfish-javaee, libjtype-java, libgeronimo-validation-1.0-spec-java,
- liblog4j1.2-java
+ liblog4j1.2-java, libmaven-reporting-impl-java
 Standards-Version: 3.9.2
 Homepage: http://validator.hibernate.org
 Vcs-Git: git://git.debian.org/git/pkg-java/libhibernate-validator-java.git
diff --git a/debian/patches/0002-disable-maven-surefire-report-plugin.patch b/debian/patches/0002-disable-maven-surefire-report-plugin.patch
new file mode 100644
index 0000000..bd7aefc
--- /dev/null
+++ b/debian/patches/0002-disable-maven-surefire-report-plugin.patch
@@ -0,0 +1,24 @@
+Description: Disable maven-surefire-report-plugin reports tests
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2011-10-12
+
+--- libhibernate-validator-java-4.0.2.GA.orig/hibernate-validator/pom.xml
++++ libhibernate-validator-java-4.0.2.GA/hibernate-validator/pom.xml
+@@ -128,6 +128,8 @@
+                     </suiteXmlFiles>
+                 </configuration>
+             </plugin>
++            <!-- maven-surefire-report-plugin is disabled during build time
++                 because it is not compatible with libdoxia-java 1.1.4
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-report-plugin</artifactId>
+@@ -145,6 +146,7 @@
+                     <outputName>test-report</outputName>
+                 </configuration>
+             </plugin>
++            -->
+ 
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index e799d10..2f4981b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 pom_modules.diff
 0001-don-t-build-sources-the-depend-on-jaxb-xjc.patch
+0002-disable-maven-surefire-report-plugin.patch
diff --git a/debian/rules b/debian/rules
index 687680b..7560e33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,9 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
 
+clean::
+	mh_clean
+	rm -f mvn-build
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

-- 
Hibernate Validator