Improve RPM build.

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 975257ba978fd6a0ccefa8d3e96d45e3751fb337..423b9b32cfe55e6d8542de183b4e236d82d9ca06 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -273,8 +273,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-client${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -337,7 +335,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</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 a5f1bd42fc35b47fcdb4ac2b185e8b3fe375cb76..7cdd09255e55f411ae618c0f76344f686d0e5f97 100644 (file)
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -297,8 +297,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -361,7 +359,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml
index c53d9ba6798de83f8648672de736258ca8767b53..597fa03c5bb837397b9f62f2def9b641ee3afaf4 100644 (file)
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@ -114,7 +114,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</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 2832da4642c13147d78436c02ee8372477bae92b..38e19d53c6b02957bfab12d14aa4c3dd658dd1fa 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -241,8 +241,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -305,7 +303,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-node-tp</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index 03249c591ec35a16ba17c04586835f14f7917571..4241e4f821e575aa41a3fcc4c740d5fb3d9625ba 100644 (file)
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -121,8 +121,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -185,7 +183,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml
index ea59e43c397424c0f3f6de9b1e73da35208508d3..73c11bf92e2686048c62f5558b4849a57f58e9bb 100644 (file)
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@ -33,7 +33,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-cli-${project.version}</finalName>
+                                                       <finalName>argeo-cli-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/argeo-cli.xml</descriptor>
@@ -68,8 +68,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cli${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo-cli</directory>

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index dda7589b9fed34c056cdc35112ec1d128e6a1d7f..c066a64817056df9d6e62326e0428a07960e2fec 100644 (file)
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -41,7 +41,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-node-${version.released}${buildId}</finalName>
+                                                       <finalName>argeo-node-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -76,8 +76,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 06970e72bdc3b45320c96b08ca4c6c923ec7f832..0217100889513ef12e443788291cc037733a19a4 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -35,7 +35,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>osgi-boot-${project.version}</finalName>
+                                                       <finalName>osgi-boot-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/osgi-boot.xml</descriptor>
@@ -70,8 +70,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-osgi-boot${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
@@ -145,7 +143,7 @@
                                                                <configuration>
                                                                        <name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/boot</directory>

diff --git a/pom.xml b/pom.xml
index 66b7b760b0a877e28d10b8c4bdf9d2dea1250f52..ee8e659ac2942c46cbf1e53d82e72d7962339ec4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,12 @@
 <?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>
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.4</version>
+               <version>2.1.5-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -15,7 +17,6 @@
        <properties>
                <version.context>unstable</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
@@ -231,27 +232,4 @@
                        </plugin>
                </plugins>
        </reporting>
-       <profiles>
-               <profile>
-                       <id>localrepo</id>
-                       <repositories>
-                               <repository>
-                                       <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-2.3</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-                       <distributionManagement>
-                               <repository>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-2.3/</url>
-                                       <uniqueVersion>false</uniqueVersion>
-                               </repository>
-                       </distributionManagement>
-               </profile>
-       </profiles>
 </project>