[ant] 01/01: Removed the final modifier on Path.systemClasspath (Closes: #850553)

[Emmanuel Bourg]

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

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

commit 769944efef045c657f907105f026c7fbf83af1ce
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 19 10:18:31 2017 +0100

    Removed the final modifier on Path.systemClasspath (Closes: #850553)
---
 debian/changelog                   |  3 +++
 debian/patches/0012-BZ-60582.patch | 17 +++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f511c7e..6a13c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 ant (1.9.8-3) UNRELEASED; urgency=medium
 
+  * Removed the newly introduced final modifier on Path.systemClasspath
+    to preserve the backward compatibility and fix build failures with Eclipse
+    (Closes: #850553)
   * Use a versioned dependency for junit4 (>= 4.11)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 Jan 2017 09:36:40 +0100
diff --git a/debian/patches/0012-BZ-60582.patch b/debian/patches/0012-BZ-60582.patch
new file mode 100644
index 0000000..9e72609
--- /dev/null
+++ b/debian/patches/0012-BZ-60582.patch
@@ -0,0 +1,17 @@
+Description: Remove the final modifier on Path.systemClasspath
+Origin: backport, https://github.com/apache/ant/commit/984a03d
+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60582
+Bug-Debian: https://bugs.debian.org/850553
+--- a/src/main/org/apache/tools/ant/types/Path.java
++++ b/src/main/org/apache/tools/ant/types/Path.java
+@@ -66,8 +66,9 @@
+ public class Path extends DataType implements Cloneable, ResourceCollection {
+     // CheckStyle:VisibilityModifier OFF - bc
+ 
++    // non-final as some IDE integrations (at least Eclipse) want to override it
+     /** The system classpath as a Path object */
+-    public static final Path systemClasspath =
++    public static Path systemClasspath = //NOSONAR
+         new Path(null, System.getProperty("java.class.path"));
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a74bc14..e833809 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0009-reproducible-timestamp-task.patch
 0010-reproducible-javadoc-task.patch
 0011-reproducible-propertyfile-task.patch
+0012-BZ-60582.patch

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