X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.e4.rap%2Fpom.xml;h=ba0cdc9e97422719d264d72f0edd6014c6235649;hb=8eb61f746c8ae8dfe12d525d98726473404dea7f;hp=30bd59c9ee8bee32fdd482e4c6861249ff2a8c61;hpb=e14154d2baba78852915304d51cbb56bed1d3d3e;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 30bd59c9e..ba0cdc9e9 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -1,11 +1,9 @@
-<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>
 		<artifactId>dep</artifactId>
-		<version>2.1.17-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.e4.rap</artifactId>
@@ -14,22 +12,25 @@
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.sdk</artifactId>
+			<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.1.17-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
 
+		<!-- OSGi Boot for platform generation only, as it could be used by regular 
+			Java applications to launch an OSGi runtime. -->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.e4</artifactId>
-			<version>2.1.17-SNAPSHOT</version>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<!-- ALM Third Parties -->
@@ -42,26 +43,26 @@
 		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
 		<!-- </dependency> -->
 
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>biz.aQute.bndlib</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.junit</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.redline-rpm</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.eclipse.jgit</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>biz.aQute.bndlib</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.junit</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.redline-rpm</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.eclipse.jgit</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -96,7 +97,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-e4-rap</name>
+									<name>argeo-slc-e4-rap${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -115,9 +116,9 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-e4-rap</require>
-										<require>argeo-cms-sdk-tp</require>
-										<require>slc-agent</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>