[plexus-compiler] 04/05: Added a patch to preserve the compatibility with maven-stapler-plugin

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-compiler.

commit 38948120c3a31987d1d45c2b0f44a71a77be5c63
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 6 22:34:58 2013 +0100

    Added a patch to preserve the compatibility with maven-stapler-plugin
---
 debian/changelog                            |    1 +
 debian/patches/backward-compatibility.patch |   22 ++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c2b7c36..f27d8a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 
   [ Emmanuel Bourg ]
   * Added a patch to compile with the Eclipse compiler available in Debian
+  * Added a patch to preserve the compatibility with maven-stapler-plugin
   * debian/control:
     - Updated Standards-Version to 3.9.5 (no changes)
   * Build depend on debhelper >= 9
diff --git a/debian/patches/backward-compatibility.patch b/debian/patches/backward-compatibility.patch
new file mode 100644
index 0000000..9a64085
--- /dev/null
+++ b/debian/patches/backward-compatibility.patch
@@ -0,0 +1,22 @@
+Description: Fixes an incompatibility introduced in plexus-compiler 1.8.1 and
+ affecting maven-stapler-plugin. This patch can be dropped after upgrading
+ maven-stapler-plugin to 1.17 or later.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
+index 8d62968..7dd1163 100644
+--- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
++++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
+@@ -579,6 +579,11 @@ public class JavacCompiler
+         return messages;
+     }
+ 
++    protected static List<CompilerError> parseModernStream( BufferedReader input ) throws IOException
++    {
++        return parseModernStream(1, input);
++    }
++
+     /**
+      * Parse the output from the compiler into a list of CompilerError objects
+      *
+
diff --git a/debian/patches/series b/debian/patches/series
index 1544823..0f3fb75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_test_classpath.patch
 eclipse-compatibility.patch
+backward-compatibility.patch

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