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 2018/01/30 13:43:54 UTC
commons-rng git commit: RNG-40: Make artefacts compliant with Java 9.
Repository: commons-rng
Updated Branches:
refs/heads/master da6512c75 -> 9672beba8
RNG-40: Make artefacts compliant with Java 9.
This is untested.
Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/9672beba
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/9672beba
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/9672beba
Branch: refs/heads/master
Commit: 9672beba878dbc70549752b481601031f95c1c84
Parents: da6512c
Author: Gilles <er...@apache.org>
Authored: Tue Jan 30 14:42:19 2018 +0100
Committer: Gilles <er...@apache.org>
Committed: Tue Jan 30 14:42:19 2018 +0100
----------------------------------------------------------------------
commons-rng-client-api/pom.xml | 5 +++--
commons-rng-core/pom.xml | 5 +++--
commons-rng-examples/pom.xml | 5 +++--
commons-rng-jmh/pom.xml | 5 +++--
commons-rng-sampling/pom.xml | 5 +++--
commons-rng-simple/pom.xml | 5 +++--
pom.xml | 21 +++++++++++++++++----
7 files changed, 35 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-client-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-client-api/pom.xml b/commons-rng-client-api/pom.xml
index a8f406c..9e19247 100644
--- a/commons-rng-client-api/pom.xml
+++ b/commons-rng-client-api/pom.xml
@@ -34,10 +34,11 @@
<description>API for client code that uses random numbers generators.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.api</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-core/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-core/pom.xml b/commons-rng-core/pom.xml
index ca7be50..d063e1d 100644
--- a/commons-rng-core/pom.xml
+++ b/commons-rng-core/pom.xml
@@ -34,10 +34,11 @@
<description>Pure Java implementations of random numbers generator algorithms.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng.core</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng.core</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.core</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.core</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-examples/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-examples/pom.xml b/commons-rng-examples/pom.xml
index 9e7292c..29126b2 100644
--- a/commons-rng-examples/pom.xml
+++ b/commons-rng-examples/pom.xml
@@ -37,10 +37,11 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng.examples</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng.examples</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.examples</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-jmh/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-jmh/pom.xml b/commons-rng-jmh/pom.xml
index b4f5285..eeb64d9 100644
--- a/commons-rng-jmh/pom.xml
+++ b/commons-rng-jmh/pom.xml
@@ -60,10 +60,11 @@
</dependencies>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng.jmh</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng.jmh</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.jmh</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.jmh</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-sampling/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-sampling/pom.xml b/commons-rng-sampling/pom.xml
index d774290..29c6714 100644
--- a/commons-rng-sampling/pom.xml
+++ b/commons-rng-sampling/pom.xml
@@ -35,10 +35,11 @@
for various distributions.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng.sampling</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng.sampling</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.sampling</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.sampling</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/commons-rng-simple/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-simple/pom.xml b/commons-rng-simple/pom.xml
index 354b23c..6d47e08 100644
--- a/commons-rng-simple/pom.xml
+++ b/commons-rng-simple/pom.xml
@@ -34,11 +34,12 @@
<description>Simple API for instantiating random numbers generators.</description>
<properties>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng.simple</commons.osgi.symbolicName>
<!-- OSGi -->
+ <commons.osgi.symbolicName>org.apache.commons.rng.simple</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.simple</commons.osgi.export>
<commons.osgi.private>org.apache.commons.rng.simple.internal</commons.osgi.private>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.simple</commons.automatic.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/9672beba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c127ab..de01476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,11 +83,11 @@
name of the base package evolves with major release numbers
(see "commons.osgi.symbolicName", below). -->
<commons.componentid>rng</commons.componentid>
- <!-- This value must reflect the current name of the base package. -->
- <commons.osgi.symbolicName>org.apache.commons.rng</commons.osgi.symbolicName>
- <commons.module.name>org.apache.commons.rng</commons.module.name>
<!-- OSGi -->
- <commons.osgi.export>org.apache.commons.rng</commons.osgi.export>
+ <commons.osgi.symbolicName>org.apache.commons.rng.parent</commons.osgi.symbolicName>
+ <commons.osgi.export>org.apache.commons.rng.parent</commons.osgi.export>
+ <!-- Java 9+ -->
+ <commons.automatic.module.name>org.apache.commons.rng.parent</commons.automatic.module.name>
<!-- do not use snapshot suffix here -->
<commons.release.version>1.0</commons.release.version>
<commons.release.desc>(requires Java 6+)</commons.release.desc>
@@ -145,6 +145,19 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive combine.children="append">
+ <manifestEntries>
+ <!-- Java 9 -->
+ <Automatic-Module-Name>${commons.automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>