X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.e4.rap%2Fpom.xml;h=6edae26e4eef3e970f297ce93e4078c6d44e7c6b;hb=8638c9877cc7baf7b4270b5f14ee6d336c891c82;hp=5fa1ff677b84f9c11e149434680a09af20d25206;hpb=63dacd722c9fa6b7cae3ba12231a6c22898e3527;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 5fa1ff677..6edae26e4 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -3,102 +3,56 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.1.16-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.e4.rap</artifactId>
 	<name>SLC E4 RAP</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ModularDistribution>default</SLC-ModularDistribution>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<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.16-SNAPSHOT</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.e4</artifactId>
-			<version>2.1.16-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
 		<!-- ALM Third Parties -->
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant.launch</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bnd</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>
-
-		<!-- SLC Libs -->
 		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.lib.repo</artifactId> -->
-		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant</artifactId> -->
 		<!-- </dependency> -->
 		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.lib.jcr</artifactId> -->
-		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
 		<!-- </dependency> -->
 
-		<!-- Extensions <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.support</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> -->
-		<!-- UI <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.client.ui</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> <dependency> <groupId>org.argeo.slc</groupId> 
-			<artifactId>org.argeo.slc.client.ui.dist</artifactId> <version>2.1.13-SNAPSHOT</version> 
-			</dependency> <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.client.rap</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> -->
-
-		<!-- For target platform generation <dependency> <groupId>org.argeo.slc</groupId> 
-			<artifactId>org.argeo.slc.unit</artifactId> <version>2.1.13-SNAPSHOT</version> 
-			<scope>test</scope> </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>
@@ -122,29 +76,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.slc</includeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -156,7 +87,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>
@@ -173,17 +104,11 @@
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <directoryIncluded>false</directoryIncluded> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
-										<require>argeo-cms-e4-rap</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>