[icu4j] 10/20: Disabled the custom taglets to fix the build with Java 9 (Closes: #873217)

[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.

commit 2efb02d5a08b37c4a1f13bc315d355e26038d173
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 8 14:10:36 2018 +0100

    Disabled the custom taglets to fix the build with Java 9 (Closes: #873217)
---
 debian/changelog                        |  1 +
 debian/patches/series                   |  1 +
 debian/patches/use-default-doclet.patch | 76 +++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e440c48..4a927de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ icu4j (60.1-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Disabled the custom taglets to fix the build with Java 9 (Closes: #873217)
   * Disabled doclint when generating the javadoc
   * Updated debian/watch to track the releases > 58.1
   * Restored debian/orig-tar.sh and use XZ compression for the upstream tarball
diff --git a/debian/patches/series b/debian/patches/series
index ec0cee2..a5c46e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #01-java8-compatibility.patch
 javadoc_local_link.diff
 reproducible-build.patch
+use-default-doclet.patch
diff --git a/debian/patches/use-default-doclet.patch b/debian/patches/use-default-doclet.patch
new file mode 100644
index 0000000..0b9f6be
--- /dev/null
+++ b/debian/patches/use-default-doclet.patch
@@ -0,0 +1,76 @@
+Description: Use the default doclet to avoid a javadoc error: "ClassCastException thrown while trying to register Taglet"
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -1317,7 +1317,7 @@
+                 docencoding="UTF-8"
+                 charset="UTF-8"
+                 bottom="${icu4j.api.doc.copyright.footer}"
+-                additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
++                additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
+                 link="${icu4j.api.doc.jdk.link}"
+                 source="1.5"
+                 stylesheetfile="${docs.style.sheet}"
+@@ -1353,7 +1353,7 @@
+                 docencoding="UTF-8"
+                 charset="UTF-8"
+                 bottom="${icu4j.api.doc.copyright.footer}"
+-                additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
++                additionalparam="${doclint.option} -breakiterator -use"
+                 link="${icu4j.api.doc.jdk.link}"
+                 source="1.5"
+                 failonerror="true">
+@@ -1398,7 +1398,7 @@
+                 docencoding="UTF-8"
+                 charset="UTF-8"
+                 bottom="${icu4j.api.doc.copyright.footer}"
+-                additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
++                additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
+                 link="${icu4j.api.doc.jdk.link}"
+                 source="1.5"
+                 stylesheetfile="${docs.style.sheet}"
+@@ -1437,7 +1437,7 @@
+                 docencoding="UTF-8"
+                 charset="UTF-8"
+                 bottom="${icu4j.api.doc.copyright.footer}"
+-                additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
++                additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
+                 link="${icu4j.api.doc.jdk.link}"
+                 source="1.5"
+                 stylesheetfile="${docs.style.sheet}"
+@@ -1621,7 +1621,6 @@
+             <packageset dir="${icu4j.charset.dir}/src">
+                 <include name="com/ibm/icu/charset/**"/>
+             </packageset>
+-            <doclet name="com.ibm.icu.dev.tool.docs.CheckTags" path="${icu4j.build-tools.jar}"/>
+         </javadoc>
+     </target>
+ 
+@@ -1647,13 +1646,6 @@
+             <packageset dir="${icu4j.translit.dir}/src">
+                 <include name="com/ibm/icu/text/**"/>
+             </packageset>
+-            <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIData" path="${icu4j.build-tools.jar}">
+-                <param name="-name" value="ICU4J ${icu4j.impl.version}"/>
+-                <param name="-output" value="${out.dir}/icu4j${api.report.version}.api3"/>
+-                <param name="-internal"/>
+-                <param name="-version"/>
+-                <param name="-gzip"/>
+-            </doclet>
+         </javadoc>
+     </target>
+ 
+@@ -1693,12 +1685,6 @@
+             <packageset dir="${icu4j.translit.dir}/src">
+                 <include name="com/ibm/icu/text/**"/>
+             </packageset>
+-            <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIDataOld" path="${icu4j.build-tools.jar}">
+-                <param name="-name" value="ICU4J ${icu4j.impl.version}"/>
+-                <param name="-output" value="${out.dir}/icu4j${api.report.version}.api"/>
+-                <param name="-internal"/>
+-                <param name="-gzip"/>
+-            </doclet>
+         </javadoc>
+     </target>
+ 

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