commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [math] Simple fix to add --allow-script-in-comments for Javadoc8+
Date Sun, 07 May 2017 12:19:09 GMT
Repository: commons-math
Updated Branches:
  refs/heads/master 52ddc9d35 -> cdf22ce63


Simple fix to add --allow-script-in-comments for Javadoc8+

Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/cdf22ce6
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/cdf22ce6
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/cdf22ce6

Branch: refs/heads/master
Commit: cdf22ce631b94fda1cdd053e2d1ec9648f0cd124
Parents: 52ddc9d
Author: Sebb <sebb@apache.org>
Authored: Sun May 7 13:19:05 2017 +0100
Committer: Sebb <sebb@apache.org>
Committed: Sun May 7 13:19:05 2017 +0100

----------------------------------------------------------------------
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-math/blob/cdf22ce6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf4d0fa..579c108 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,6 +462,9 @@
     <!-- JMH Benchmark related properties, version, target compiler and name of the benchmarking
uber jar. -->
     <jmh.version>1.13</jmh.version>
     <uberjar.name>benchmarks</uberjar.name>
+    <!-- MathJax requires additional Javadoc qualifier for Java8+ -->
+    <!-- default to empty for earlier versions of Java -->
+    <mathjax.javadoc.qualifier></mathjax.javadoc.qualifier>
   </properties>
 
   <build>
@@ -587,7 +590,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>--allow-script-in-comments -header '&lt;script type="text/javascript"
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalparam>
+          <additionalparam>${mathjax.javadoc.qualifier} -header '&lt;script type="text/javascript"
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalparam>
         </configuration>
       </plugin>
     </plugins>
@@ -738,7 +741,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>--allow-script-in-comments -header '&lt;script type="text/javascript"
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalparam>
+          <additionalparam>${mathjax.javadoc.qualifier} -header '&lt;script type="text/javascript"
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalparam>
         </configuration>
       </plugin>
     </plugins>
@@ -935,5 +938,13 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>mathjax-java8</id>
+      <activation><jdk>[1.8,)</jdk></activation>
+      <properties>
+        <!-- MathJax requires additional Javadoc qualifier for Java8+ -->
+        <mathjax.javadoc.qualifier>--allow-script-in-comments</mathjax.javadoc.qualifier>
+      </properties>
+    </profile>
   </profiles>
 </project>


Mime
View raw message