From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Apr 2021 10:03:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v2.x'
X-Git-Tag: argeo-suite-2.3.1~61
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=457c84fc27fcc073e553080aa0dec3328a0687e3;hp=911166bda35efaee1cdfffbc7d5b26045ce17a23

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

diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml
index 731d8ae..c0723fe 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.entity.api</artifactId>
diff --git a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index b30657d..b64a275 100644
--- a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -43,7 +43,7 @@ mixin
 
 [entity:term]
 orderable
-- name (NAME) m
+- name (NAME)
 - * (*)
 + term (entity:term) = entity:term *
 
diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml
index 4f939ab..39b697e 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml
index 103b3e9..d635fbf 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml
index da13266..0c1d40b 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-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 b5d1585..e9f0092 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 d4e2753..a8a1e80 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml
index 724e103..2436864 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons -->
diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index b2ebcb2..46de177 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -59,15 +59,20 @@ public class DefaultLeadPane implements CmsUiProvider {
 		appLayersC.setLayout(layout);
 		appLayersC.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
 
-		Composite adminLayersC = new Composite(parent, SWT.NONE);
-		CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
-		GridLayout adminLayout = new GridLayout();
-		adminLayout.verticalSpacing = 10;
-		adminLayout.marginBottom = 10;
-		adminLayout.marginLeft = 10;
-		adminLayout.marginRight = 10;
-		adminLayersC.setLayout(adminLayout);
-		adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+		Composite adminLayersC;
+		if (!adminLayers.isEmpty()) {
+			adminLayersC = new Composite(parent, SWT.NONE);
+			CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+			GridLayout adminLayout = new GridLayout();
+			adminLayout.verticalSpacing = 10;
+			adminLayout.marginBottom = 10;
+			adminLayout.marginLeft = 10;
+			adminLayout.marginRight = 10;
+			adminLayersC.setLayout(adminLayout);
+			adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+		} else {
+			adminLayersC = null;
+		}
 
 //		boolean isAdmin = cmsView.doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN));
 		Set<String> userRoles = cmsView.doAs(() -> CurrentUser.roles());
diff --git a/core/pom.xml b/core/pom.xml
index 55ff5e2..a8ef5a0 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 b147caf..30ff3b6 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-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 750310e..a70a582 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.entity.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Suite Icons -->
@@ -39,67 +39,67 @@
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.theme.default</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.ui.rap</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo People -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.people.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Library -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.documents.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Environment -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.geo.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Publishing -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.publishing.ui</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Knowledge -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.odk</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.geonames</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Additional Third Parties -->
diff --git a/dep/pom.xml b/dep/pom.xml
index cac2847..60dc034 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index c205bd7..dc4c578 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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.1.22-SNAPSHOT</version>
+					<version>2.3.1-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 850ae4e..c31fc7d 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>argeo-suite-demo</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 8b31d0a..38c2521 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 bc4c068..a5a4711 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/environment/pom.xml b/environment/pom.xml
index 53d22d3..7e13702 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 d6ed666..7587ef3 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 01c8ce9..2b68347 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml
index 95717b9..d97f8c7 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/knowledge/pom.xml b/knowledge/pom.xml
index 6bfec4e..6a0890e 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>knowledge</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index 416484d..b3a10b9 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.1.22-SNAPSHOT</version>
+	<version>2.3.1-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.1.102-SNAPSHOT</version.argeo-commons>
-		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+		<version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -92,6 +92,18 @@
 				<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>
@@ -160,8 +172,4 @@
 			</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 1684f4f..2c59ff3 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/library/pom.xml b/library/pom.xml
index dd83267..ea3ef63 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-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 2ce72fb..07589a4 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/people/pom.xml b/people/pom.xml
index 50ba63f..193f633 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>people</artifactId>
diff --git a/pom.xml b/pom.xml
index 4161919..4e8207b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -7,7 +9,7 @@
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<version>2.1.22-SNAPSHOT</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<name>Argeo Suite</name>
 	<packaging>pom</packaging>
 	<url>http://www.argeo.org/</url>
@@ -15,10 +17,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.1.102-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
 		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<modules>
@@ -39,7 +41,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>v2.x</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<organization>
 		<name>Argeo GmbH</name>
@@ -106,6 +108,18 @@
 				<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>
@@ -177,7 +191,7 @@
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.3</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 6c67b97..b70057c 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.1.22-SNAPSHOT</version>
+		<version>2.3.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.1.22-SNAPSHOT</version>
+			<version>2.3.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/publishing/pom.xml b/publishing/pom.xml
index 6e92d54..5dfdd44 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.1.22-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>publishing</artifactId>