[libnetx-java] 12/13: Fixed the build failure with Java 9 (Closes: #874646)

[Emmanuel Bourg]

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

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

commit d9255dafb4642ac10b036933c08aa24315df0dfb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 28 12:53:18 2017 +0100

    Fixed the build failure with Java 9 (Closes: #874646)
---
 debian/changelog                         |  1 +
 debian/patches/java5-compatibility.patch | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  3 ---
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e5713d..d0f0c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libnetx-java (0.5-3) UNRELEASED; urgency=low
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #874646)
   * Removed the explicit dependency on the JRE
   * Removed the javadoc from the binary package
   * Build with the DH sequencer instead of CDBS
diff --git a/debian/patches/java5-compatibility.patch b/debian/patches/java5-compatibility.patch
new file mode 100644
index 0000000..1e50c50
--- /dev/null
+++ b/debian/patches/java5-compatibility.patch
@@ -0,0 +1,18 @@
+Description: Fixes the compilation errors with Java 5+
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/nanoxml/XMLElement.java
++++ b/src/nanoxml/XMLElement.java
+@@ -291,9 +291,9 @@
+         this.children = new Vector();
+         this.entities = entities;
+         this.lineNr = 0;
+-        Enumeration enum = this.entities.keys();
+-        while (enum.hasMoreElements()) {
+-            Object key = enum.nextElement();
++        Enumeration enumeration = this.entities.keys();
++        while (enumeration.hasMoreElements()) {
++            Object key = enumeration.nextElement();
+             Object value = this.entities.get(key);
+             if (value instanceof String) {
+                 value = ((String) value).toCharArray();
diff --git a/debian/patches/series b/debian/patches/series
index ac53588..3edb7ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 protected.diff
 ambiguous_Proxy.diff
+java5-compatibility.patch
diff --git a/debian/rules b/debian/rules
index 3257e36..8f3b8ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build -- jar -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
-
 override_dh_auto_install:
 	install -m 644 -D netx.jar debian/libnetx-java/usr/share/java/netx-$(DEB_VERSION_UPSTREAM).jar
 	dh_link /usr/share/java/netx-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/netx.jar

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