From f16651ea6963b74ceb8628c8bf38936c58352021 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 8 Dec 2011 23:07:22 +0000
Subject: [PATCH] slc: improve maven, new RPM structure

git-svn-id: https://svn.argeo.org/slc/trunk@4916 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.backend/pom.xml         | 203 ++++++++++++++----
 dep/org.argeo.slc.dep.eclipse/pom.xml         |  89 +++++++-
 dep/org.argeo.slc.dep.sdk.rap/pom.xml         | 148 ++++++++-----
 dep/org.argeo.slc.dep.sdk.rcp/pom.xml         |  94 ++++++--
 dep/pom.xml                                   |   1 +
 dist/slc/pom.xml                              | 102 +++------
 dist/slc/src/main/rpm/etc/slc/config.ini      |  10 +
 runtime/org.argeo.slc.core/pom.xml            |   3 +-
 .../org.argeo.slc.detached.launcher/pom.xml   |   2 +-
 runtime/org.argeo.slc.detached/pom.xml        |   2 +-
 runtime/org.argeo.slc.launcher/pom.xml        |   2 +-
 runtime/org.argeo.slc.lib.detached/pom.xml    |   2 +-
 runtime/org.argeo.slc.repo/pom.xml            |   2 +-
 runtime/org.argeo.slc.server/pom.xml          |   3 +-
 runtime/org.argeo.slc.specs/pom.xml           |   2 +-
 .../org.argeo.slc.support.activemq/pom.xml    |   2 +-
 runtime/org.argeo.slc.support.aether/pom.xml  |   2 +-
 runtime/org.argeo.slc.support.ant/pom.xml     |   2 +-
 runtime/org.argeo.slc.support.castor/pom.xml  |   2 +-
 runtime/org.argeo.slc.support.equinox/pom.xml |   2 +-
 .../org.argeo.slc.support.hibernate/pom.xml   |   2 +-
 runtime/org.argeo.slc.support.jcr/pom.xml     |   2 +-
 runtime/org.argeo.slc.support.jemmy/pom.xml   |   2 +-
 runtime/org.argeo.slc.support.maven/pom.xml   |   2 +-
 runtime/org.argeo.slc.support.osgi/pom.xml    |   2 +-
 runtime/org.argeo.slc.support.simple/pom.xml  |   4 +-
 .../org/argeo/slc/jsch/AbstractJschTask.java  |   1 +
 .../org.argeo.slc.support.ws.client/pom.xml   |   2 +-
 runtime/org.argeo.slc.unit/pom.xml            |   2 +-
 sandbox/argeo.slc.activemq.selector/pom.xml   |   2 +-
 sandbox/argeo.slc.executionflow/pom.xml       |   2 +-
 sandbox/argeo.slc.jemmytest/pom.xml           |   2 +-
 server/org.argeo.slc.ria/pom.xml              |   2 +-
 33 files changed, 484 insertions(+), 218 deletions(-)

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 671f1d2b5..64490a13d 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -33,27 +33,37 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Agent Modules -->
@@ -73,31 +83,6 @@
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- Node -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- SLC -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -115,8 +100,6 @@
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- Modules (see profiles below) -->
-
 		<!-- Launcher -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -126,15 +109,151 @@
 			<classifier>base</classifier>
 		</dependency>
 
