You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2022/10/13 12:42:49 UTC
[commons-math] 15/23: Reorder properties to match commons RNG parent.
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git
commit 7b18e4f6765f0853b88edbc0fc802484f9b22769
Author: aherbert <ah...@apache.org>
AuthorDate: Thu Oct 13 12:59:51 2022 +0100
Reorder properties to match commons RNG parent.
Update commons.module.name to commons.automatic.module.name
---
commons-math-core/pom.xml | 2 +-
commons-math-legacy-core/pom.xml | 2 +-
commons-math-legacy-exception/pom.xml | 2 +-
commons-math-legacy/pom.xml | 2 +-
commons-math-neuralnet/pom.xml | 2 +-
commons-math-transform/pom.xml | 2 +-
pom.xml | 31 +++++++++++++++++--------------
7 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/commons-math-core/pom.xml b/commons-math-core/pom.xml
index ab98b3405..aaeb68e3c 100644
--- a/commons-math-core/pom.xml
+++ b/commons-math-core/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.core</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.core</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.core</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/commons-math-legacy-core/pom.xml b/commons-math-legacy-core/pom.xml
index 759734d64..04b039e2e 100644
--- a/commons-math-legacy-core/pom.xml
+++ b/commons-math-legacy-core/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.legacy.core</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.legacy.core</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.legacy.core</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/commons-math-legacy-exception/pom.xml b/commons-math-legacy-exception/pom.xml
index c34bfea71..6be98481a 100644
--- a/commons-math-legacy-exception/pom.xml
+++ b/commons-math-legacy-exception/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.legacy.exception</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.legacy.exception</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.legacy.exception</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/commons-math-legacy/pom.xml b/commons-math-legacy/pom.xml
index 630e38bf5..66673454f 100644
--- a/commons-math-legacy/pom.xml
+++ b/commons-math-legacy/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.legacy</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.legacy</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.legacy</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/commons-math-neuralnet/pom.xml b/commons-math-neuralnet/pom.xml
index 86498a3d4..914d00796 100644
--- a/commons-math-neuralnet/pom.xml
+++ b/commons-math-neuralnet/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.neuralnet</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.neuralnet</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.neuralnet</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/commons-math-transform/pom.xml b/commons-math-transform/pom.xml
index ae76e4a30..4f0cad171 100644
--- a/commons-math-transform/pom.xml
+++ b/commons-math-transform/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4.transform</commons.module.name>
+ <commons.automatic.module.name>org.apache.commons.math4.transform</commons.automatic.module.name>
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4.transform</commons.osgi.symbolicName>
<!-- OSGi -->
diff --git a/pom.xml b/pom.xml
index 3c6c98994..469c0aad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,18 +40,18 @@
name of the base package evolves with major release numbers
(see "commons.osgi.symbolicName", below). -->
<commons.componentid>math</commons.componentid>
- <!-- The Java Module System Name -->
- <commons.module.name>org.apache.commons.math4</commons.module.name>
+ <!-- OSGi -->
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.math4</commons.osgi.symbolicName>
- <!-- OSGi -->
<commons.osgi.export>org.apache.commons.math4</commons.osgi.export>
+ <!-- The Java Module System Name -->
+ <commons.automatic.module.name>org.apache.commons.math4</commons.automatic.module.name>
<!-- This flag should only be true in the dist-archive module. -->
<commons.release.isDistModule>false</commons.release.isDistModule>
<!-- do not use snapshot suffix here -->
<commons.release.version>4.0</commons.release.version>
- <commons.release.desc>(requires Java 8+)</commons.release.desc>
<commons.rc.version>RC1</commons.rc.version>
+ <commons.release.desc>(requires Java 8+)</commons.release.desc>
<commons.binary.suffix>-bin</commons.binary.suffix>
<commons.jira.id>MATH</commons.jira.id>
@@ -71,16 +71,16 @@
<!-- Multi-module support fixed in commons-parent 55 -->
<cyclonedx.skip>true</cyclonedx.skip>
- <!-- Increase from commons-parent -->
- <commons.jacoco.methodRatio>1.00</commons.jacoco.methodRatio>
- <!-- Set to true when coverage goals are achieved -->
- <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>
-
<!-- Fix to avoid JXR 3.0.0 forking the lifecycle phase 'compile' during site report
jxr:aggregate. If compile is forked, the dist-archive build fails when attempting
to collect the artifacts from other modules. -->
<commons.jxr.version>2.5</commons.jxr.version>
+ <!-- Increase from commons-parent -->
+ <commons.jacoco.methodRatio>1.00</commons.jacoco.methodRatio>
+ <!-- Set to true when coverage goals are achieved -->
+ <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>
@@ -90,10 +90,6 @@
<math.jgit.buildnumber.version>1.2.10</math.jgit.buildnumber.version>
<implementation.build>${git.revision}; ${maven.build.timestamp}</implementation.build>
- <!-- Workaround to avoid the SVN site checkout in all modules.
- This flag should be deactivated by child modules. -->
- <perform.site.checkout>true</perform.site.checkout>
-
<!--
Override so that "mvn commons:download-page" will generates a web page
referring to the files created by the "dist-archive" module.
@@ -102,7 +98,13 @@
<commons.release.name>commons-math4-${project.version}</commons.release.name>
<!-- Java8+ requires additional Javadoc qualifier for scripts such as MathJax -->
<allowscript.javadoc.qualifier>--allow-script-in-comments</allowscript.javadoc.qualifier>
+ <!-- Check for all javadoc errors -->
<doclint.javadoc.qualifier>-Xdoclint:all</doclint.javadoc.qualifier>
+
+ <!-- Workaround to avoid the SVN site checkout in all modules.
+ This flag should be deactivated by child modules. -->
+ <perform.site.checkout>true</perform.site.checkout>
+
</properties>
<modules> <!-- Do not change the ordering of the 4 blocks below. -->
@@ -435,7 +437,8 @@
<configuration>
<archive combine.children="append">
<manifestEntries>
- <Automatic-Module-Name>${commons.module.name}</Automatic-Module-Name>
+ <!-- Java 9 -->
+ <Automatic-Module-Name>${commons.automatic.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>