From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 14 Feb 2021 16:33:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.21~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=91a19e7f23eac8f073b833e2886bcb7771ff7469;hp=88ea3e9381606ed2a8892ca3ac09495ae48e4e45

Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
	pom.xml
---

diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml
index c0723fe..a4dde0f 100644
--- a/core/org.argeo.entity.api/pom.xml
+++ b/core/org.argeo.entity.api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.entity.api</artifactId>
diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml
index 39b697e..a4a14d2 100644
--- a/core/org.argeo.entity.core/pom.xml
+++ b/core/org.argeo.entity.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml
index d635fbf..2ead60f 100644
--- a/core/org.argeo.entity.ui/pom.xml
+++ b/core/org.argeo.entity.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml
index 0c1d40b..149b437 100644
--- a/core/org.argeo.suite.core/pom.xml
+++ b/core/org.argeo.suite.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml
index e9f0092..8c69f9e 100644
--- a/core/org.argeo.suite.theme.default/pom.xml
+++ b/core/org.argeo.suite.theme.default/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.theme.default</artifactId>
diff --git a/core/org.argeo.suite.ui.rap/pom.xml b/core/org.argeo.suite.ui.rap/pom.xml
index a8a1e80..74c3b91 100644
--- a/core/org.argeo.suite.ui.rap/pom.xml
+++ b/core/org.argeo.suite.ui.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml
index 2436864..4858297 100644
--- a/core/org.argeo.suite.ui/pom.xml
+++ b/core/org.argeo.suite.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>core</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/pom.xml b/core/pom.xml
index a8ef5a0..9df3230 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>core</artifactId>
diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 30ff3b6..cadf22d 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.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index a70a582..d205816 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.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@ -15,17 +15,17 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.api</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Suite Icons -->
@@ -39,67 +39,67 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.theme.default</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui.rap</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo People -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.people.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Library -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.documents.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Environment -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.geo.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Publishing -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.publishing.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Knowledge -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.odk</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.geonames</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Additional Third Parties -->
diff --git a/dep/pom.xml b/dep/pom.xml
index 60dc034..9fe189b 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.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index dc4c578..61df24f 100644
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dist</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>argeo-office</artifactId>
@@ -28,7 +28,7 @@
 				<dependency>
 					<groupId>org.argeo.suite</groupId>
 					<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-					<version>2.3.1-SNAPSHOT</version>
+					<version>2.1.21-SNAPSHOT</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml
index c31fc7d..7b6ffed 100644
--- a/dist/argeo-suite-demo/pom.xml
+++ b/dist/argeo-suite-demo/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>dist</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>argeo-suite-demo</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 38c2521..597ff69 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.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dist</artifactId>
diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml
index a5a4711..ed2de0b 100644
--- a/environment/org.argeo.geo.ui/pom.xml
+++ b/environment/org.argeo.geo.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>environment</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/environment/pom.xml b/environment/pom.xml
index 7e13702..c296c6b 100644
--- a/environment/pom.xml
+++ b/environment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>environment</artifactId>
diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml
index 7587ef3..7399c9a 100644
--- a/knowledge/org.argeo.support.geonames/pom.xml
+++ b/knowledge/org.argeo.support.geonames/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>knowledge</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.support.geonames</artifactId>
diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml
index 2b68347..d614048 100644
--- a/knowledge/org.argeo.support.odk/pom.xml
+++ b/knowledge/org.argeo.support.odk/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>knowledge</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml
index d97f8c7..784189f 100644
--- a/knowledge/org.argeo.support.xforms/pom.xml
+++ b/knowledge/org.argeo.support.xforms/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>knowledge</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/knowledge/pom.xml b/knowledge/pom.xml
index 6a0890e..f6935d3 100644
--- a/knowledge/pom.xml
+++ b/knowledge/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>knowledge</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index b3a10b9..77b25e4 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -10,15 +10,15 @@
 	<packaging>pom</packaging>
 	<name>Parent POM for Argeo Suite Extensions</name>
 	<description />
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.1.21-SNAPSHOT</version>
 	<properties>
 		<!-- Dependencies -->
 		<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.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.101</version.argeo-commons>
 		<version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<dependencies>
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -92,18 +92,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>
@@ -172,4 +160,8 @@
 			</plugin>
 		</plugins>
 	</reporting>
+
+  <scm>
+    <tag>v2.x</tag>
+  </scm>
 </project>
diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.documents.ui/pom.xml
index 2c59ff3..d5cfbc3 100644
--- a/library/org.argeo.documents.ui/pom.xml
+++ b/library/org.argeo.documents.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>library</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.documents.ui</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/library/pom.xml b/library/pom.xml
index ea3ef63..61247f3 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>library</artifactId>
diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml
index 07589a4..dc8a105 100644
--- a/people/org.argeo.people.ui/pom.xml
+++ b/people/org.argeo.people.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>people</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/people/pom.xml b/people/pom.xml
index 193f633..7d6acf2 100644
--- a/people/pom.xml
+++ b/people/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>people</artifactId>
diff --git a/pom.xml b/pom.xml
index d2872fe..6e960ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,4 @@
-<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.maven</groupId>
@@ -9,7 +7,7 @@
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.1.21-SNAPSHOT</version>
 	<name>Argeo Suite</name>
 	<packaging>pom</packaging>
 	<url>http://www.argeo.org/</url>
@@ -17,10 +15,10 @@
 		<!-- Dependencies -->
 		<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.1-SNAPSHOT</version.argeo-commons>
-		<version.argeo-suite-icons>2.1.1-SNAPSHOT</version.argeo-suite-icons>
+		<version.argeo-commons>2.1.101</version.argeo-commons>
+		<version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<modules>
@@ -41,7 +39,7 @@
 		<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
 		<url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
 		<developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>v2.x</tag>
 	</scm>
 	<organization>
 		<name>Argeo GmbH</name>
@@ -108,18 +106,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>
@@ -191,7 +177,7 @@
 	<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>
diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml
index b70057c..1b1f3f8 100644
--- a/publishing/org.argeo.publishing.ui/pom.xml
+++ b/publishing/org.argeo.publishing.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>publishing</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-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.1-SNAPSHOT</version>
+			<version>2.1.21-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/publishing/pom.xml b/publishing/pom.xml
index 5dfdd44..0b4581d 100644
--- a/publishing/pom.xml
+++ b/publishing/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.suite</groupId>
 		<artifactId>argeo-suite</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.1.21-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>publishing</artifactId>