From 7f49915d38159caf931293d06d08c761742cde1e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 18 Nov 2021 11:43:32 +0100
Subject: [PATCH] Improve RPM build.

---
 dep/org.argeo.dep.cms.client/pom.xml |  4 +---
 dep/org.argeo.dep.cms.e4.rap/pom.xml |  4 +---
 dep/org.argeo.dep.cms.ext/pom.xml    |  2 +-
 dep/org.argeo.dep.cms.node/pom.xml   |  4 +---
 dep/org.argeo.dep.cms.ui.rap/pom.xml |  4 +---
 dist/argeo-cli/pom.xml               |  4 +---
 dist/argeo-node/pom.xml              |  4 +---
 dist/osgi-boot/pom.xml               |  6 ++----
 pom.xml                              | 30 ++++------------------------
 9 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 975257ba9..423b9b32c 100644
--- 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 a5f1bd42f..7cdd09255 100644
--- 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 c53d9ba67..597fa03c5 100644
--- 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 2832da464..38e19d53c 100644
--- 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 03249c591..4241e4f82 100644
--- 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 ea59e43c3..73c11bf92 100644
--- 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 dda7589b9..c066a6481 100644
--- 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 06970e72b..021710088 100644
--- 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 66b7b760b..ee8e659ac 100644
--- 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>
-- 
2.30.2