-		<!-- Felix -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.apache.felix</groupId> -->
-		<!-- <artifactId>org.osgi.service.obr</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.apache.felix</groupId> -->
-		<!-- <artifactId>org.apache.felix.bundlerepository</artifactId> -->
-		<!-- </dependency> -->
-
+		<!-- Node -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-dependencies</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<includeGroupIds>org.argeo.slc.modules,org.argeo.slc.runtime</includeGroupIds>
+									<outputDirectory>${project.build.directory}/slc</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-slc</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-libs</name>
+									<copyright>2011 Argeo</copyright>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/slc</location>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>slc-tp</require>
+										<require>argeo-node</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-tp</name>
+									<projversion>${version.argeo-distribution}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency>
+												<includes>
+													<!-- Core -->
+													<include>org.aspectj:com.springsource.org.aspectj.runtime</include>
+													<include>org.aspectj:com.springsource.org.aspectj.weaver</include>
+													<!-- Simple -->
+													<include>com.jcraft.jsch:com.springsource.com.jcraft.jsch</include>
+													<include>com.opensymphony.quartz:com.springsource.org.quartz</include>
+													<include>org.springframework:org.springframework.context.support</include>
+													<include>javax.mail:com.springsource.javax.mail</include>
+													<include>com.svnkit:com.springsource.org.tmatesoft.svn</include>
+													<include>javax.mail:com.springsource.javax.mail</include>
+													<include>org.argeo.dep.osgi:org.redline_rpm</include>
+													<!-- Ant -->
+													<include>org.apache.ant:com.springsource.org.apache.tools.ant</include>
+													<include>org.apache.ant:com.springsource.org.apache.tools.ant.launch</include>
+													<include>org.apache.oro:com.springsource.org.apache.oro</include>
+													<include>org.apache.bsf:com.springsource.org.apache.bsf</include>
+													<!-- Maven -->
+													<include>org.argeo.dep.osgi:org.argeo.dep.osgi.aether</include>
+													<!-- Misc -->
+													<include>net.sourceforge.jexcelapi:com.springsource.jxl</include>
+												</includes>
+											</dependency>
+										</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>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
index 0f3154fbc..d576c8dcf 100644
--- a/dep/org.argeo.slc.dep.eclipse/pom.xml
+++ b/dep/org.argeo.slc.dep.eclipse/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -13,13 +14,91 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.rcp</artifactId>
-			<version>${version.slc}</version>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.ui</artifactId>
-			<version>${version.slc}</version>
+			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-dependencies</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<excludeTransitive>true</excludeTransitive>
+									<outputDirectory>${project.build.directory}/slc-eclipse</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-slc-eclipse</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-eclipse</name>
+									<copyright>2011 Argeo</copyright>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/eclipse</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/slc-eclipse</location>
+												</source>
+											</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>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
index 58af03f0a..563ad457a 100644
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -19,76 +19,49 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Perspectives -->
 		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.ui</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>${version.slc}</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.argeo.commons.security</groupId> -->
-<!-- 					<artifactId>org.argeo.security.ui.admin</artifactId> -->
-<!-- 				</exclusion> -->
-
-				<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>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.eclipse</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>${version.slc}</version>
+			<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>${version.slc}</version>
-		</dependency>
-
-		<!-- TEST and target platform generation -->
-		<!-- Default Tomcat conf (for development) -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Apache Directory -->
+		<!-- Secure Application -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<type>pom</type>
+			<artifactId>org.argeo.security.dep.node.rap</artifactId>
 			<version>${version.argeo-commons}</version>
-			<scope>test</scope>
+			<!-- <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 -->
@@ -99,4 +72,69 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-slc-rap</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-rap</name>
+									<copyright>2011 Argeo</copyright>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/rap</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency>
+												<includes>
+													<include>org.argeo.slc.eclipse:org.argeo.slc.client.rap</include>
+												</includes>
+											</dependency>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>slc-eclipse</require>
+										<require>slc-libs</require>
+										<require>argeo-node-rap</require>
+									</requires>
+								</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>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
index fe5cb0723..e19e4bb84 100644
--- a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
@@ -21,32 +21,16 @@
 	<dependencies>
 		<!-- Perspectives -->
 		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.eclipse</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<!-- Secure Application -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.commons.security</groupId>
-					<artifactId>org.argeo.security.ui.admin</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.eclipse</groupId>
 			<artifactId>org.argeo.slc.client.rcp</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
