[icu4j-4.4] 01/03: Do not compile ICUTaglet (Java 8 incompatible)

[Emmanuel Bourg]

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

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

commit 9f7d06f9821c5a40aacfe7b36fba13d48701104c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 14 11:56:11 2014 +0200

    Do not compile ICUTaglet (Java 8 incompatible)
---
 debian/changelog                            |  4 +++-
 debian/patches/01-java8-compatibility.patch | 28 +++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 835e0e1..8eec141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 icu4j-4.4 (4.4.2.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Fixed the build failure with Java 8
+  * Fixed build.xml to recognize Java 8
+  * Do not compile the ICUTaglet class which relies on internal JDK classes
+    no longer available in Java 8.
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch
index 933ce8f..d8c6191 100644
--- a/debian/patches/01-java8-compatibility.patch
+++ b/debian/patches/01-java8-compatibility.patch
@@ -1,4 +1,6 @@
-Description: Fixes the detection of the JDK to allow the compilation with Java 8
+Description: Fixes the detection of the JDK to allow the compilation with Java 8.
+ Do not compile the ICUTaglet class which relies on internal JDK classes
+ no longer available in Java 8.
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
@@ -12,3 +14,27 @@ Forwarded: no
          </or>
      </condition>
      <condition property="is.java5">
+--- a/tools/build/build.xml
++++ b/tools/build/build.xml
+@@ -20,7 +20,20 @@
+ 
+     <target name="clean" depends="@clean" description="Clean up the build outputs"/>
+ 
+-    <target name="compile" depends="@compile" description="Compile java source files"/>
++    <target name="compile" description="Compile java source files">
++        <mkdir dir="${bin.dir}"/>
++        <javac
++            srcdir="${src.dir}"
++            destdir="${bin.dir}"
++            classpathref="javac.classpathref"
++            source="${javac.source}"
++            target="${javac.target}"
++            encoding="${java.src.encoding}"
++            debug="${javac.debug}">
++            <compilerarg value="${javac.compilerarg}"/>
++            <exclude name="**/ICUTaglet*"/>
++        </javac>
++    </target>
+ 
+     <target name="copy" depends="@copy" description="Copy non-java runtime files to the project's binary directory"/>
+ 

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