Merge remote-tracking branch 'origin/master' into testing

[gpl/argeo-slc.git] / dep / org.argeo.slc.dep.e4.rap / pom.xml

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index fa05eb016335b50456d00a58a8219a559d712294..686ce6b8af9723d53dcd12b2b2f3a60e5b6aeaaf 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.e4.rap</artifactId>
@@ -19,7 +19,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>2.1.18-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -97,7 +97,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-slc-e4-rap</name>
+                                                                       <name>argeo-slc-e4-rap${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -116,9 +118,9 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-e4-rap</require>
-                                                                               <require>argeo-cms-sdk-tp</require>
-                                                                               <require>argeo-slc</require>
+                                                                               <require>argeo-cms-e4-rap${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-sdk-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-slc${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>