Use Maven build timestamps.

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 305cda091dc464e8f4cb25f569c7f65b1b62ac81..025430728f70de661d1968bdd0b3d6e47594e0ff 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -485,6 +485,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index d02742526c4e7429739995e49a5a4fca68116705..9ef27074ec60dd7b5748b33b33c25c2ad0eb77d9 100644 (file)
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -435,6 +435,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-e4-rap-tp</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 59bf27dc5d4502001c2e27998cfbbfeac47c3b6a..c41a8c6f4dc6513186ab577203574afaec49f9b6 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -311,6 +311,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-node-tp</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 2eab273a82212969aff83fdd390ebb992265f396..3fced8eeca02fb7dc3f46a54e8981011bca6238c 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -87,6 +87,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-sdk-tp</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 6832f6a3c898c2ee2f4ee4376d2cb7b72da943a2..4a1b2fcb7f656d54ce4863971f1b0ef221f5d4f9 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -9,9 +11,9 @@
        <artifactId>osgi-boot</artifactId>
        <packaging>pom</packaging>
        <name>Commons Deployable OSGi Boot</name>
-       <properties>
-               <version.equinox>3.10.1.v20140909-1633</version.equinox>
-       </properties>
+       <!-- <properties> -->
+       <!-- <version.equinox>3.10.1.v20140909-1633</version.equinox> -->
+       <!-- </properties> -->
        <dependencies>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
@@ -145,14 +147,6 @@
                                                                                                        <include>org.argeo.commons:org.argeo.osgi.boot</include>
                                                                                                </includes>
                                                                                        </dependency>
-                                                                                       <!-- <sources> -->
-                                                                                       <!-- <source> -->
-                                                                                       <!-- <location>${project.build.directory}/lib</location> -->
-                                                                                       <!-- <includes> -->
-                                                                                       <!-- <include>org.argeo.osgi.boot.jar</include> -->
-                                                                                       <!-- </includes> -->
-                                                                                       <!-- </source> -->
-                                                                                       <!-- </sources> -->
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
@@ -182,6 +176,7 @@
                                                                <configuration>
                                                                        <name>osgi-boot-equinox</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/boot</directory>
@@ -195,14 +190,6 @@
                                                                                                        <include>org.argeo.tp.equinox:org.eclipse.osgi</include>
                                                                                                </includes>
                                                                                        </dependency>
-                                                                                       <!-- <sources> -->
-                                                                                       <!-- <source> -->
-                                                                                       <!-- <location>${project.build.directory}/lib</location> -->
-                                                                                       <!-- <includes> -->
-                                                                                       <!-- <include>org.eclipse.osgi.jar</include> -->
-                                                                                       <!-- </includes> -->
-                                                                                       <!-- </source> -->
-                                                                                       <!-- </sources> -->
                                                                                </mapping>
                                                                        </mappings>
                                                                </configuration>

diff --git a/pom.xml b/pom.xml
index 6d04603025bc8c4f80c564a9c1a07e456d81d6ff..d8a44f7d197793a698bbaf5474212e6684f32092 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -15,6 +17,8 @@
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
                <!-- Encoding, see http://is.gd/mvn_source_encoding -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <!-- Timestamp -->
+               <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
                <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
@@ -245,12 +249,13 @@ limitations under the License.
                                                <manifestLocation>META-INF</manifestLocation>
                                                <instructions>
                                                        <_include>bnd.bnd</_include>
-                                                       <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
+                                                       <Bundle-Version>${project.version}-r${maven.build.timestamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                        <Bundle-RequiredExecutionEnvironment>JavaSE-11,JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
                                                        <Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
                                                        <SLC-Category>${project.groupId}</SLC-Category>
+                                                       <SLC-BuildTimestamp>${maven.build.timestamp}</SLC-BuildTimestamp>
                                                        <!-- Git metadata -->
                                                        <!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
                                                        <!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
@@ -271,7 +276,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1.4</version>
+                                       <version>2.2.0</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
@@ -553,8 +558,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -579,8 +586,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>