From c1bce3fdd7918529328599dc9c0494512921953b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 15 Nov 2021 08:53:09 +0100
Subject: [PATCH] Adapt RPM build.

---
 .gitignore                                    |  5 ++-
 dep/org.argeo.slc.dep.e4.rap/pom.xml          | 10 +++---
 dep/org.argeo.slc.dep.minimal/pom.xml         | 12 ++++---
 dep/pom.xml                                   | 10 ++++++
 dist/pom.xml                                  |  2 +-
 dist/slc/pom.xml                              | 10 +++---
 .../dep/org.argeo.dep.cms.platform/pom.xml    | 19 ++++++-----
 legacy/argeo-commons/dep/pom.xml              | 12 ++++++-
 .../org.argeo.cms.ui.workbench.rap/pom.xml    |  4 +--
 .../org.argeo.cms.ui.workbench/pom.xml        |  2 +-
 .../org.argeo.ext.rap.ui.workbench/pom.xml    |  2 +-
 legacy/argeo-commons/pom.xml                  |  2 +-
 legacy/dep/org.argeo.slc.dep.backend/pom.xml  | 23 +++++++------
 legacy/dep/org.argeo.slc.dep.spring/pom.xml   | 33 ++++++++++---------
 legacy/dep/pom.xml                            | 12 ++++++-
 pom.xml                                       | 12 +++----
 16 files changed, 103 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index b83d22266..492e809ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/target/
