You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2017/05/12 13:48:56 UTC
commons-numbers git commit: Conditional flags for javadoc tool.
Repository: commons-numbers
Updated Branches:
refs/heads/master 402e15109 -> ce893bdb4
Conditional flags for javadoc tool.
Project: http://git-wip-us.apache.org/repos/asf/commons-numbers/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-numbers/commit/ce893bdb
Tree: http://git-wip-us.apache.org/repos/asf/commons-numbers/tree/ce893bdb
Diff: http://git-wip-us.apache.org/repos/asf/commons-numbers/diff/ce893bdb
Branch: refs/heads/master
Commit: ce893bdb4f7d8e67df390f11bff808a26b05bdcc
Parents: 402e151
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Fri May 12 15:48:07 2017 +0200
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Fri May 12 15:48:07 2017 +0200
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-numbers/blob/ce893bdb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4206610..9b19189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,10 @@
Temporary workaround?
-->
<commons.release.name>commons-numbers-${project.version}</commons.release.name>
+ <!-- Java8+ requires additional Javadoc qualifier for MathJax (default to empty). -->
+ <allowscript.javadoc.qualifier></allowscript.javadoc.qualifier>
+ <!-- Invalid flag for old javadoc versions (default to empty). -->
+ <doclint.javadoc.qualifier></doclint.javadoc.qualifier>
</properties>
<build>
@@ -248,7 +252,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Enable MathJax -->
- <additionalparam>-Xdoclint:all --allow-script-in-comments -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${numbers.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
+ <additionalparam>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${numbers.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
<!-- <aggregate>true</aggregate> -->
</configuration>
</plugin>
@@ -380,7 +384,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Enable MathJax -->
- <additionalparam>-Xdoclint:all --allow-script-in-comments -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${numbers.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
+ <additionalparam>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${numbers.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
<!-- <aggregate>true</aggregate> -->
</configuration>
</plugin>
@@ -569,6 +573,22 @@
</build>
</profile>
+ <profile>
+ <id>javadoc8</id>
+ <activation><jdk>[1.8,)</jdk></activation>
+ <properties>
+ <!-- Java8+ requires additional Javadoc qualifier for scripts such as MathJax -->
+ <allowscript.javadoc.qualifier>--allow-script-in-comments</allowscript.javadoc.qualifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>javadoc7</id>
+ <activation><jdk>[1.7,)</jdk></activation>
+ <properties>
+ <!-- Invalid flag in earlier versions of javadoc -->
+ <doclint.javadoc.qualifier>-Xdoclint:all</doclint.javadoc.qualifier>
+ </properties>
+ </profile>
</profiles>
<modules>