Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-math
diff --git a/commons-math-core/pom.xml b/commons-math-core/pom.xml
index a84ed8f..ab98b34 100644
--- a/commons-math-core/pom.xml
+++ b/commons-math-core/pom.xml
@@ -40,6 +40,9 @@
<commons.osgi.export>org.apache.commons.math4.core</commons.osgi.export>
<!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}/..</math.parent.dir>
+
+ <!-- Disable coverage checks in Travis -->
+ <jacoco.skip>true</jacoco.skip>
</properties>
<dependencies>
diff --git a/dist-archive/pom.xml b/dist-archive/pom.xml
index ad71591..4c6846d 100644
--- a/dist-archive/pom.xml
+++ b/dist-archive/pom.xml
@@ -65,18 +65,18 @@
<!-- Module: Legacy -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy</artifactId>
+ <artifactId>commons-math4-legacy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy</artifactId>
+ <artifactId>commons-math4-legacy</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy</artifactId>
+ <artifactId>commons-math4-legacy</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
@@ -84,18 +84,18 @@
<!-- Module: ANN -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-neuralnet</artifactId>
+ <artifactId>commons-math4-neuralnet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-neuralnet</artifactId>
+ <artifactId>commons-math4-neuralnet</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-neuralnet</artifactId>
+ <artifactId>commons-math4-neuralnet</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
@@ -103,37 +103,18 @@
<!-- Module: Transforms -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-transform</artifactId>
+ <artifactId>commons-math4-transform</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-transform</artifactId>
+ <artifactId>commons-math4-transform</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-transform</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
-
- <!-- Module: Examples -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math-examples</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math-examples</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math-examples</artifactId>
+ <artifactId>commons-math4-transform</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
@@ -141,18 +122,18 @@
<!-- Module: Exception (legacy) -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-exception</artifactId>
+ <artifactId>commons-math4-legacy-exception</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-exception</artifactId>
+ <artifactId>commons-math4-legacy-exception</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-exception</artifactId>
+ <artifactId>commons-math4-legacy-exception</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
@@ -160,18 +141,37 @@
<!-- Module: Core (legacy) -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-core</artifactId>
+ <artifactId>commons-math4-legacy-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-core</artifactId>
+ <artifactId>commons-math4-legacy-core</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math-legacy-core</artifactId>
+ <artifactId>commons-math4-legacy-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <!-- Module: Legacy -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math4-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math4-legacy</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math4-legacy</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
diff --git a/pom.xml b/pom.xml
index c618f11..d763cb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,13 +640,9 @@
</profile>
<profile>
<!-- Runs if the SVN site checkout does not exist.
- This is either obtained using svn (for the parent) or an empty directory is created. -->
- <id>setup-checkout</id>
- <activation>
- <file>
- <missing>${commons.scmPubCheckoutDirectory}</missing>
- </file>
- </activation>
+ This is either obtained using svn (for the parent) or an empty directory is created.
+ The site-content directory is used when updating the live site. -->
+ <id>site-checkout</id>
<build>
<plugins>
<plugin>
@@ -701,7 +697,7 @@
</profile>
<profile>
<!-- Allow the SVN site checkout to be removed in the clean phase. -->
- <id>clean-checkout</id>
+ <id>clean-site-checkout</id>
<activation>
<file>
<exists>${commons.scmPubCheckoutDirectory}</exists>
@@ -844,6 +840,26 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>release</id>
+ <modules> <!-- Do not change the ordering of the 4 blocks below. -->
+
+ <!-- 1. Modules that do not depend on "legacy" codes. -->
+ <module>commons-math-core</module>
+ <module>commons-math-neuralnet</module>
+ <module>commons-math-transform</module>
+
+ <!-- 2. Modularized (but not refactored) legacy functionalities. -->
+ <module>commons-math-legacy-exception</module>
+ <module>commons-math-legacy-core</module>
+
+ <!-- 3. Non-modularized legacy functionalities. -->
+ <module>commons-math-legacy</module>
+
+ <module>dist-archive</module>
+ </modules>
+ </profile>
</profiles>
<developers>
