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 2019/06/16 21:37:41 UTC
[commons-math] 02/02: Upgrade to CP 48.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git
commit 418f2eb7f469c80b0e125377b1669f9be068f6ff
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Jun 16 23:35:19 2019 +0200
Upgrade to CP 48.
Outdated profile removed: New version will target Java 8 (or later).
Jacoco configuration removed (inherited from CP).
---
pom.xml | 88 +++++++++++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 64 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index e89f2ca..4043875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>47</version>
+ <version>48</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.commons</groupId>
@@ -492,16 +492,6 @@
<math.clirr.version>2.8</math.clirr.version>
<math.mathjax.version>2.7.2</math.mathjax.version>
- <!-- Temporary fix to support Java 8 -->
- <commons.jacoco.version>0.8.0</commons.jacoco.version>
- <commons.jacoco.classRatio>0.96</commons.jacoco.classRatio>
- <commons.jacoco.instructionRatio>0.8</commons.jacoco.instructionRatio>
- <commons.jacoco.methodRatio>0.8</commons.jacoco.methodRatio>
- <commons.jacoco.branchRatio>0.8</commons.jacoco.branchRatio>
- <commons.jacoco.complexityRatio>0.8</commons.jacoco.complexityRatio>
- <commons.jacoco.lineRatio>0.85</commons.jacoco.lineRatio>
- <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>
-
<commons.site.path>math</commons.site.path>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-math</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
@@ -651,10 +641,63 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Enable MathJax -->
- <additionalOptions>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${math.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
+ <additionalOptions>-Xdoclint:all --allow-script-in-comments -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${math.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
<!-- <aggregate>true</aggregate> -->
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${commons.rat.version}</version>
+ <configuration>
+ <!--
+ Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check
+ Below should agree with config in <reporting> section, so the site
+ gets consistent output.
+ -->
+ <excludes>
+
+ <!-- MANIFEST files cannot have any comments, so we can't put license header -->
+ <exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude>
+
+ <!-- the following are test data files with specific syntax that cannot include
+ Apache header (and the contained data is public, it is not owned by Apache) -->
+ <exclude>src/test/resources/org/apache/commons/math4/distribution/testData.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/random/emptyFile.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/PiDigits.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/NumAcc3.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/Lew.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/NumAcc2.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/NumAcc1.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/Lottery.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/NumAcc4.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/Michelso.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/stat/data/Mavro.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/issue-1211.bsp</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/pentomino-N-bad-orientation.ply</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/pentomino-N-hole.ply</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/pentomino-N-out-of-plane.ply</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/pentomino-N-too-close.ply</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/geometry/euclidean/threed/pentomino-N.ply</exclude>
+
+ <!-- direction numbers for Sobol generation from Frances Y. Kuo and Stephen Joe,
+ available under a BSD-style license (see LICENSE.txt) -->
+ <exclude>src/main/resources/assets/org/apache/commons/math4/random/new-joe-kuo-6.21201</exclude>
+
+ <!-- text file explaining reference to a public domain image -->
+ <exclude>src/userguide/resources/references.txt</exclude>
+
+ <!-- version 0.8 of apache-rat-plugin does not exclude properly
+ some default development tools files (see RAT-126) -->
+ <exclude>bin/**</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.checkstyle</exclude>
+ <exclude>.ekstazi/**</exclude>
+
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -695,14 +738,19 @@
<artifactId>apache-rat-plugin</artifactId>
<version>${commons.rat.version}</version>
<configuration>
- <excludes>
+ <!--
+ Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check
+ Below should agree with config in <build> section, so the site
+ gets consistent output.
+ -->
+ <excludes>
<!-- MANIFEST files cannot have any comments, so we can't put license header -->
<exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude>
<!-- the following are test data files with specific syntax that cannot include
Apache header (and the contained data is public, it is not owned by Apache) -->
- <exclude>src/test/resources/org/apache/commons/math4/random/testData.txt</exclude>
+ <exclude>src/test/resources/org/apache/commons/math4/distribution/testData.txt</exclude>
<exclude>src/test/resources/org/apache/commons/math4/random/emptyFile.txt</exclude>
<exclude>src/test/resources/org/apache/commons/math4/stat/data/PiDigits.txt</exclude>
<exclude>src/test/resources/org/apache/commons/math4/stat/data/NumAcc3.txt</exclude>
@@ -722,7 +770,7 @@
<!-- direction numbers for Sobol generation from Frances Y. Kuo and Stephen Joe,
available under a BSD-style license (see LICENSE.txt) -->
- <exclude>src/main/resources/assets/org/apache/commons/math4/random/new-joe-kuo-6.1000</exclude>
+ <exclude>src/main/resources/assets/org/apache/commons/math4/random/new-joe-kuo-6.21201</exclude>
<!-- text file explaining reference to a public domain image -->
<exclude>src/userguide/resources/references.txt</exclude>
@@ -803,7 +851,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <additionalOptions>${mathjax.javadoc.qualifier} -header '<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
+ <additionalOptions>-Xdoclint:all --allow-script-in-comments -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${math.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalOptions>
</configuration>
</plugin>
</plugins>
@@ -1000,13 +1048,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>mathjax-java8</id>
- <activation><jdk>[1.8,)</jdk></activation>
- <properties>
- <!-- MathJax requires additional Javadoc qualifier for Java8+ -->
- <allowscript.javadoc.qualifier>--allow-script-in-comments</allowscript.javadoc.qualifier>
- </properties>
- </profile>
</profiles>
</project>