X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dep%2Forg.argeo.slc.dep.minimal%2Fpom.xml;h=5fea913eb8fb300b7416c67c97a357c7e4419020;hb=8638c9877cc7baf7b4270b5f14ee6d336c891c82;hp=dda7e333dfaab86e60ee920df083e74058c96744;hpb=6fc94d69efe089414ac9e63bde3efab1cbf7b7ca;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index dda7e333d..5fea913eb 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -1,6 +1,4 @@
-<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.slc</groupId>
@@ -60,11 +58,11 @@
 			<artifactId>org.argeo.cms.integration</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.ext.equinox.jetty</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc</groupId> -->
+<!-- 			<artifactId>org.argeo.ext.equinox.jetty</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- CLI Agent -->
 		<!-- <dependency> -->
@@ -104,7 +102,7 @@
 			<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
 
-		<!-- Misc -->
+		<!-- Apache Commons -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.vfs</artifactId>
@@ -253,7 +251,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-slc</name>
+									<name>argeo-slc${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -272,8 +270,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>argeo-slc-tp</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-slc-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -314,9 +312,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-slc-tp</name>
+									<name>argeo-slc-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>
@@ -335,7 +333,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-ext-tp</require>
+										<require>argeo-cms-ext-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>