From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 16 Nov 2021 08:48:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into testing
X-Git-Tag: v2.1.18~11
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6d86c642497b795d566bda2918aaea5c3de43084;hp=ba9d33ef0f76907476e7e25f45773184a8067f9c;p=gpl%2Fargeo-slc.git

Merge remote-tracking branch 'origin/master' into testing
---

diff --git a/.project b/.project
index e1282551e..eddeb4240 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>argeo-slc-unstable</name>
+	<name>argeo-slc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/cms/org.argeo.cms.integration/pom.xml b/cms/org.argeo.cms.integration/pom.xml
index d1b1080c0..7c9ad7e4e 100644
--- a/cms/org.argeo.cms.integration/pom.xml
+++ b/cms/org.argeo.cms.integration/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc-cms</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms.integration</artifactId>
diff --git a/cms/org.argeo.ext.equinox.jetty/pom.xml b/cms/org.argeo.ext.equinox.jetty/pom.xml
index 031e55c85..733200a0e 100644
--- a/cms/org.argeo.ext.equinox.jetty/pom.xml
+++ b/cms/org.argeo.ext.equinox.jetty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc-cms</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.ext.equinox.jetty</artifactId>
diff --git a/cms/pom.xml b/cms/pom.xml
index 4d0b53387..c8c4c64a5 100644
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>argeo-slc-cms</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC CMS</name>
-	<version>2.3-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<modules>
 		<!-- Argeo CMS extensions -->
 		<module>org.argeo.cms.integration</module>
diff --git a/cnf/build.bnd b/cnf/build.bnd
index af9c91be7..f39af41a1 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,4 +1,4 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/testing.bnd, \
 ${workspace}/cnf/argeo.bnd, \
 -${workspace}/cnf/release.bnd
diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index bbd72adec..05b92033a 100644
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,3 +1,3 @@
 -include: \
-../cnf/unstable.bnd, \
+../cnf/testing.bnd, \
 ../cnf/argeo.bnd
diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644
index 000000000..cf327df9c
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,6 @@
+category=org.argeo.slc
+version.released=2.1.17
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=
diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index b533a069e..686ce6b8a 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.e4.rap</artifactId>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 276d1fa08..d0918bd1b 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.minimal</artifactId>
@@ -29,41 +29,41 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.runtime</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.jcr</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.factory</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CMS extensions -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.cms.integration</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.ext.equinox.jetty</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CLI Agent -->
diff --git a/dep/pom.xml b/dep/pom.xml
index c463f27cd..993879322 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
diff --git a/ide/features/pom.xml b/ide/features/pom.xml
index 9e300ff2b..39d0d730c 100644
--- a/ide/features/pom.xml
+++ b/ide/features/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc.ide</groupId>
 		<artifactId>argeo-ide</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>features</artifactId>
diff --git a/ide/plugins/pom.xml b/ide/plugins/pom.xml
index 77945342a..05e4066cc 100644
--- a/ide/plugins/pom.xml
+++ b/ide/plugins/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc.ide</groupId>
 		<artifactId>argeo-ide</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>plugins</artifactId>
