From 0ce41bd3401a4b344579170fbeb754c1034a2623 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 9 Dec 2011 15:24:06 +0000
Subject: [PATCH] Improve RPM packaging

git-svn-id: https://svn.argeo.org/slc/trunk@4929 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.agent/p2.inf            |   2 -
 dep/org.argeo.slc.dep.agent/pom.xml           | 185 ------------------
 dep/org.argeo.slc.dep.backend/pom.xml         |  22 +++
 dep/org.argeo.slc.dep.detached/pom.xml        |   1 -
 dep/org.argeo.slc.dep.eclipse/pom.xml         |  48 +++--
 dep/org.argeo.slc.dep.sdk.rap/pom.xml         |  68 +++----
 dep/org.argeo.slc.dep.sdk.rcp/pom.xml         |  30 ++-
 dep/org.argeo.slc.dep.server/p2.inf           |   2 -
 dep/org.argeo.slc.dep.server/pom.xml          | 163 ---------------
 dep/pom.xml                                   |  88 ++++-----
 .../org.argeo.slc.client.ui.dist/pom.xml      |  15 --
 11 files changed, 142 insertions(+), 482 deletions(-)
 delete mode 100644 dep/org.argeo.slc.dep.agent/p2.inf
 delete mode 100644 dep/org.argeo.slc.dep.agent/pom.xml
 delete mode 100644 dep/org.argeo.slc.dep.server/p2.inf
 delete mode 100644 dep/org.argeo.slc.dep.server/pom.xml

diff --git a/dep/org.argeo.slc.dep.agent/p2.inf b/dep/org.argeo.slc.dep.agent/p2.inf
deleted file mode 100644
index 0423aa509..000000000
--- a/dep/org.argeo.slc.dep.agent/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
deleted file mode 100644
index 1046a9cd0..000000000
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<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>0.13.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc.dep</groupId>
-	<artifactId>org.argeo.slc.dep.agent</artifactId>
-	<packaging>jar</packaging>
-	<name>SLC Agent Dependencies</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Commons -->
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.commons.server</groupId> -->
-		<!-- <artifactId>org.argeo.server.modeshape</artifactId> -->
-		<!-- <version>${version.argeo-commons}</version> -->
-		<!-- </dependency> -->
-
-		<!-- SLC -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc.runtime</groupId> -->
-		<!-- <artifactId>org.argeo.slc.support.maven</artifactId> -->
-		<!-- <version>${version.slc}</version> -->
-		<!-- </dependency> -->
-
-		<!-- Active MQ -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.activemq</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.activemq</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- Javax (JDK 1.5) -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>0.3.3-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xalan</groupId>
-			<artifactId>com.springsource.org.apache.xalan</artifactId>
-		</dependency>
-
-		<!-- Various third parties -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.bsf</groupId>
-			<artifactId>com.springsource.org.apache.bsf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.beanshell</groupId>
-			<artifactId>com.springsource.bsh</artifactId>
-		</dependency>
-
-		<!-- DB Drivers -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jdbc</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>com.springsource.org.h2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
-			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql.jdbc</groupId>
-			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
-		</dependency>
-		<!-- Required by the Oracle JDBC driver -->
-		<!-- <dependency> -->
-		<!-- <groupId>javax.resource</groupId> -->
-		<!-- <artifactId>com.springsource.javax.resource</artifactId> -->
-		<!-- </dependency> -->
-
-		<!-- Jacob (will be removed soon) -->
-		<!-- <dependency> <groupId>org.argeo.dep.jacob</groupId> <artifactId>org.argeo.dep.jacob.win32.x86</artifactId> 
-			</dependency> -->
-		<!-- Languages <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>com.springsource.org.codehaus.groovy</artifactId> 
-			</dependency> -->
-		<!-- ASM -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.objectweb.asm</groupId> -->
-		<!-- <artifactId>com.springsource.org.objectweb.asm</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.objectweb.asm</groupId> -->
-		<!-- <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId> -->
-		<!-- </dependency> -->
-
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>sdkWithModules</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-					<version>${version.slc}</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>sdkWithoutModules</id>
-		</profile>
-	</profiles>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 64490a13d..fcc1a504a 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -17,6 +17,28 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+							<argsToAppend>
+								<arg>-clean</arg>
+							</argsToAppend>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml
index 84602bc3f..a4b858a82 100644
--- a/dep/org.argeo.slc.dep.detached/pom.xml
+++ b/dep/org.argeo.slc.dep.detached/pom.xml
@@ -12,7 +12,6 @@
 	<packaging>jar</packaging>
 	<name>SLC Detached Dependencies</name>
 	<dependencies>
-
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.detached</artifactId>
diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
index d576c8dcf..a37af1963 100644
--- a/dep/org.argeo.slc.dep.eclipse/pom.xml
+++ b/dep/org.argeo.slc.dep.eclipse/pom.xml
@@ -9,8 +9,24 @@
 	</parent>
 	<groupId>org.argeo.slc.dep</groupId>
 	<artifactId>org.argeo.slc.dep.eclipse</artifactId>
-	<packaging>jar</packaging>
 	<name>SLC Eclipse Dependencies</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-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>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
@@ -22,6 +38,13 @@
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Back-end Dependencies -->
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -73,26 +96,9 @@
 											</sources>
 										</mapping>
 									</mappings>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
+									<requires>
+										<require>slc-libs</require>
+									</requires>
 								</configuration>
 							</execution>
 						</executions>
diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
index 563ad457a..71bc73857 100644
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -15,6 +15,38 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>resolve-pde-sources</id>
+						<goals>
+							<goal>pde-sources</goal>
+						</goals>
+						<phase>generate-resources</phase>
+						<configuration>
+							<copyArtifacts>false</copyArtifacts>
+						</configuration>
+					</execution>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+							<argsToAppend>
+								<arg>-clean</arg>
+							</argsToAppend>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -30,46 +62,11 @@
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Back-end Dependencies -->
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.backend</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
 		<!-- Secure Application -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dep.node.rap</artifactId>
 			<version>${version.argeo-commons}</version>
-			<!-- <exclusions> -->
-			<!-- <exclusion> -->
-			<!-- <groupId>org.mortbay.jetty</groupId> -->
-			<!-- <artifactId>org.mortbay.jetty.server</artifactId> -->
-			<!-- </exclusion> -->
-			<!-- <exclusion> -->
-			<!-- <groupId>org.mortbay.jetty</groupId> -->
-			<!-- <artifactId>org.mortbay.jetty.server.util</artifactId> -->
-			<!-- </exclusion> -->
-			<!-- <exclusion> -->
-			<!-- <groupId>org.eclipse.equinox</groupId> -->
-			<!-- <artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
-			<!-- </exclusion> -->
-
-			<!-- <exclusion> -->
-			<!-- <groupId>org.argeo.slc.runtime</groupId> -->
-			<!-- <artifactId>org.argeo.slc.support.castor</artifactId> -->
-			<!-- </exclusion> -->
-
-			<!-- </exclusions> -->
-		</dependency>
-
-		<!-- For target platform generation -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -106,7 +103,6 @@
 									</mappings>
 									<requires>
 										<require>slc-eclipse</require>
-										<require>slc-libs</require>
 										<require>argeo-node-rap</require>
 									</requires>
 								</configuration>
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
index e19e4bb84..7d9f4b403 100644
--- a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
@@ -15,6 +15,28 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+					<execution>
+						<id>check-osgi</id>
+						<phase>test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<onlyCheck>true</onlyCheck>
+							<argsToAppend>
+								<arg>-clean</arg>
+							</argsToAppend>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -30,13 +52,6 @@
 			<artifactId>org.argeo.slc.client.rcp</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
-		
-		<!-- Back-end Dependencies -->
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.backend</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
 
 		<!-- Secure Application -->
 		<dependency>
@@ -87,7 +102,6 @@
 									</mappings>
 									<requires>
 										<require>slc-eclipse</require>
-										<require>slc-libs</require>
 										<require>argeo-node-rcp</require>
 									</requires>
 								</configuration>
diff --git a/dep/org.argeo.slc.dep.server/p2.inf b/dep/org.argeo.slc.dep.server/p2.inf
deleted file mode 100644
index 0423aa509..000000000
--- a/dep/org.argeo.slc.dep.server/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
deleted file mode 100644
index 918441472..000000000
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<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>0.13.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc.dep</groupId>
-	<artifactId>org.argeo.slc.dep.server</artifactId>
-	<packaging>jar</packaging>
-	<name>SLC Server Dependencies</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Other deps -->
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.backend</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.hibernate</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
-		<!-- SLC non deps -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
-
-		<!-- Provided -->
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Commons -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- Security -->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security.taglibs</artifactId>
-		</dependency>
-
-		<!-- OSGi integration -->
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
-
-		<!-- JEE -->
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency>
-
-		<!-- AOP -->
-		<dependency>
-			<groupId>org.aopalliance</groupId>
-			<artifactId>com.springsource.org.aopalliance</artifactId>
-		</dependency>
-
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- Javax (JDK 1.5) -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>0.3.3-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- Jackrabbit -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.json</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
-		<!-- Required in JDK 1.5 -->
-		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
-		</dependency>
-
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>sdkWithModules</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.modules</groupId>
-					<artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-					<version>${version.slc}</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>sdkWithoutModules</id>
-		</profile>
-	</profiles>
-</project>
\ No newline at end of file
diff --git a/dep/pom.xml b/dep/pom.xml
index 37bfebeec..d3295ea0a 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -11,8 +11,6 @@
 	<name>SLC Dependencies</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.slc.dep.agent</module>
-		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.detached</module>
 		<module>org.argeo.slc.dep.backend</module>
 		<module>org.argeo.slc.dep.eclipse</module>
@@ -29,57 +27,49 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<configuration>
-					<useLastCommittedRevision>false</useLastCommittedRevision>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>resolve-pde-sources</id>
-							<goals>
-								<goal>pde-sources</goal>
-							</goals>
-							<phase>generate-resources</phase>
-							<configuration>
-								<copyArtifacts>false</copyArtifacts>
-							</configuration>
-						</execution>
-						<execution>
-							<id>generate-descriptors</id>
-							<goals>
-								<goal>descriptors</goal>
-							</goals>
-							<phase>generate-resources</phase>
-						</execution>
-						<execution>
-							<id>check-osgi</id>
-							<phase>test</phase>
-							<goals>
-								<goal>equinox</goal>
-							</goals>
-							<configuration>
-								<onlyCheck>true</onlyCheck>
-								<argsToAppend>
-									<arg>-clean</arg>
-								</argsToAppend>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
+	<dependencies>
+		<!-- For target platform generation -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${rpm.stagingRepository}" verbose="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
index 5070b0c54..6e0d78905 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
@@ -13,21 +13,6 @@
 
 
 	<dependencies>
-		<!-- Eclipse and RCP only dependency, needed at compile time -->
-		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
-
-
 		<!-- Commons UI -->
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
-- 
2.39.2