Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-math

This commit is contained in:
Gilles Sadowski 2022-01-18 20:01:21 +01:00
parent ae6ceeadd1 61cfea92d9
commit 5b291c7950
3 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commons-math-core/pom.xml
View File

@ -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>

68
dist-archive/pom.xml
View File

@ -65,18 +65,18 @@ under the License.
<!-- 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 @@ under the License.
<!-- 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 @@ under the License.
<!-- 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 @@ under the License.
<!-- 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 @@ under the License.
<!-- 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>

32
pom.xml
View File

@ -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 @@ This is avoided by creating an empty directory when svn is not available.
</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 @@ This is avoided by creating an empty directory when svn is not available.
</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>