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/12/02 12:12:03 UTC
[commons-statistics] 02/02: Consistent use of commons.module.name
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-statistics.git
commit 1bdd9c8c94776234cb6b664aa613acd6dd8808ce
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:32:06 2022 +0000
Consistent use of commons.module.name
Rename commons.automatic.module.name to commons.module.name in examples
modules.
Do not assume the commons.module.name can be the same as
commons.osgi.symbolicName.
---
commons-statistics-distribution/pom.xml | 5 +++--
commons-statistics-examples/examples-distribution/pom.xml | 2 +-
commons-statistics-examples/examples-jmh/pom.xml | 2 +-
commons-statistics-examples/pom.xml | 2 +-
commons-statistics-regression/pom.xml | 5 +++--
pom.xml | 7 ++++---
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/commons-statistics-distribution/pom.xml b/commons-statistics-distribution/pom.xml
index 6aa61b7..0da6619 100644
--- a/commons-statistics-distribution/pom.xml
+++ b/commons-statistics-distribution/pom.xml
@@ -33,10 +33,11 @@
<description>Statistical distributions.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.statistics.distribution</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.statistics.distribution</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.statistics.distribution</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.module.name>org.apache.commons.statistics.distribution</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<statistics.parent.dir>${basedir}/..</statistics.parent.dir>
<statistics.jira.component>distribution</statistics.jira.component>
diff --git a/commons-statistics-examples/examples-distribution/pom.xml b/commons-statistics-examples/examples-distribution/pom.xml
index 629afc3..6dbaf17 100644
--- a/commons-statistics-examples/examples-distribution/pom.xml
+++ b/commons-statistics-examples/examples-distribution/pom.xml
@@ -37,7 +37,7 @@
<commons.osgi.symbolicName>org.apache.commons.statistics.examples.distribution</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.statistics.examples.distribution</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.statistics.examples.distribution</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.statistics.examples.distribution</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<statistics.parent.dir>${basedir}/../..</statistics.parent.dir>
diff --git a/commons-statistics-examples/examples-jmh/pom.xml b/commons-statistics-examples/examples-jmh/pom.xml
index 8fd5568..605fde1 100644
--- a/commons-statistics-examples/examples-jmh/pom.xml
+++ b/commons-statistics-examples/examples-jmh/pom.xml
@@ -59,7 +59,7 @@
<commons.osgi.symbolicName>org.apache.commons.statistics.examples.jmh</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.statistics.examples.jmh</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.statistics.examples.jmh</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.statistics.examples.jmh</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<statistics.parent.dir>${basedir}/../..</statistics.parent.dir>
diff --git a/commons-statistics-examples/pom.xml b/commons-statistics-examples/pom.xml
index 6319fb5..a15a2d3 100644
--- a/commons-statistics-examples/pom.xml
+++ b/commons-statistics-examples/pom.xml
@@ -39,7 +39,7 @@
<commons.osgi.symbolicName>org.apache.commons.statistics.examples</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.statistics.examples</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.statistics.examples</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.statistics.examples</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<statistics.parent.dir>${basedir}/..</statistics.parent.dir>
diff --git a/commons-statistics-regression/pom.xml b/commons-statistics-regression/pom.xml
index 8dcd81a..4ad0d34 100644
--- a/commons-statistics-regression/pom.xml
+++ b/commons-statistics-regression/pom.xml
@@ -33,10 +33,11 @@
<description>Statistical regressions.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.statistics.regression</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.statistics.regression</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.statistics.regression</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.module.name>org.apache.commons.statistics.regression</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<statistics.parent.dir>${basedir}/..</statistics.parent.dir>
<statistics.jira.component>regression</statistics.jira.component>
diff --git a/pom.xml b/pom.xml
index 73aea1b..69aa244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,12 +84,12 @@
name of the base package evolves with major release numbers
(see "commons.osgi.symbolicName", below). -->
<commons.componentid>statistics</commons.componentid>
+ <!-- OSGi -->
<!-- This value must reflect the current name of the base package. -->
<commons.osgi.symbolicName>org.apache.commons.statistics</commons.osgi.symbolicName>
- <!-- Module name can re-use the OSGI name -->
- <commons.module.name>${commons.osgi.symbolicName}</commons.module.name>
- <!-- OSGi -->
<commons.osgi.export>org.apache.commons.statistics</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.module.name>org.apache.commons.statistics</commons.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 -->
@@ -193,6 +193,7 @@
<configuration>
<archive combine.children="append">
<manifestEntries>
+ <!-- Java 9+ -->
<Automatic-Module-Name>${commons.module.name}</Automatic-Module-Name>
<!-- Add entries from CP that are not inherited (for reasons unknown).
Replace ${implementation.build} property with the unique git build number. -->