[jboss-xnio] 01/02: Revert switch to maven-compiler-plugin-2.5 and override dh_auto_test instead.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository jboss-xnio.

commit d773710b8ae6084982bad3a523afc4fb0b0c459c
Author: Markus Koschany <apo at debian.org>
Date:   Tue Dec 29 23:55:46 2015 +0100

    Revert switch to maven-compiler-plugin-2.5 and override dh_auto_test instead.
---
 debian/control                                 |  1 -
 debian/patches/maven-compiler-plugin-2.5.patch | 34 --------------------------
 debian/patches/series                          |  1 -
 debian/rules                                   |  4 +++
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index ac77914..79a1025 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
  libjboss-logging-tools-java,
  libjboss-logmanager-java,
  libjmock2-java,
- libmaven-compiler-plugin-2.5-java,
  libmaven-javadoc-plugin-java,
  libsurefire-java,
  maven-debian-helper (>= 1.5)
diff --git a/debian/patches/maven-compiler-plugin-2.5.patch b/debian/patches/maven-compiler-plugin-2.5.patch
deleted file mode 100644
index f847443..0000000
--- a/debian/patches/maven-compiler-plugin-2.5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 21 Dec 2015 23:09:57 +0100
-Subject: maven compiler plugin 2.5
-
-Work around a FTBFS with maven-compiler-plugin 3.2 by using the older 2.5
-version instead.
-
-Bug: https://bugs.debian.org/808619
-Forwarded: not-needed
----
- pom.xml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index 09ee69f..a067d85 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -51,6 +51,16 @@
-         <version.jmock>2.6.0</version.jmock>
-     </properties>
- 
-+    <build>
-+        <plugins>
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-+             </plugin>
-+         </plugins>
-+    </build>
-+
-     <dependencyManagement>
-         <dependencies>
-             <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 2122218..2775e34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable-apiviz-plugin.patch
-maven-compiler-plugin-2.5.patch
diff --git a/debian/rules b/debian/rules
index fc6afff..e3abd26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,9 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh $@ --parallel --buildsystem=maven
 
+override_dh_auto_test:
+	# Do nothing here to prevent a FTBFS due to a bug in maven-compiler-plugin
+	# 3.2. See also https://bugs.debian.org/808619
+
 get-orig-source:
 	uscan --verbose --download-current-version --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-xnio.git