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 4392bb2a34c87884389ae942ab2aa25b49af1ae2 Author: Alex Herbert <aherb...@apache.org> AuthorDate: Thu Apr 18 09:31:56 2024 +0100 Update to CP 69 --- commons-rng-bom/pom.xml | 2 ++ commons-rng-client-api/pom.xml | 6 ++++-- commons-rng-core/pom.xml | 8 +++++--- commons-rng-docs/pom.xml | 7 +++++-- commons-rng-examples/examples-jmh/pom.xml | 6 ++++-- commons-rng-examples/examples-jpms/jpms-app/pom.xml | 2 ++ commons-rng-examples/examples-jpms/jpms-lib/pom.xml | 2 ++ commons-rng-examples/examples-jpms/pom.xml | 2 ++ commons-rng-examples/examples-quadrature/pom.xml | 6 ++++-- commons-rng-examples/examples-sampling/pom.xml | 6 ++++-- commons-rng-examples/examples-stress/pom.xml | 6 ++++-- commons-rng-examples/pom.xml | 6 ++++-- commons-rng-sampling/pom.xml | 6 ++++-- commons-rng-simple/pom.xml | 6 ++++-- dist-archive/pom.xml | 3 +++ pom.xml | 19 +++++-------------- 16 files changed, 58 insertions(+), 35 deletions(-) diff --git a/commons-rng-bom/pom.xml b/commons-rng-bom/pom.xml index c37a0548..de87d1f9 100644 --- a/commons-rng-bom/pom.xml +++ b/commons-rng-bom/pom.xml @@ -52,6 +52,8 @@ <properties> <!-- Workaround to avoid duplicating config files. --> <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- Skip the standard install and deploy to avoid processing this pom as the artifact. --> <maven.install.skip>true</maven.install.skip> diff --git a/commons-rng-client-api/pom.xml b/commons-rng-client-api/pom.xml index cfc4fefe..3fcdeae3 100644 --- a/commons-rng-client-api/pom.xml +++ b/commons-rng-client-api/pom.xml @@ -31,13 +31,15 @@ <description>API for client code that uses random numbers generators.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <commons.osgi.symbolicName>org.apache.commons.rng</commons.osgi.symbolicName> <commons.osgi.export>org.apache.commons.rng</commons.osgi.export> <!-- Java 9+ --> <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> </properties> diff --git a/commons-rng-core/pom.xml b/commons-rng-core/pom.xml index 64e672d6..644a081d 100644 --- a/commons-rng-core/pom.xml +++ b/commons-rng-core/pom.xml @@ -35,13 +35,15 @@ may be enforced through JPMS access restrictions.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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> + <commons.osgi.export>org.apache.commons.rng.core</commons.osgi.export> <!-- Java 9+ --> <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> </properties> diff --git a/commons-rng-docs/pom.xml b/commons-rng-docs/pom.xml index 50fe5510..531d3e48 100644 --- a/commons-rng-docs/pom.xml +++ b/commons-rng-docs/pom.xml @@ -32,11 +32,14 @@ <description>Aggregator module to genenerate Apache Commons RNG documentation.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> + <moditect.skip>true</moditect.skip> <checkstyle.skip>true</checkstyle.skip> <animal.sniffer.skip>true</animal.sniffer.skip> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/..</rng.parent.dir> <!-- Skip the standard build plugins to avoid processing this 'jar' as an artifact. --> <maven.resources.skip>true</maven.resources.skip> <maven.source.skip>true</maven.source.skip> diff --git a/commons-rng-examples/examples-jmh/pom.xml b/commons-rng-examples/examples-jmh/pom.xml index e280e287..2c1bf202 100644 --- a/commons-rng-examples/examples-jmh/pom.xml +++ b/commons-rng-examples/examples-jmh/pom.xml @@ -62,13 +62,15 @@ </dependencies> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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.module.name>org.apache.commons.rng.examples.jmh</commons.module.name> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/../..</rng.parent.dir> <!-- JMH Benchmark related properties: version, name of the benchmarking uber jar. --> <jmh.version>1.35</jmh.version> diff --git a/commons-rng-examples/examples-jpms/jpms-app/pom.xml b/commons-rng-examples/examples-jpms/jpms-app/pom.xml index 248f16aa..d851ae3c 100644 --- a/commons-rng-examples/examples-jpms/jpms-app/pom.xml +++ b/commons-rng-examples/examples-jpms/jpms-app/pom.xml @@ -46,6 +46,8 @@ <properties> <!-- Workaround to avoid duplicating config files. --> <rng.parent.dir>${basedir}/../../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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> diff --git a/commons-rng-examples/examples-jpms/jpms-lib/pom.xml b/commons-rng-examples/examples-jpms/jpms-lib/pom.xml index c5db5bbf..d83693fd 100644 --- a/commons-rng-examples/examples-jpms/jpms-lib/pom.xml +++ b/commons-rng-examples/examples-jpms/jpms-lib/pom.xml @@ -45,6 +45,8 @@ <properties> <!-- Workaround to avoid duplicating config files. --> <rng.parent.dir>${basedir}/../../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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> diff --git a/commons-rng-examples/examples-jpms/pom.xml b/commons-rng-examples/examples-jpms/pom.xml index 310da2e0..48f9be9b 100644 --- a/commons-rng-examples/examples-jpms/pom.xml +++ b/commons-rng-examples/examples-jpms/pom.xml @@ -34,6 +34,8 @@ <properties> <!-- Workaround to avoid duplicating config files. --> <rng.parent.dir>${basedir}/../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- Java language level. --> <maven.compiler.source>11</maven.compiler.source> diff --git a/commons-rng-examples/examples-quadrature/pom.xml b/commons-rng-examples/examples-quadrature/pom.xml index 15ee5692..3cde57b1 100644 --- a/commons-rng-examples/examples-quadrature/pom.xml +++ b/commons-rng-examples/examples-quadrature/pom.xml @@ -32,13 +32,15 @@ Code in this module is not part of the public API.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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.module.name>org.apache.commons.rng.examples.quadrature</commons.module.name> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/../..</rng.parent.dir> <uberjar.name>examples-quadrature</uberjar.name> <project.mainClass>org.apache.commons.rng.examples.quadrature.ComputePi</project.mainClass> diff --git a/commons-rng-examples/examples-sampling/pom.xml b/commons-rng-examples/examples-sampling/pom.xml index 84a879d6..1f3ecf20 100644 --- a/commons-rng-examples/examples-sampling/pom.xml +++ b/commons-rng-examples/examples-sampling/pom.xml @@ -33,13 +33,15 @@ Code in this module is not part of the public API.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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.module.name>org.apache.commons.rng.examples.sampling</commons.module.name> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/../..</rng.parent.dir> <uberjar.name>examples-sampling</uberjar.name> <project.mainClass>org.apache.commons.rng.examples.sampling.ExamplesSamplingApplication</project.mainClass> diff --git a/commons-rng-examples/examples-stress/pom.xml b/commons-rng-examples/examples-stress/pom.xml index ae7674d8..a3dc4032 100644 --- a/commons-rng-examples/examples-stress/pom.xml +++ b/commons-rng-examples/examples-stress/pom.xml @@ -33,13 +33,15 @@ Code in this module is not part of the public API.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/../..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- OSGi --> <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.module.name>org.apache.commons.rng.examples.stress</commons.module.name> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/../..</rng.parent.dir> <uberjar.name>examples-stress</uberjar.name> <project.mainClass>org.apache.commons.rng.examples.stress.ExamplesStressApplication</project.mainClass> diff --git a/commons-rng-examples/pom.xml b/commons-rng-examples/pom.xml index ad47de19..f4031d9c 100644 --- a/commons-rng-examples/pom.xml +++ b/commons-rng-examples/pom.xml @@ -35,13 +35,15 @@ and to help ensure correctness of the implementations.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- 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.module.name>org.apache.commons.rng.examples</commons.module.name> - <!-- Workaround to avoid duplicating config files. --> - <rng.parent.dir>${basedir}/..</rng.parent.dir> <rng.picocli.version>4.6.1</rng.picocli.version> <rng.exec.version>3.0.0</rng.exec.version> diff --git a/commons-rng-sampling/pom.xml b/commons-rng-sampling/pom.xml index 3735c55d..0ca24715 100644 --- a/commons-rng-sampling/pom.xml +++ b/commons-rng-sampling/pom.xml @@ -32,13 +32,15 @@ for various distributions.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- 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.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> </properties> diff --git a/commons-rng-simple/pom.xml b/commons-rng-simple/pom.xml index cfcd4e05..cd39b826 100644 --- a/commons-rng-simple/pom.xml +++ b/commons-rng-simple/pom.xml @@ -31,14 +31,16 @@ <description>Simple API for instantiating random numbers generators.</description> <properties> + <!-- Workaround to avoid duplicating config files. --> + <rng.parent.dir>${basedir}/..</rng.parent.dir> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- 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.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> </properties> diff --git a/dist-archive/pom.xml b/dist-archive/pom.xml index 8cc50a8d..5ea09258 100644 --- a/dist-archive/pom.xml +++ b/dist-archive/pom.xml @@ -33,6 +33,9 @@ under the License. <description>This module creates the Apache Commons RNG distribution.</description> <properties> + <!-- Reproducible builds --> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> + <checkstyle.skip>true</checkstyle.skip> <animal.sniffer.skip>true</animal.sniffer.skip> <!-- Commons Release Plugin --> diff --git a/pom.xml b/pom.xml index 3073cfa8..e1c41822 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-parent</artifactId> - <version>65</version> + <version>69</version> </parent> <artifactId>commons-rng-parent</artifactId> @@ -43,6 +43,9 @@ <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> + <!-- Reproducible builds: maven-artifact-plugin:check-buildplan --> + <rng.build.outputTimestamp>2024-04-18T00:00:00Z</rng.build.outputTimestamp> + <project.build.outputTimestamp>${rng.build.outputTimestamp}</project.build.outputTimestamp> <!-- do not use snapshot suffix here --> <commons.release.version>1.6</commons.release.version> <commons.bc.version>1.5</commons.bc.version> @@ -173,26 +176,14 @@ <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. --> + <!-- Add entries from CP that are not inherited (for reasons unknown). --> <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>