+		
 		<!-- Back-end Dependencies -->
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
@@ -54,6 +38,13 @@
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Secure Application -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.node.rcp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 		<!-- For target platform generation -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -62,4 +53,69 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-slc-rcp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-rcp</name>
+									<copyright>2011 Argeo</copyright>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/rcp</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<dependency>
+												<includes>
+													<include>org.argeo.slc.eclipse:org.argeo.slc.client.rcp</include>
+												</includes>
+											</dependency>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>slc-eclipse</require>
+										<require>slc-libs</require>
+										<require>argeo-node-rcp</require>
+									</requires>
+								</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>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/pom.xml b/dep/pom.xml
index f82527b54..37bfebeec 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -15,6 +15,7 @@
 		<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>
 		<module>org.argeo.slc.dep.sdk.rcp</module>
 		<module>org.argeo.slc.dep.sdk.rap</module>
 	</modules>
diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 5fbb2caa9..afd9dadfa 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -9,26 +9,9 @@
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC Node (zip, rpm)</name>
+	<name>SLC Node (RPM)</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeTypes>jar</includeTypes>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -67,19 +50,13 @@
 					<groupId>org.argeo.commons.osgi</groupId>
 					<artifactId>org.argeo.osgi.boot</artifactId>
 				</exclusion>
+				<!-- Node -->
+				<exclusion>
+					<groupId>org.argeo.commons.security</groupId>
+					<artifactId>org.argeo.security.dep.node.rap</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<type>pom</type>
-			<version>${version.argeo-commons}</version>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -89,25 +66,16 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
-						<version>2.1-alpha-1</version>
-						<extensions>true</extensions>
-						<configuration>
-							<version>${project.version}</version>
-							<release>r${buildNumber}.argeo</release>
-							<copyright>2011 Argeo</copyright>
-							<distribution>argeo</distribution>
-							<packager>mbaudier@argeo.org</packager>
-							<group>Applications/System</group>
-							<prefix>/usr</prefix>
-						</configuration>
 						<executions>
 							<execution>
-								<id>rpm-sdk</id>
+								<id>rpm-slc</id>
 								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
+									<name>slc</name>
+									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -118,9 +86,6 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/usr/bin</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
@@ -133,40 +98,19 @@
 											<sources>
 												<source>
 													<location>src/main/rpm/etc/init.d</location>
-													<includes>
-														<include>*</include>
-													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/etc/${project.artifactId}</directory>
+											<directory>/etc/slc</directory>
 											<username>root</username>
-											<groupname>${project.artifactId}</groupname>
+											<groupname>slc</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>src/main/rpm/etc/${project.artifactId}</location>
-													<includes>
-														<include>*</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/usr/share/${project.artifactId}/lib</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>target/lib</location>
-													<includes>
-														<include>*.jar</include>
-													</includes>
+													<location>src/main/rpm/etc/slc</location>
 												</source>
 											</sources>
 										</mapping>
@@ -181,12 +125,34 @@
 										<scriptFile>src/main/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
+										<require>slc-libs</require>
 										<require>osgi-boot</require>
+										<require>java-1.6.0-openjdk</require>
 									</requires>
 								</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>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 71d861e11..fddf2669f 100644
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -41,3 +41,13 @@ osgi.console=3030
 # RAP SPECIFIC
 eclipse.ignoreApp=true
 osgi.noShutdown=true
