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:32 UTC
[commons-math] branch master updated (3e72f1ea3 -> f7ef9b625)
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-math.git
from 3e72f1ea3 MATH-1651: Ensure neuron distances are returned in a consistent order
new 91b0bb3d3 Update to use commons.module.name (consitent with CP)
new f7ef9b625 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-math-core/pom.xml | 2 +-
.../examples-kmeans/image/pom.xml | 2 +-
.../examples-sofm/chinese-rings/pom.xml | 2 +-
commons-math-examples/examples-sofm/tsp/pom.xml | 2 +-
commons-math-examples/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 | 52 ++++++++--------------
11 files changed, 28 insertions(+), 44 deletions(-)
[commons-math] 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-math.git
commit 91b0bb3d30572bdc5efee3f54cd3511867881d1e
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:50:28 2022 +0000
Update to use commons.module.name (consitent with CP)
---
commons-math-core/pom.xml | 2 +-
commons-math-examples/examples-kmeans/image/pom.xml | 2 +-
commons-math-examples/examples-sofm/chinese-rings/pom.xml | 2 +-
commons-math-examples/examples-sofm/tsp/pom.xml | 2 +-
commons-math-examples/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 | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/commons-math-core/pom.xml b/commons-math-core/pom.xml
index f0e0b760b..7add89143 100644
--- a/commons-math-core/pom.xml
+++ b/commons-math-core/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.automatic.module.name>org.apache.commons.math4.core</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.core</commons.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-examples/examples-kmeans/image/pom.xml b/commons-math-examples/examples-kmeans/image/pom.xml
index 941cc406c..cc9d0869b 100644
--- a/commons-math-examples/examples-kmeans/image/pom.xml
+++ b/commons-math-examples/examples-kmeans/image/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.math4.examples.kmeans.image</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.math4.examples.kmeans.image</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.math4.examples.kmeans.image</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.examples.kmeans.image</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}/../../..</math.parent.dir>
diff --git a/commons-math-examples/examples-sofm/chinese-rings/pom.xml b/commons-math-examples/examples-sofm/chinese-rings/pom.xml
index 9df68c332..d28c90ae8 100644
--- a/commons-math-examples/examples-sofm/chinese-rings/pom.xml
+++ b/commons-math-examples/examples-sofm/chinese-rings/pom.xml
@@ -39,7 +39,7 @@
<commons.osgi.symbolicName>org.apache.commons.math4.examples.sofm.chineserings</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.math4.examples.sofm.chineserings</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.math4.examples.sofm.chineserings</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.examples.sofm.chineserings</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}/../../..</math.parent.dir>
diff --git a/commons-math-examples/examples-sofm/tsp/pom.xml b/commons-math-examples/examples-sofm/tsp/pom.xml
index a62f9bbde..501abc267 100644
--- a/commons-math-examples/examples-sofm/tsp/pom.xml
+++ b/commons-math-examples/examples-sofm/tsp/pom.xml
@@ -39,7 +39,7 @@
<commons.osgi.symbolicName>org.apache.commons.math4.examples.sofm.tsp</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.math4.examples.sofm.tsp</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.math4.examples.sofm.tsp</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.examples.sofm.tsp</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}/../../..</math.parent.dir>
diff --git a/commons-math-examples/pom.xml b/commons-math-examples/pom.xml
index 4f20215a1..dd0df722a 100644
--- a/commons-math-examples/pom.xml
+++ b/commons-math-examples/pom.xml
@@ -43,7 +43,7 @@
<commons.osgi.symbolicName>org.apache.commons.math4.examples</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.math4.examples</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.math4.examples</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.examples</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}/..</math.parent.dir>
<math.jira.component>examples</math.jira.component>
diff --git a/commons-math-legacy-core/pom.xml b/commons-math-legacy-core/pom.xml
index b7809e900..e6cfb4a6a 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.automatic.module.name>org.apache.commons.math4.legacy.core</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.legacy.core</commons.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 cfd66281f..4b68915b1 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.automatic.module.name>org.apache.commons.math4.legacy.exception</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.legacy.exception</commons.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 9e8be36de..d8ab07ec1 100644
--- a/commons-math-legacy/pom.xml
+++ b/commons-math-legacy/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.automatic.module.name>org.apache.commons.math4.legacy</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.legacy</commons.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 373d3336c..52a78069c 100644
--- a/commons-math-neuralnet/pom.xml
+++ b/commons-math-neuralnet/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.automatic.module.name>org.apache.commons.math4.neuralnet</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.neuralnet</commons.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 3e4877736..853cea535 100644
--- a/commons-math-transform/pom.xml
+++ b/commons-math-transform/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- The Java Module System Name -->
- <commons.automatic.module.name>org.apache.commons.math4.transform</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.math4.transform</commons.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 dbd32b50b..9278fbbb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<commons.osgi.symbolicName>org.apache.commons.math4</commons.osgi.symbolicName>
<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>
+ <commons.module.name>org.apache.commons.math4</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 -->
@@ -395,7 +395,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-math] 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-math.git
commit f7ef9b625b303a7c39a8f5903aa56de8aca8e87e
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:52:57 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 9278fbbb8..0124caba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,6 @@
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-math</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>
- <math.jgit.buildnumber.version>1.2.10</math.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.
@@ -396,10 +391,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>
</plugins>
</build>
@@ -506,33 +517,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>${math.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. -->