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:27 UTC
[commons-geometry] branch master updated (32b56330 -> 7167d59d)
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-geometry.git
from 32b56330 Exclude development files from source distribution
new caae41af Update to use commons.module.name (consitent with CP)
new 7167d59d 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-geometry-core/pom.xml | 2 +-
commons-geometry-enclosing/pom.xml | 2 +-
commons-geometry-euclidean/pom.xml | 2 +-
commons-geometry-examples/examples-jmh/pom.xml | 2 +-
.../examples-tutorials/pom.xml | 2 +-
commons-geometry-examples/pom.xml | 2 +-
commons-geometry-hull/pom.xml | 2 +-
commons-geometry-io-core/pom.xml | 2 +-
commons-geometry-io-euclidean/pom.xml | 2 +-
commons-geometry-spherical/pom.xml | 2 +-
pom.xml | 52 ++++++++--------------
11 files changed, 28 insertions(+), 44 deletions(-)
[commons-geometry] 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-geometry.git
commit caae41af0bb55e9d453f1076fcab10be292b5f59
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:38:42 2022 +0000
Update to use commons.module.name (consitent with CP)
---
commons-geometry-core/pom.xml | 2 +-
commons-geometry-enclosing/pom.xml | 2 +-
commons-geometry-euclidean/pom.xml | 2 +-
commons-geometry-examples/examples-jmh/pom.xml | 2 +-
commons-geometry-examples/examples-tutorials/pom.xml | 2 +-
commons-geometry-examples/pom.xml | 2 +-
commons-geometry-hull/pom.xml | 2 +-
commons-geometry-io-core/pom.xml | 2 +-
commons-geometry-io-euclidean/pom.xml | 2 +-
commons-geometry-spherical/pom.xml | 2 +-
pom.xml | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/commons-geometry-core/pom.xml b/commons-geometry-core/pom.xml
index f2c57a1d..265ce8b8 100644
--- a/commons-geometry-core/pom.xml
+++ b/commons-geometry-core/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.core</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.core.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.core</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.core</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>core</geometry.jira.component>
diff --git a/commons-geometry-enclosing/pom.xml b/commons-geometry-enclosing/pom.xml
index fd083c47..33b34f36 100644
--- a/commons-geometry-enclosing/pom.xml
+++ b/commons-geometry-enclosing/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.enclosing</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.enclosing.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.enclosing</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.enclosing</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>enclosing</geometry.jira.component>
diff --git a/commons-geometry-euclidean/pom.xml b/commons-geometry-euclidean/pom.xml
index 2681d86a..498ef47c 100644
--- a/commons-geometry-euclidean/pom.xml
+++ b/commons-geometry-euclidean/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.euclidean</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.euclidean.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.euclidean</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.euclidean</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>euclidean1D,euclidean2D,euclidean3D</geometry.jira.component>
diff --git a/commons-geometry-examples/examples-jmh/pom.xml b/commons-geometry-examples/examples-jmh/pom.xml
index 09e8aeb6..927525cd 100644
--- a/commons-geometry-examples/examples-jmh/pom.xml
+++ b/commons-geometry-examples/examples-jmh/pom.xml
@@ -38,7 +38,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.examples.jmh</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.examples.jmh.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.examples.jmh</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.examples.jmh</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/../..</geometry.parent.dir>
diff --git a/commons-geometry-examples/examples-tutorials/pom.xml b/commons-geometry-examples/examples-tutorials/pom.xml
index c6d7eff4..47f9c887 100644
--- a/commons-geometry-examples/examples-tutorials/pom.xml
+++ b/commons-geometry-examples/examples-tutorials/pom.xml
@@ -40,7 +40,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.examples.tutorials</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.examples.tutorials.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.examples.tutorials</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.examples.tutorials</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/../..</geometry.parent.dir>
</properties>
diff --git a/commons-geometry-examples/pom.xml b/commons-geometry-examples/pom.xml
index 8a39d664..6c45ecdb 100644
--- a/commons-geometry-examples/pom.xml
+++ b/commons-geometry-examples/pom.xml
@@ -48,7 +48,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.examples</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.examples.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.examples</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.examples</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>examples</geometry.jira.component>
diff --git a/commons-geometry-hull/pom.xml b/commons-geometry-hull/pom.xml
index f1d57e35..931abfb0 100644
--- a/commons-geometry-hull/pom.xml
+++ b/commons-geometry-hull/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.hull</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.hull.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.hull</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.hull</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>hull</geometry.jira.component>
diff --git a/commons-geometry-io-core/pom.xml b/commons-geometry-io-core/pom.xml
index 188774b5..d01a679e 100644
--- a/commons-geometry-io-core/pom.xml
+++ b/commons-geometry-io-core/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.io.core</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.io.core.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.io.core</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.io.core</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>io-core</geometry.jira.component>
diff --git a/commons-geometry-io-euclidean/pom.xml b/commons-geometry-io-euclidean/pom.xml
index 8b8f784d..f03377f7 100644
--- a/commons-geometry-io-euclidean/pom.xml
+++ b/commons-geometry-io-euclidean/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.io.euclidean</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.io.euclidean.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.io.euclidean</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.io.euclidean</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>io-euclidean</geometry.jira.component>
diff --git a/commons-geometry-spherical/pom.xml b/commons-geometry-spherical/pom.xml
index 90f1b2c8..92420416 100644
--- a/commons-geometry-spherical/pom.xml
+++ b/commons-geometry-spherical/pom.xml
@@ -36,7 +36,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.spherical</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.spherical.*</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.spherical</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.spherical</commons.module.name>
<!-- Workaround to avoid duplicating config files. -->
<geometry.parent.dir>${basedir}/..</geometry.parent.dir>
<geometry.jira.component>spherical1D,spherical2D</geometry.jira.component>
diff --git a/pom.xml b/pom.xml
index ae85954e..4dfb49b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<commons.osgi.symbolicName>org.apache.commons.geometry.parent</commons.osgi.symbolicName>
<commons.osgi.export>org.apache.commons.geometry.parent</commons.osgi.export>
<!-- Java 9+ -->
- <commons.automatic.module.name>org.apache.commons.geometry.parent</commons.automatic.module.name>
+ <commons.module.name>org.apache.commons.geometry.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 -->
@@ -168,7 +168,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-geometry] 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-geometry.git
commit 7167d59d3ce255af122dbc53a5dea79910257e6b
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 11:53:06 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 4dfb49b1..30880770 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-geometry</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>
- <geometry.jgit.buildnumber.version>1.2.10</geometry.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.
@@ -169,10 +164,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>
@@ -455,33 +466,6 @@
<maven.compiler.release>${jvm.target}</maven.compiler.release>
</properties>
</profile>
- <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>${geometry.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. -->