[jboss-xnio] 05/11: Add maven-compiler-plugin-2.5.patch

[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 b89e4236602e04945eb89a7b8379cdaa5526c9ef
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 21 23:10:13 2015 +0100

    Add maven-compiler-plugin-2.5.patch
---
 debian/patches/disable-apiviz-plugin.patch     |  2 +-
 debian/patches/maven-compiler-plugin-2.5.patch | 34 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/patches/disable-apiviz-plugin.patch b/debian/patches/disable-apiviz-plugin.patch
index 8124ae8..e46bacc 100644
--- a/debian/patches/disable-apiviz-plugin.patch
+++ b/debian/patches/disable-apiviz-plugin.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 527cae2..875950a 100644
+index 40724ae..78cc98e 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -158,7 +158,7 @@
diff --git a/debian/patches/maven-compiler-plugin-2.5.patch b/debian/patches/maven-compiler-plugin-2.5.patch
new file mode 100644
index 0000000..f847443
--- /dev/null
+++ b/debian/patches/maven-compiler-plugin-2.5.patch
@@ -0,0 +1,34 @@
+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 2775e34..2122218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-apiviz-plugin.patch
+maven-compiler-plugin-2.5.patch

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