[jcharts] 12/14: Fixed the build failure with Java 9 (Closes: #875580)

[Emmanuel Bourg]

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

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

commit 045cc5ee671af56e87ff09fa54c40eca7ab59077
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 17 16:18:45 2017 +0100

    Fixed the build failure with Java 9 (Closes: #875580)
---
 debian/changelog                                |  1 +
 debian/patches/01_remove_old_functionality.diff |  4 ++--
 debian/patches/02_java5_compatibility.patch     | 26 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/rules                                    |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72ee4b0..7a13c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jcharts (0.7.5-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #875580)
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/patches/01_remove_old_functionality.diff b/debian/patches/01_remove_old_functionality.diff
index 788849d..a42c90f 100644
--- a/debian/patches/01_remove_old_functionality.diff
+++ b/debian/patches/01_remove_old_functionality.diff
@@ -22,7 +22,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
 -		<jar jarfile="${jar.jCharts}" basedir="${dir.build}" />
 +		<jar jarfile="${jar.jCharts}" basedir="${dir.build}">
 +			<manifest>
-+				<attribute name="Class-Path" value="batik.jar servlet-api-2.5.jar" />
++				<attribute name="Class-Path" value="batik.jar" />
 +			</manifest>
 +		</jar>
  		<delete dir="${dir.build}" />
@@ -35,7 +35,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
 -		<javadoc sourcepath="../${dir.src}"
 -					classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
 +		<javadoc sourcepath=""
-+					classpath="${batik.classpath};/usr/share/java/servlet-api-2.5.jar"
++					classpath="${batik.classpath};/usr/share/java/servlet-api-3.1.jar"
  					destdir="${dir.javadocs}"
  					packagenames="org.jCharts.*"
  					excludepackagenames="javax.*"
diff --git a/debian/patches/02_java5_compatibility.patch b/debian/patches/02_java5_compatibility.patch
new file mode 100644
index 0000000..3fae773
--- /dev/null
+++ b/debian/patches/02_java5_compatibility.patch
@@ -0,0 +1,26 @@
+Description: Fixed the build failure with Java 5
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/org/jCharts/chartText/TextTag.java
++++ b/src/org/jCharts/chartText/TextTag.java
+@@ -404,15 +404,15 @@
+ 
+ 		if( attributes != null && attributes.size() > 0 )
+ 		{
+-			java.util.Enumeration enum = attributes.keys();
++			java.util.Enumeration enumeration = attributes.keys();
+ 			str += "\nAttributes:";
+-			while( enum.hasMoreElements() )
++			while( enumeration.hasMoreElements() )
+ 			{
+-				Object ob = enum.nextElement();
++				Object ob = enumeration.nextElement();
+ 				str += "    [" + ob.toString() + "]=[" + attributes.get( ob ).toString() + "]\n";
+ 			}
+ 		}
+ 
+ 		return str;
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 5bbb64b..cab5199 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_remove_old_functionality.diff
+02_java5_compatibility.patch
diff --git a/debian/rules b/debian/rules
index 7a570e1..2a5c695 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE 	:= build/build.xml
 DEB_JARS		:= batik servlet-api-3.1
-ANT_ARGS		:= -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.4
+ANT_ARGS		:= -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.7
 DEB_ANT_BUILD_TARGET	:= jar javadocs
 
 clean::

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