[libcommons-lang-java] 01/03: No longer build the enum package to fix the build failure with Java 9 (Closes: #893229)

[Emmanuel Bourg]

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

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

commit 4f29f1ab22675048aadbee25b0ea792d306ce788
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 30 10:25:27 2018 +0200

    No longer build the enum package to fix the build failure with Java 9 (Closes: #893229)
---
 debian/changelog                                   |  8 +++++
 debian/patches/01-build-wit-eclipse-compiler.patch |  0
 debian/patches/01-source-encoding.patch            | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 55084d5..d383dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcommons-lang-java (2.6-8) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * No longer build the enum package to fix the build failure with Java 9
+    (Closes: #893229)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 30 Mar 2018 10:24:02 +0200
+
 libcommons-lang-java (2.6-7) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-build-wit-eclipse-compiler.patch b/debian/patches/01-build-wit-eclipse-compiler.patch
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/01-source-encoding.patch b/debian/patches/01-source-encoding.patch
new file mode 100644
index 0000000..275c2a4
--- /dev/null
+++ b/debian/patches/01-source-encoding.patch
@@ -0,0 +1,39 @@
+Description: Set the source encoding to fix the build failure with recent JDKs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -59,7 +59,7 @@
+     <!-- ========== Compile Targets ========================================= -->
+     <target name="compile" depends="init" description="Compile shareable components">
+         <mkdir dir="${build.home}/classes"/>
+-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
++        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" encoding="ISO-8859-1">
+             <classpath refid="compile.classpath"/>
+         </javac>
+         <copy todir="${build.home}/classes" filtering="on">
+@@ -73,6 +73,7 @@
+         <mkdir dir="${build.home}/tests"/>
+         <javac srcdir="${test.home}" destdir="${build.home}/tests"
+                target="1.5" source="1.5"
++               encoding="ISO-8859-1"
+                includes="org/apache/commons/lang/enums/EnumUtilsLang76Test.java">
+             <classpath refid="test.classpath"/>
+         </javac>
+@@ -80,7 +81,7 @@
+ 
+     <target name="compile.tests" depends="compile,test.compile.jdk15" description="Compile unit test cases">
+         <mkdir dir="${build.home}/tests"/>
+-        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
++        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" encoding="ISO-8859-1">
+             <exclude name="org/apache/commons/lang/enums/EnumUtilsLang76Test.java" if="jdk.1.5.present"/>
+             <classpath refid="test.classpath"/>
+         </javac>
+@@ -149,6 +150,7 @@
+                  bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" 
+                  use="true" 
+                  link="${jdk.javadoc}" 
++                 encoding="ISO-8859-1"
+                  source="${compile.source}">
+             <classpath refid="compile.classpath"/>
+         </javadoc>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d7bc380
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-source-encoding.patch
diff --git a/debian/rules b/debian/rules
index ac81b0d..ce64a24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$
 	dh $@ --buildsystem=ant --with maven_repo_helper
 
 override_dh_auto_build:
-	ANT_ARGS="-Dbasedir=$(realpath .) -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build
+	ANT_ARGS="-Dbasedir=$(realpath .) -Dcompile.excludes='**/enum/*' -Djavadoc.excludepackagenames='org/apache/commons/lang/enum/*' -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build
 	cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd
 	echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean
 	bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar

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