From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Nov 2021 09:06:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.24~5
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=c285180bece610b2c2921d44fe14b6dde2123efa;hp=d7d9881c3a7e83c39015ac48e232292d7efc17d2

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

diff --git a/.project b/.project
index 3fcd2fd..ff41893 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>argeo-suite-unstable</name>
+	<name>argeo-suite</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/cnf/build.bnd b/cnf/build.bnd
index 38f5f28..c59a50e 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,3 @@
 -include: \
 ${workspace}/cnf/argeo.bnd, \
-${workspace}/cnf/unstable.bnd
+${workspace}/cnf/testing.bnd
diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index f3a6e83..1b962bc 100644
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,3 +1,3 @@
 -include: \
 ../cnf/argeo.bnd, \
-../cnf/unstable.bnd
+../cnf/testing.bnd
diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644
index 0000000..b778569
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,8 @@
+version.released=2.1.23
+qualifier=.next
+
+category=org.argeo.suite
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=
diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 43ad96f..f4238b8 100644
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index b4c4229..17b9ae3 100644
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index f52ecf1..1740dd3 100644
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@ -29,17 +29,17 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Suite Icons -->
@@ -53,67 +53,67 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.theme.default</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui.rap</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo People -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.people.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Library -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.library.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Environment -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.geo.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Publishing -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.publishing.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Knowledge -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.odk</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.geonames</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- PDFBox -->
diff --git a/dep/pom.xml b/dep/pom.xml
index 5695608..d69eb9b 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml
index 0b26e87..23c524b 100644
--- a/dist/argeo-suite-standard/pom.xml
+++ b/dist/argeo-suite-standard/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dist</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>argeo-suite-standard</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 90ca6d2..dae809c 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dist</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index 96f8b17..bdda5d1 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -10,12 +10,12 @@
 	<packaging>pom</packaging>
 	<name>Parent POM for Argeo Suite Extensions</name>
 	<description />
-	<version>2.3-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<properties>
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
+		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 		<git.rw />
 	</properties>
 	<dependencies>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 			<scope>provided</scope>
 			<exclusions>
 				<!-- Avoid slf4j implementations lurking in the classpath. -->
@@ -85,18 +85,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>
 	</repositories>
 	<reporting>
 		<plugins>
diff --git a/org.argeo.entity.api/pom.xml b/org.argeo.entity.api/pom.xml
index d20f3f6..c98575c 100644
--- a/org.argeo.entity.api/pom.xml
+++ b/org.argeo.entity.api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.entity.api</artifactId>
diff --git a/org.argeo.entity.core/pom.xml b/org.argeo.entity.core/pom.xml
index 090ce00..a050945 100644
--- a/org.argeo.entity.core/pom.xml
+++ b/org.argeo.entity.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.entity.core</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/org.argeo.entity.ui/pom.xml b/org.argeo.entity.ui/pom.xml
index 10c5918..d53f0d0 100644
--- a/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.entity.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/org.argeo.geo.ui/pom.xml b/org.argeo.geo.ui/pom.xml
index cfe3a0e..5677817 100644
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.geo.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.library.ui/pom.xml b/org.argeo.library.ui/pom.xml
index 672634a..c7a67a8 100644
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.library.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.people.ui/pom.xml b/org.argeo.people.ui/pom.xml
index d211fc7..30c8eb8 100644
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.people.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml
index f26aeb4..5961833 100644
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.publishing.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml
index e7402fc..b075044 100644
--- a/org.argeo.suite.core/pom.xml
+++ b/org.argeo.suite.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.core</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/org.argeo.suite.theme.default/pom.xml b/org.argeo.suite.theme.default/pom.xml
index f2927dc..be49f36 100644
--- a/org.argeo.suite.theme.default/pom.xml
+++ b/org.argeo.suite.theme.default/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.theme.default</artifactId>
diff --git a/org.argeo.suite.ui.rap/pom.xml b/org.argeo.suite.ui.rap/pom.xml
index f1f2d83..837a369 100644
--- a/org.argeo.suite.ui.rap/pom.xml
+++ b/org.argeo.suite.ui.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.ui.rap</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.suite.ui/pom.xml
index b5d1b2a..54b6b6f 100644
--- a/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.ui</artifactId>
@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/org.argeo.support.geonames/pom.xml b/org.argeo.support.geonames/pom.xml
index ce70b50..3a1e5f3 100644
--- a/org.argeo.support.geonames/pom.xml
+++ b/org.argeo.support.geonames/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.support.geonames</artifactId>
diff --git a/org.argeo.support.odk/pom.xml b/org.argeo.support.odk/pom.xml
index 2f97176..0379dd4 100644
--- a/org.argeo.support.odk/pom.xml
+++ b/org.argeo.support.odk/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.support.odk</artifactId>
@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.argeo.support.xforms/pom.xml b/org.argeo.support.xforms/pom.xml
index 08149b1..9d59314 100644
--- a/org.argeo.support.xforms/pom.xml
+++ b/org.argeo.support.xforms/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.support.xforms</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3-SNAPSHOT</version>
+			<version>2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 17c898a..6a5c822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,17 @@
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<version>2.3-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<name>Argeo Suite</name>
 	<packaging>pom</packaging>
 	<url>http://www.argeo.org/</url>
 	<properties>
-		<version.context>unstable</version.context>
+		<version.context>testing</version.context>
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
-		<!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
+		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+		<!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
 		<git.rw />
 	</properties>
 	<modules>
@@ -117,18 +117,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>
 	</repositories>
 	<reporting>
 		<plugins>
@@ -200,12 +188,12 @@
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 		<site>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.3/site/argeo-suite/</url>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
 		</site>
 	</distributionManagement>
 </project>