diff --git a/ide/pom.xml b/ide/pom.xml
index 1a94bc6af..f51a7ad54 100644
--- a/ide/pom.xml
+++ b/ide/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.ide</groupId>
diff --git a/legacy/argeo-commons/pom.xml b/legacy/argeo-commons/pom.xml
index 7e0e0d806..d86bc3f42 100644
--- a/legacy/argeo-commons/pom.xml
+++ b/legacy/argeo-commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.legacy.commons</groupId>
diff --git a/legacy/dep/org.argeo.slc.dep.backend/pom.xml b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 0e6de0980..7eab2fa85 100644
--- a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy-dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.spring</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
@@ -33,13 +33,13 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -51,17 +51,17 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- OSGi Boot for platform generation only, as it could be used by regular 
diff --git a/legacy/dep/org.argeo.slc.dep.spring/pom.xml b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index e0bb73d26..2ea8ecee4 100644
--- a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy-dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.spring</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
@@ -23,22 +23,22 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.spring</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Transitional fake Java 8 APIs, required by old version of Spring, 
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.legacy.fake.java8</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Not strictly Spring dependencies but used by the old approach -->
diff --git a/legacy/dep/pom.xml b/legacy/dep/pom.xml
index affcea4a4..7386dc7ec 100644
--- a/legacy/dep/pom.xml
+++ b/legacy/dep/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>legacy-dep</artifactId>
diff --git a/legacy/lib/pom.xml b/legacy/lib/pom.xml
index c24dbfabc..6b1e3de48 100644
--- a/legacy/lib/pom.xml
+++ b/legacy/lib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>lib</artifactId>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 	</dependencies>
diff --git a/legacy/org.argeo.legacy.fake.java8/pom.xml b/legacy/org.argeo.legacy.fake.java8/pom.xml
index 4f99e712f..d0a7a7076 100644
--- a/legacy/org.argeo.legacy.fake.java8/pom.xml
+++ b/legacy/org.argeo.legacy.fake.java8/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.legacy.fake.java8</artifactId>
diff --git a/legacy/org.argeo.slc.agent.jcr/pom.xml b/legacy/org.argeo.slc.agent.jcr/pom.xml
index 437754af9..807cf6544 100644
--- a/legacy/org.argeo.slc.agent.jcr/pom.xml
+++ b/legacy/org.argeo.slc.agent.jcr/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.agent.jcr</artifactId>
diff --git a/legacy/org.argeo.slc.agent/pom.xml b/legacy/org.argeo.slc.agent/pom.xml
index fbf41ceff..2e4bea694 100644
--- a/legacy/org.argeo.slc.agent/pom.xml
+++ b/legacy/org.argeo.slc.agent/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.agent</artifactId>
diff --git a/legacy/org.argeo.slc.client.rap/pom.xml b/legacy/org.argeo.slc.client.rap/pom.xml
index c1decab15..c498506f0 100644
--- a/legacy/org.argeo.slc.client.rap/pom.xml
+++ b/legacy/org.argeo.slc.client.rap/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.rap</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo common distribution for Secured UI -->
diff --git a/legacy/org.argeo.slc.client.ui.dist/pom.xml b/legacy/org.argeo.slc.client.ui.dist/pom.xml
index 81c5c8d61..498781987 100644
--- a/legacy/org.argeo.slc.client.ui.dist/pom.xml
+++ b/legacy/org.argeo.slc.client.ui.dist/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.ui.dist</artifactId>
@@ -28,22 +28,22 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.spring</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Base dependencies -->
diff --git a/legacy/org.argeo.slc.client.ui/pom.xml b/legacy/org.argeo.slc.client.ui/pom.xml
index 6fe69c8eb..454dedf72 100644
--- a/legacy/org.argeo.slc.client.ui/pom.xml
+++ b/legacy/org.argeo.slc.client.ui/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.spring</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/legacy/org.argeo.slc.demo.ant/pom.xml b/legacy/org.argeo.slc.demo.ant/pom.xml
index caabffa8e..7107a5bee 100644
--- a/legacy/org.argeo.slc.demo.ant/pom.xml
+++ b/legacy/org.argeo.slc.demo.ant/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>lib</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.demo.ant</artifactId>
diff --git a/legacy/org.argeo.slc.demo.basic/pom.xml b/legacy/org.argeo.slc.demo.basic/pom.xml
index e900aab4b..f4fe2cff4 100644
--- a/legacy/org.argeo.slc.demo.basic/pom.xml
+++ b/legacy/org.argeo.slc.demo.basic/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>lib</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.demo.basic</artifactId>
diff --git a/legacy/org.argeo.slc.demo.minimal/pom.xml b/legacy/org.argeo.slc.demo.minimal/pom.xml
index 2c189128b..09631dab5 100644
--- a/legacy/org.argeo.slc.demo.minimal/pom.xml
+++ b/legacy/org.argeo.slc.demo.minimal/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>lib</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.demo.minimal</artifactId>
diff --git a/legacy/org.argeo.slc.launcher/pom.xml b/legacy/org.argeo.slc.launcher/pom.xml
index c073f604c..18bd6cca8 100644
--- a/legacy/org.argeo.slc.launcher/pom.xml
+++ b/legacy/org.argeo.slc.launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.launcher</artifactId>
diff --git a/legacy/org.argeo.slc.server.repo/pom.xml b/legacy/org.argeo.slc.server.repo/pom.xml
index a34ec7041..95f8827d0 100644
--- a/legacy/org.argeo.slc.server.repo/pom.xml
+++ b/legacy/org.argeo.slc.server.repo/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.server.repo</artifactId>
diff --git a/legacy/org.argeo.slc.spring/pom.xml b/legacy/org.argeo.slc.spring/pom.xml
index fc025e6d6..13e8f907a 100644
--- a/legacy/org.argeo.slc.spring/pom.xml
+++ b/legacy/org.argeo.slc.spring/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.spring</artifactId>
@@ -43,17 +43,17 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.jcr</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Spring -->
diff --git a/legacy/org.argeo.slc.support/pom.xml b/legacy/org.argeo.slc.support/pom.xml
index 06f048d7e..52008065d 100644
--- a/legacy/org.argeo.slc.support/pom.xml
+++ b/legacy/org.argeo.slc.support/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>legacy</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.support</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.runtime</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.spring</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/legacy/pom.xml b/legacy/pom.xml
index 23ccdaa41..682bea9c3 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>legacy</artifactId>
-	<version>2.3-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SLC Legacy Argeo Software</name>
 	<properties>
diff --git a/org.argeo.slc.api/pom.xml b/org.argeo.slc.api/pom.xml
index f943ccce0..c8f3ae2ab 100644
--- a/org.argeo.slc.api/pom.xml
+++ b/org.argeo.slc.api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.api</artifactId>
diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml
index dadb1c73a..0b5c4ed26 100644
--- a/org.argeo.slc.factory/pom.xml
+++ b/org.argeo.slc.factory/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.factory</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.runtime</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml
index 0212f04db..b525c2818 100644
--- a/org.argeo.slc.jcr/pom.xml
+++ b/org.argeo.slc.jcr/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.jcr</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.runtime</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Commons -->
diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index 200b1161e..155214ecf 100644
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.repo</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Commons -->
diff --git a/org.argeo.slc.runtime/pom.xml b/org.argeo.slc.runtime/pom.xml
index 0c3283969..a9bf496f0 100644
--- a/org.argeo.slc.runtime/pom.xml
+++ b/org.argeo.slc.runtime/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.runtime</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8a27ddd42..661b19441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,15 +9,15 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.3-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<properties>
-		<version.context>unstable</version.context>
+		<version.context>testing</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.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<developmentCycle.slc>2.3</developmentCycle.slc>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
 		<version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
@@ -129,18 +129,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>argeo-unstable</id>
-			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
 		<!-- Disable Maven default repository -->
 		<repository>
 			<id>central</id>
@@ -156,7 +144,7 @@
 	<distributionManagement>
 		<site>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -165,7 +153,7 @@
 			<repositories>
 				<repository>
 					<id>argeo-extras</id>
-					<url>http://localhost:7080/data/java/argeo-extras-2.3</url>
+					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>