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

[lgpl/argeo-commons.git] / dep / org.argeo.dep.cms.ui.rap / pom.xml

diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index b00284f4fc3d26ce034e537f415a6291992f7ff1..93ab967ec5dc603f27476159063ab25fded85b7d 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>
@@ -141,8 +139,8 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node</require>
-                                                                               <require>argeo-cms-ui-rap-tp</require>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -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>