+**/bin/
+**/target/
+**/generated/
+**/MANIFEST.MF
diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 7f9189cb7..b533a069e 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -97,7 +97,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-slc-e4-rap</name>
+									<name>argeo-slc-e4-rap${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -116,9 +118,9 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-e4-rap</require>
-										<require>argeo-cms-sdk-tp</require>
-										<require>argeo-slc</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>
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index dda7e333d..276d1fa08 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -253,7 +253,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-slc</name>
+									<name>argeo-slc${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -272,8 +274,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,7 +316,7 @@
 									<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>
 									<mappings>
@@ -335,7 +337,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-ext-tp</require>
+										<require>argeo-cms-ext-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/pom.xml b/dep/pom.xml
index 33c2e9d06..c463f27cd 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -24,6 +24,16 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+					<files>
+						<file>../../cnf/${version.context}.bnd</file>
+					</files>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>argeo-osgi-plugin</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 7a1611908..9ec9b510a 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.1.18-SNAPSHOT</version>
+		<version>2.1.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 9cb648526..fdac17f56 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>2.1.18-SNAPSHOT</version>
+		<version>2.1.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>slc</artifactId>
@@ -62,7 +62,7 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.dep.backend</artifactId>
-					<version>2.1.18-SNAPSHOT</version>
+					<version>2.1.3-SNAPSHOT</version>
 					<type>pom</type>
 				</dependency>
 
@@ -70,19 +70,19 @@
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.jcr</artifactId>
-					<version>2.1.18-SNAPSHOT</version>
+					<version>2.1.3-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.lib.repo</artifactId>
-					<version>2.1.18-SNAPSHOT</version>
+					<version>2.1.3-SNAPSHOT</version>
 				</dependency>
 
 				<!-- Launcher -->
 				<dependency>
 					<groupId>org.argeo.slc</groupId>
 					<artifactId>org.argeo.slc.launcher</artifactId>
-					<version>2.1.18-SNAPSHOT</version>
+					<version>2.1.3-SNAPSHOT</version>
 					<!-- <type>tar.gz</type> -->
 					<!-- <classifier>base</classifier> -->
 				</dependency>
diff --git a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index b91d02b81..20d0824da 100644
--- a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>legacy-dep</artifactId>
-		<version>2.1.86</version>
+		<version>2.1.87-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.dep.cms.platform</artifactId>
@@ -67,17 +67,17 @@
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
-			<version>2.1.86</version>
+			<version>2.1.87-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
-			<version>2.1.86</version>
+			<version>2.1.87-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
-			<version>2.1.86</version>
+			<version>2.1.87-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -299,7 +299,8 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-platform</name>
+									<name>argeo-cms-platform${argeo.rpm.suffix}</name>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -318,8 +319,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>argeo-cms-platform-tp</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-cms-platform-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -360,7 +361,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-platform-tp</name>
+									<name>argeo-cms-platform-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
@@ -381,7 +382,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/legacy/argeo-commons/dep/pom.xml b/legacy/argeo-commons/dep/pom.xml
index 124123395..54ee61313 100644
--- a/legacy/argeo-commons/dep/pom.xml
+++ b/legacy/argeo-commons/dep/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.86</version>
+		<version>2.1.87-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>legacy-dep</artifactId>
@@ -24,6 +24,16 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+					<files>
+						<file>../../../../cnf/${version.context}.bnd</file>
+					</files>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>argeo-osgi-plugin</artifactId>
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
index 54bf5a0e8..b86f29eee 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.86</version>
+		<version>2.1.87-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
-			<version>2.1.86</version>
+			<version>2.1.87-SNAPSHOT</version>
 		</dependency>
 		<!-- RAP specific -->
 		<dependency>
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
index 2bd30abbf..b19ccb9ed 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.86</version>
+		<version>2.1.87-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms.ui.workbench</artifactId>
diff --git a/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml b/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
index 05b3e78d0..5fe3b4a11 100644
--- a/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
+++ b/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.86</version>
+		<version>2.1.87-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
diff --git a/legacy/argeo-commons/pom.xml b/legacy/argeo-commons/pom.xml
index 5e1672ba7..7e0e0d806 100644
--- a/legacy/argeo-commons/pom.xml
+++ b/legacy/argeo-commons/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.argeo.slc.legacy.commons</groupId>
 	<artifactId>argeo-commons-legacy</artifactId>
-	<version>2.1.86</version>
+	<version>2.1.87-SNAPSHOT</version>
 	<name>Commons Legacy</name>
 	<packaging>pom</packaging>
 	<properties>
diff --git a/legacy/dep/org.argeo.slc.dep.backend/pom.xml b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 92b4ee472..0e6de0980 100644
--- a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@ -2,15 +2,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>dep</artifactId>
+		<artifactId>legacy-dep</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
 	<name>SLC Backend</name>
-	<properties>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
-	</properties>
 	<dependencies>
 		<!-- SLC Minimal -->
 		<dependency>
@@ -36,13 +33,13 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -54,17 +51,17 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- OSGi Boot for platform generation only, as it could be used by regular 
@@ -126,7 +123,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-platform</name>
+									<name>argeo-slc-platform${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -145,8 +144,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-platform</require>
-										<require>slc-spring</require>
+										<require>argeo-cms-platform${argeo.rpm.suffix}</require>
+										<require>argeo-slc-spring${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/legacy/dep/org.argeo.slc.dep.spring/pom.xml b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index 11e61df1d..e0bb73d26 100644
--- a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@ -1,16 +1,15 @@
-<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>
+		<artifactId>legacy-dep</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.spring</artifactId>
 	<name>SLC Agent based on Spring</name>
-	<properties>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
-	</properties>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
@@ -24,22 +23,22 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.spring</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Transitional fake Java 8 APIs, required by old version of Spring, 
@@ -47,7 +46,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.legacy.fake.java8</artifactId>
-			<version>2.1.18-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Not strictly Spring dependencies but used by the old approach -->
@@ -193,7 +192,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-spring</name>
+									<name>argeo-slc-spring${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -212,10 +213,10 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>argeo-slc</require>
-										<require>argeo-slc-tp</require>
-										<require>slc-spring-tp</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-slc${argeo.rpm.suffix}</require>
+										<require>argeo-slc-tp${argeo.rpm.suffix}</require>
+										<require>argeo-slc-spring-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -256,7 +257,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-spring-tp</name>
+									<name>argeo-slc-spring-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
diff --git a/legacy/dep/pom.xml b/legacy/dep/pom.xml
index 852a91f89..affcea4a4 100644
--- a/legacy/dep/pom.xml
+++ b/legacy/dep/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>legacy-dep</artifactId>
-	<name>SLC LEgacy Dependencies</name>
+	<name>SLC Legacy Dependencies</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.slc.dep.spring</module>
@@ -24,6 +24,16 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+					<files>
+						<file>../../../cnf/${version.context}.bnd</file>
+					</files>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>argeo-osgi-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 68da924b8..8a27ddd42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,16 +11,14 @@
 	<name>Argeo SLC</name>
 	<version>2.3-SNAPSHOT</version>
 	<properties>
+		<version.context>unstable</version.context>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 
-		<version.slc>2.3-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
 		<developmentCycle.slc>2.3</developmentCycle.slc>
-		<version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+		<version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
 		<!-- SLC framework -->
@@ -33,12 +31,12 @@
 		<!-- CMS extensions -->
 		<module>cms</module>
 
-		<!-- Legacy -->
-		<module>legacy</module>
-
 		<!-- Distribution -->
 		<module>dep</module>
 		<module>ide</module>
+
+		<!-- Legacy -->
+		<module>legacy</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
-- 
2.30.2