diff options
| author | Jun He <jun.he@linaro.org> | 2017-03-23 06:51:08 +0000 |
|---|---|---|
| committer | Jun He <jun.he@linaro.org> | 2017-03-24 09:13:40 +0000 |
| commit | a64bb5ea37127f4b155d1ad57b94826d23d0799c (patch) | |
| tree | 777eb21f380c3f6ce2a443628fa4e0112ac89953 | |
| parent | bab2d48cd1e23c0f5992e643a75cf63335fd36d1 (diff) | |
Fixed ignite-hadoop build failure caused by JavaDoc:scripts when JDK-8u_121 is used.
| -rw-r--r-- | bigtop-packages/src/common/ignite-hadoop/patch0-IGNITE-4770.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/bigtop-packages/src/common/ignite-hadoop/patch0-IGNITE-4770.diff b/bigtop-packages/src/common/ignite-hadoop/patch0-IGNITE-4770.diff new file mode 100644 index 00000000..5bf38116 --- /dev/null +++ b/bigtop-packages/src/common/ignite-hadoop/patch0-IGNITE-4770.diff @@ -0,0 +1,38 @@ +From e7e66e332e9b3aa367de0fba362dbb01955049fe Mon Sep 17 00:00:00 2001 +From: Vyacheslav Daradur <daradurvs@gmail.com> +Date: Thu, 2 Mar 2017 15:57:21 +0300 +Subject: [PATCH] IGNITE-4770 Script inside javadoc bottom cause compilation + error at 1.8.0_121-b13 + +--- + .../java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java | 1 + + parent/pom.xml | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java +index e654231..d34b4e4 100644 +--- a/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java ++++ b/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java +@@ -282,6 +282,7 @@ public class GridJavadocAntTask extends MatchingTask { + "<script type='text/javascript'>" + + "SyntaxHighlighter.all();" + + "dp.SyntaxHighlighter.HighlightAll('code');" + ++ "!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');" + + "</script>\n" + + "</body>\n"); + +diff --git a/parent/pom.xml b/parent/pom.xml +index 4497d01..626b47e 100644 +--- a/parent/pom.xml ++++ b/parent/pom.xml +@@ -456,7 +456,6 @@ + </td> + <td width="100%" align="right" valign="center"> + <a href="https://twitter.com/ApacheIgnite" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @ApacheIgnite</a> +- <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> + </td> + </tr> + <tr> +-- +2.7.4 + |