[plexus-compiler] 03/03: Upload to experimental

Miguel Landaeta nomadium at moszumanska.debian.org
Wed Mar 4 02:48:18 UTC 2015


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

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

commit 00aa76f4187a8d5fc856387b47b0924a2bb5fa04
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Mar 3 21:45:55 2015 -0300

    Upload to experimental
---
 debian/changelog                                   |  9 +++--
 debian/control                                     |  3 +-
 debian/maven.rules                                 |  2 +-
 ...d_support_for_maven_compiler_plugin_2.5.1.patch | 42 ++++++++++++++++++++++
 debian/patches/eclipse-compatibility.patch         | 19 ----------
 debian/patches/fix_test_classpath.patch            |  4 +--
 debian/patches/series                              |  2 +-
 7 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dea9887..430c5a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,4 @@
-plexus-compiler (2.0-1) UNRELEASED; urgency=medium
-
-  WIP: I'm working on this package since I need it to update
-  maven-compiler-plugin. This is meant to be uploaded to experimental.
+plexus-compiler (2.2-1) experimental; urgency=medium
 
   * Team upload.
   * New upstream release.
@@ -12,8 +9,10 @@ plexus-compiler (2.0-1) UNRELEASED; urgency=medium
     - d/patches/fix_test_classpath.patch.
   * Drop unneeded patch:
     - d/patches/backward-compatibility.patch.
+    - d/patches/eclipse-compatibility.patch.
+  * Add B-D on libmaven-install-plugin-java.
 
- -- Miguel Landaeta <nomadium at debian.org>  Mon, 02 Mar 2015 23:55:40 -0300
+ -- Miguel Landaeta <nomadium at debian.org>  Tue, 03 Mar 2015 19:56:14 -0300
 
 plexus-compiler (1.9.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 5bf0df9..8cc8e77 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends-Indep: default-jdk-doc,
                      libplexus-container-default-java,
                      libplexus-container-default-java-doc,
                      libplexus-utils-java (>= 1.5.15),
-                     libplexus-utils-java-doc
+                     libplexus-utils-java-doc,
+                     libmaven-install-plugin-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-compiler.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-compiler.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 0271d65..c82177f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,4 +3,4 @@ junit junit jar s/.*/3.x/ * *
 junit junit jar s/3\..*/3.x/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
-s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ * *
+s/org.eclipse.tycho/org.eclipse.jdt.core.compiler/ s/org.eclipse.jdt.core/ecj/ jar s/.*/debian/ * *
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
new file mode 100644
index 0000000..e010d40
--- /dev/null
+++ b/debian/patches/add_support_for_maven_compiler_plugin_2.5.1.patch
@@ -0,0 +1,42 @@
+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/eclipse-compatibility.patch b/debian/patches/eclipse-compatibility.patch
deleted file mode 100644
index 20886cc..0000000
--- a/debian/patches/eclipse-compatibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Preserves the compatibility with the version of the Eclipse
- compiler available in Debian. This patch will become obsolete when upgrading
-  plexus-compiler to 2.1 or later.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-+++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-@@ -388,6 +388,11 @@
- 
-             return result;
-         }
-+
-+        public boolean ignoreOptionalProblems()
-+        {
-+            return false;
-+        }
-     }
- 
-     private class EclipseCompilerINameEnvironment
diff --git a/debian/patches/fix_test_classpath.patch b/debian/patches/fix_test_classpath.patch
index 449818e..2d1f125 100644
--- a/debian/patches/fix_test_classpath.patch
+++ b/debian/patches/fix_test_classpath.patch
@@ -1,6 +1,6 @@
 --- a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
 +++ b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ public abstract class AbstractCompilerTest
      {
          List<String> cp = new ArrayList<String>();
  
@@ -8,4 +8,4 @@
 +        File file = getLocalArtifactPath( "commons-lang", "commons-lang", "debian", "jar" );
  
          assertTrue( "test prerequisite: commons-lang library must be available in local repository, expected "
-                     + file.getAbsolutePath(), file.canRead() );
+                         + file.getAbsolutePath(), file.canRead() );
diff --git a/debian/patches/series b/debian/patches/series
index 43f99f3..e01ccbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix_test_classpath.patch
-eclipse-compatibility.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



More information about the pkg-java-commits mailing list