+
+# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
+osgi.bundles=org.argeo.osgi.boot.jar@start
+argeo.osgi.bundles=\
+/etc/slc/modules;in=*,\
+/usr/share/slc/lib;in=*.jar,\
+/usr/share/osgi;in=*.jar,\
+/usr/share/eclipse-rap;in=*.jar,\
+/usr/share/osgi/eclipse;in=*.jar,\
+/usr/share/osgi/rap;in=*.jar,\
diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 7284f7c6f..d77f8bc3e 100644
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -17,7 +17,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>
@@ -41,7 +40,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.specs</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/runtime/org.argeo.slc.detached.launcher/pom.xml b/runtime/org.argeo.slc.detached.launcher/pom.xml
index 8aca0bb55..ad89ac51b 100644
--- a/runtime/org.argeo.slc.detached.launcher/pom.xml
+++ b/runtime/org.argeo.slc.detached.launcher/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml
index cb24dd1df..4dc6a6172 100644
--- a/runtime/org.argeo.slc.detached/pom.xml
+++ b/runtime/org.argeo.slc.detached/pom.xml
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index d2d8cadc6..9942c9269 100644
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -33,7 +33,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index 82797f970..dcbe1c460 100644
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index bc4f88e35..286ade7d9 100644
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index d83de4513..ec6f26395 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -16,7 +16,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>
@@ -50,7 +49,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Spring -->
diff --git a/runtime/org.argeo.slc.specs/pom.xml b/runtime/org.argeo.slc.specs/pom.xml
index ca7380d82..cf49d99d7 100644
--- a/runtime/org.argeo.slc.specs/pom.xml
+++ b/runtime/org.argeo.slc.specs/pom.xml
@@ -14,7 +14,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 61575c335..6708d4df4 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.aether/pom.xml b/runtime/org.argeo.slc.support.aether/pom.xml
index 0a7b2e265..db9174496 100644
--- a/runtime/org.argeo.slc.support.aether/pom.xml
+++ b/runtime/org.argeo.slc.support.aether/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index 00122c3bf..43dfef628 100644
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -16,7 +16,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index f820067a7..4ea5a34f2 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -16,7 +16,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index a7510dc95..aa0927259 100644
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -24,7 +24,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index ef9e5f0ba..9508df532 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Fragment-Host>org.argeo.slc.core</Fragment-Host>
diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
index 772ec6b14..f946f1fef 100644
--- a/runtime/org.argeo.slc.support.jcr/pom.xml
+++ b/runtime/org.argeo.slc.support.jcr/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.jemmy/pom.xml b/runtime/org.argeo.slc.support.jemmy/pom.xml
index 8a88ba81c..8c2536e81 100644
--- a/runtime/org.argeo.slc.support.jemmy/pom.xml
+++ b/runtime/org.argeo.slc.support.jemmy/pom.xml
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 011481a05..e7cdc3b91 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -21,7 +21,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index 4e400c8e6..9f77a8e89 100644
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -17,7 +17,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index 36e8403e6..70b53d28a 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -16,7 +16,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>
@@ -35,14 +34,13 @@
 					</instructions>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>${version.slc}</version>
+			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SSH -->
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
index 030023295..43b158626 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
@@ -53,6 +53,7 @@ public abstract class AbstractJschTask implements Runnable {
 					getSshTarget().getHost(), getSshTarget().getPort());
 
 			session.setUserInfo(getSshTarget().getUserInfo());
+			session.setServerAliveInterval(1000);
 			session.connect();
 			if (log.isDebugEnabled())
 				log.debug("Connected to " + getSshTarget() + " via SSH");
diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 9a5939e00..92ad80290 100644
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -16,7 +16,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 8e609a0fd..5e4377b7b 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/sandbox/argeo.slc.activemq.selector/pom.xml b/sandbox/argeo.slc.activemq.selector/pom.xml
index 9e93d56b3..4ea5476e6 100644
--- a/sandbox/argeo.slc.activemq.selector/pom.xml
+++ b/sandbox/argeo.slc.activemq.selector/pom.xml
@@ -31,7 +31,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 			</plugin>
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
diff --git a/sandbox/argeo.slc.executionflow/pom.xml b/sandbox/argeo.slc.executionflow/pom.xml
index 1bce405c4..4cdb6dd89 100644
--- a/sandbox/argeo.slc.executionflow/pom.xml
+++ b/sandbox/argeo.slc.executionflow/pom.xml
@@ -20,7 +20,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index c36efd09c..92aed903e 100644
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index c8ca584a5..232244bab 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -72,7 +72,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Import-Package>
-- 
2.39.2