[plexus-compiler] 02/04: Drop unneeded patch: d/patch/add_support_for_maven_compiler_plugin_2.5.1.patch

[Miguel Landaeta]

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

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

commit de6733e1d47a6d6d89448edba1d79300f60805d0
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Mar 5 20:19:09 2015 -0300

    Drop unneeded patch: d/patch/add_support_for_maven_compiler_plugin_2.5.1.patch
---
 debian/changelog                                   |  1 +
 ...d_support_for_maven_compiler_plugin_2.5.1.patch | 42 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bf97b1..5c799ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plexus-compiler (2.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Allow co-installation with plexus-compiler-1.0 packages.
+  * Drop unneeded patch: d/patch/add_support_for_maven_compiler_plugin_2.5.1.patch.
 
  -- Miguel Landaeta <nomadium at debian.org>  Thu, 05 Mar 2015 19:14:56 -0300
 
diff --git a/debian/patches/add_support_for_maven_compiler_plugin_2.5.1.patch b/debian/patches/add_support_for_maven_compiler_plugin_2.5.1.patch
deleted file mode 100644
index e010d40..0000000
--- a/debian/patches/add_support_for_maven_compiler_plugin_2.5.1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Add support for maven-compiler-plugin 2.5.1
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2015-03-03
-
---- 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
-@@ -45,6 +45,7 @@ import org.codehaus.plexus.compiler.AbstractCompiler;
- import org.codehaus.plexus.compiler.CompilerConfiguration;
- import org.codehaus.plexus.compiler.CompilerException;
- import org.codehaus.plexus.compiler.CompilerMessage;
-+import org.codehaus.plexus.compiler.CompilerError;
- import org.codehaus.plexus.compiler.CompilerOutputStyle;
- import org.codehaus.plexus.compiler.CompilerResult;
- import org.codehaus.plexus.util.FileUtils;
-@@ -178,6 +179,26 @@ public class JavacCompiler
-         return result;
-     }
- 
-+    public List<CompilerError> compile( CompilerConfiguration config )
-+        throws CompilerException
-+    {
-+        CompilerResult result = performCompile(config);
-+        List<CompilerMessage> messages = result.getCompilerMessages();
-+        List<CompilerError> errors = new ArrayList<CompilerError>();
-+
-+        if ( ( getLogger() != null ) && getLogger().isDebugEnabled() )
-+        {
-+            getLogger().debug( "Compiling through deprecated method 'compile' in " +
-+                               "org.codehaus.plexus.compiler.javac.JavacCompiler " +
-+                               "class" );
-+        }
-+
-+        for (CompilerMessage msg : messages) {
-+          errors.add(new CompilerError(msg.getMessage(), msg.isError()));
-+        }
-+        return errors;
-+    }
-+
-     protected static boolean isJava16()
-     {
-         try
diff --git a/debian/patches/series b/debian/patches/series
index e01ccbf..c65413d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_test_classpath.patch
 set-dependencies-versions.patch
-add_support_for_maven_compiler_plugin_2.5.1.patch

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