[plexus-compiler] 07/10: Fixed the compatibility with the version of ECJ in Debian

[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 9b0ac44912cb956e365643b41fd5b5e98d700859
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 2 17:23:27 2018 +0100

    Fixed the compatibility with the version of ECJ in Debian
---
 debian/changelog                       |  1 +
 debian/patches/ecj-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index be76530..51df829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plexus-compiler (2.8.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
+    - Fixed the compatibility with the version of ECJ in Debian
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
   * Depend on libplexus-container-default-java
diff --git a/debian/patches/ecj-compatibility.patch b/debian/patches/ecj-compatibility.patch
new file mode 100644
index 0000000..2a8bef8
--- /dev/null
+++ b/debian/patches/ecj-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of ECJ in Debian
+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
+@@ -348,7 +348,7 @@
+         }
+         else if ( "9".equals( versionSpec ) )
+         {
+-        	return CompilerOptions.VERSION_9;
++        	return CompilerOptions.VERSION_1_9;
+         }
+         else
+         {
diff --git a/debian/patches/series b/debian/patches/series
index 0771574..fd37f23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_test_classpath.patch
 auto-adjust-language-level.patch
 maven-compatibility.patch
 missing-dependency-management-entries.patch
+ecj-compatibility.patch

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