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 11:59:14 UTC
[commons-rng] branch master updated (fe1154d5 -> 9684d399)
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
from fe1154d5 Exclude development files from source distribution
new 5a60ea85 Update to use commons.module.name (consitent with CP)
new 9684d399 Fix git build number in manifest
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
commons-rng-client-api/pom.xml | 2 +-
commons-rng-core/pom.xml | 2 +-
commons-rng-examples/examples-jmh/pom.xml | 2 +-
.../examples-jpms/jpms-app/pom.xml | 2 +-
.../examples-jpms/jpms-lib/pom.xml | 2 +-
commons-rng-examples/examples-quadrature/pom.xml | 2 +-
commons-rng-examples/examples-sampling/pom.xml | 2 +-
commons-rng-examples/examples-stress/pom.xml | 2 +-
commons-rng-examples/pom.xml | 2 +-
commons-rng-sampling/pom.xml | 2 +-
commons-rng-simple/pom.xml | 2 +-
pom.xml | 52 ++++++++--------------
12 files changed, 29 insertions(+), 45 deletions(-)
[commons-rng] 01/02: Update to use commons.module.name (consitent with CP)
Posted by ah...@apache.org.
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-rng.git
commit 5a60ea8590b19d6ee09321f2a0ce8c79ffb13380
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:35:02 2022 +0000
Update to use commons.module.name (consitent with CP)
---
commons-rng-client-api/pom.xml | 2 +-
commons-rng-core/pom.xml | 2 +-
commons-rng-examples/examples-jmh/pom.xml | 2 +-
commons-rng-examples/examples-jpms/jpms-app/pom.xml | 2 +-
commons-rng-examples/examples-jpms/jpms-lib/pom.xml | 2 +-
commons-rng-examples/examples-quadrature/pom.xml | 2 +-
commons-rng-examples/examples-sampling/pom.xml | 2 +-
commons-rng-examples/examples-stress/pom.xml | 2 +-
commons-rng-examples/pom.xml | 2 +-
commons-rng-sampling/pom.xml | 2 +-
commons-rng-simple/pom.xml | 2 +-
pom.xml | 4 ++--
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/commons-rng-client-api/pom.xml b/commons-rng-client-api/pom.xml
index f6cbab9b..cfc4fefe 100644
--- a/commons-rng-client-api/pom.xml
+++ b/commons-rng-client-api/pom.xml
@@ -35,7 +35,7 @@
<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>
+ <commons.module.name>org.apache.commons.rng.api</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
<rng.jira.component>client-api</rng.jira.component>
diff --git a/commons-rng-core/pom.xml b/commons-rng-core/pom.xml
index 8071a95f..64e672d6 100644
--- a/commons-rng-core/pom.xml
+++ b/commons-rng-core/pom.xml
@@ -39,7 +39,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.core</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.core;x-friends:="org.apache.commons.rng.simple"</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.core</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.core</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
<rng.jira.component>core</rng.jira.component>
diff --git a/commons-rng-examples/examples-jmh/pom.xml b/commons-rng-examples/examples-jmh/pom.xml
index 3e68fdce..3122fd51 100644
--- a/commons-rng-examples/examples-jmh/pom.xml
+++ b/commons-rng-examples/examples-jmh/pom.xml
@@ -66,7 +66,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.jmh</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.jmh</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.jmh</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.jmh</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/../..</rng.parent.dir>
diff --git a/commons-rng-examples/examples-jpms/jpms-app/pom.xml b/commons-rng-examples/examples-jpms/jpms-app/pom.xml
index 95ae2358..248f16aa 100644
--- a/commons-rng-examples/examples-jpms/jpms-app/pom.xml
+++ b/commons-rng-examples/examples-jpms/jpms-app/pom.xml
@@ -50,7 +50,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.jpms.app</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.jpms.app</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.jpms.app</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.jpms.app</commons.module.name>
</properties>
</project>
diff --git a/commons-rng-examples/examples-jpms/jpms-lib/pom.xml b/commons-rng-examples/examples-jpms/jpms-lib/pom.xml
index 1c0bd22e..c5db5bbf 100644
--- a/commons-rng-examples/examples-jpms/jpms-lib/pom.xml
+++ b/commons-rng-examples/examples-jpms/jpms-lib/pom.xml
@@ -49,7 +49,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.jpms.lib</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.jpms.lib</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.jpms.lib</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.jpms.lib</commons.module.name>
</properties>
</project>
diff --git a/commons-rng-examples/examples-quadrature/pom.xml b/commons-rng-examples/examples-quadrature/pom.xml
index 9faa65a4..15ee5692 100644
--- a/commons-rng-examples/examples-quadrature/pom.xml
+++ b/commons-rng-examples/examples-quadrature/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.quadrature</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.quadrature</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.quadrature</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.quadrature</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/../..</rng.parent.dir>
diff --git a/commons-rng-examples/examples-sampling/pom.xml b/commons-rng-examples/examples-sampling/pom.xml
index be5420a4..84a879d6 100644
--- a/commons-rng-examples/examples-sampling/pom.xml
+++ b/commons-rng-examples/examples-sampling/pom.xml
@@ -37,7 +37,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.sampling</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.sampling</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.sampling</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.sampling</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/../..</rng.parent.dir>
diff --git a/commons-rng-examples/examples-stress/pom.xml b/commons-rng-examples/examples-stress/pom.xml
index 4aae56aa..ae7674d8 100644
--- a/commons-rng-examples/examples-stress/pom.xml
+++ b/commons-rng-examples/examples-stress/pom.xml
@@ -37,7 +37,7 @@
<commons.osgi.symbolicName>org.apache.commons.rng.examples.stress</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.rng.examples.stress</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.rng.examples.stress</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.rng.examples.stress</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/../..</rng.parent.dir>
diff --git a/commons-rng-examples/pom.xml b/commons-rng-examples/pom.xml
index 880038fe..ad47de19 100644
--- a/commons-rng-examples/pom.xml
+++ b/commons-rng-examples/pom.xml
@@ -39,7 +39,7 @@
<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>
+ <commons.module.name>org.apache.commons.rng.examples</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
diff --git a/commons-rng-sampling/pom.xml b/commons-rng-sampling/pom.xml
index 073417db..3735c55d 100644
--- a/commons-rng-sampling/pom.xml
+++ b/commons-rng-sampling/pom.xml
@@ -36,7 +36,7 @@
<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>
+ <commons.module.name>org.apache.commons.rng.sampling</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
<rng.jira.component>sampling</rng.jira.component>
diff --git a/commons-rng-simple/pom.xml b/commons-rng-simple/pom.xml
index f1c17255..cfcd4e05 100644
--- a/commons-rng-simple/pom.xml
+++ b/commons-rng-simple/pom.xml
@@ -36,7 +36,7 @@
<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>
+ <commons.module.name>org.apache.commons.rng.simple</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}/..</rng.parent.dir>
<rng.jira.component>simple</rng.jira.component>
diff --git a/pom.xml b/pom.xml
index c860546f..54908923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<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>
+ <commons.module.name>org.apache.commons.rng.parent</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 -->
@@ -179,7 +179,7 @@
<archive combine.children="append">
<manifestEntries>
<!-- Java 9 -->
- <Automatic-Module-Name>${commons.automatic.module.name}</Automatic-Module-Name>
+ <Automatic-Module-Name>${commons.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
[commons-rng] 02/02: Fix git build number in manifest
Posted by ah...@apache.org.
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-rng.git
commit 9684d3992904ca51188d4491e164a0545f4f2126
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:58:56 2022 +0000
Fix git build number in manifest
---
pom.xml | 48 ++++++++++++++++--------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 54908923..c0498a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,11 +78,6 @@
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-rng</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
- <!-- Temporary fix to replace svn-based build number with git-based build number -->
- <buildnumber.skip>true</buildnumber.skip>
- <rng.jgit.buildnumber.version>1.2.10</rng.jgit.buildnumber.version>
- <implementation.build>${git.revision}; ${maven.build.timestamp}</implementation.build>
-
<!--
Override so that "mvn commons:download-page" will generates a web page
referring to the files created by the "dist-archive" module.
@@ -180,10 +175,26 @@
<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. -->
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Build>${buildNumber}; ${maven.build.timestamp}</Implementation-Build>
+ <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <configuration>
+ <!-- buildnumber-maven-plugin:
+ "for git getLastChangedRevision() returns null instead of the last revision"
+ Override CP to use the last revision of the repository (OK for release jars). -->
+ <useLastCommittedRevision>false</useLastCommittedRevision>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -505,33 +516,6 @@
</reporting>
<profiles>
- <profile>
- <id>jgit-buildnumber</id>
- <activation>
- <file>
- <exists>.git</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>ru.concerteza.buildnumber</groupId>
- <artifactId>maven-jgit-buildnumber-plugin</artifactId>
- <version>${rng.jgit.buildnumber.version}</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>extract-buildnumber</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<!-- Override a parent property if the SVN site checkout should not be performed.
This should activate for child modules. -->