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

diff --cc .project
index c9ab03fedfb1ebedca4b7a67f1f8da8f530463bf,3fcd2fd54a7d1ed9902e9eac326fe6d0a2d25231..ff418936f2de03c4250f3d5a808862b33bc3faf5
--- 1/.project
--- 2/.project
+++ b/.project
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
-       <name>argeo-suite-testing</name>
 -      <name>argeo-suite-unstable</name>
++      <name>argeo-suite</name>
        <comment></comment>
        <projects>
        </projects>

diff --cc cnf/build.bnd
index 0000000000000000000000000000000000000000,38f5f286a6df0d08f9ac5298e4ee84bfbf7642ea..c59a50e14ae07b3336ef542075e1c5ca0149efee
mode 000000,100644..100644
--- /dev/null
--- 2/cnf/build.bnd
+++ b/cnf/build.bnd
@@@ -1,0 -1,3 +1,3 @@@
 -${workspace}/cnf/unstable.bnd
+ -include: \
+ ${workspace}/cnf/argeo.bnd, \
++${workspace}/cnf/testing.bnd

diff --cc cnf/maven.bnd
index 0000000000000000000000000000000000000000,f3a6e83cff694e34f205b57c12ac484b31039798..1b962bce97311a102a4164e0a5b5283186d12410
mode 000000,100644..100644
--- /dev/null
--- 2/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@@ -1,0 -1,3 +1,3 @@@
 -../cnf/unstable.bnd
+ -include: \
+ ../cnf/argeo.bnd, \
++../cnf/testing.bnd

diff --cc cnf/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b77856958091fa416fb8890ac944e1c0c8cb298d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,0 -1,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 --cc dep/org.argeo.suite.dep.e4.rap/pom.xml
index 59dcf98735d5fa068ff2d5334b76226a6d189fd1,43ad96f766ab47cb1593f33304141ffa19f7169f..f4238b8116c6757b1836dc2bc49df43e84ff6396
--- 1/dep/org.argeo.suite.dep.e4.rap/pom.xml
--- 2/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.24-SNAPSHOT</version>
 -              <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 +15,7 @@@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.1.24-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  

diff --cc dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 119d7a015a35cac6a0f7866101dbb865098e5931,b4c4229fbcab48674441b8aebc1618c802ed81dc..17b9ae3c78e9bd10c173abd3ce975ee197fd9a83
--- 1/dep/org.argeo.suite.dep.e4.rcp/pom.xml
--- 2/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.23-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>

diff --cc dep/org.argeo.suite.dep.ui.rap/pom.xml
index 22c08d3a5e3d246de596ada20cb9a5ed00a3c2c3,f52ecf192679eb87e1937e833897f1efb98132ed..1740dd37e4d899519064093c13d26b121da3920f
--- 1/dep/org.argeo.suite.dep.ui.rap/pom.xml
--- 2/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.24-SNAPSHOT</version>
 -              <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 +29,17 @@@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Argeo Suite Icons -->
@@@ -53,67 -53,67 +53,67 @@@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <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.1.24-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- PDFBox -->

diff --cc dep/pom.xml
index 6be1672058ab379a3a014ff9450464aba748bc50,56956083495727e42225054df28eb3a7c5e7591e..d69eb9b2f01afce4b62f36c2de992a01a2799386
--- 1/dep/pom.xml
--- 2/dep/pom.xml
+++ b/dep/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.24-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --cc dist/argeo-suite-standard/pom.xml
index f8478924cf07777e6b50b45d3be687a0387c9e21,2f97b48c3e5af00e771536c5245c36abe6e5a90f..23c524b65447cbdd1472abdc053f9ba0a6bb1548
--- 1/dist/argeo-suite-standard/pom.xml
--- 2/dist/argeo-suite-standard/pom.xml
+++ b/dist/argeo-suite-standard/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.1.24-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-standard</artifactId>
@@@ -25,7 -25,7 +25,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
--                                                                      <name>argeo-suite-standard-unstable</name>
++                                                                      <name>argeo-suite-standard${argeo.rpm.suffix}</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo.d/suite</directory>

diff --cc dist/pom.xml
index 3ea8f54aa73425531c12450cc6eebb136d6bab50,90ca6d2e221db8f71dd076ca46ccd39fe836dd5b..dae809c50097dde861c9d59045ba46f302a15b6e
--- 1/dist/pom.xml
--- 2/dist/pom.xml
+++ b/dist/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.24-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

diff --cc lib/pom.xml
index 7e15779478fd6c60c6aa3222a04a5bc83119baa8,e00226e165f586f938cba3f4e1d5f8d8fcca9108..5611ecf11b2e956f9b8c0d22509d86ba806ad0a7
--- 1/lib/pom.xml
--- 2/lib/pom.xml
+++ b/lib/pom.xml
@@@ -10,15 -10,12 +10,13 @@@
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.1.24-SNAPSHOT</version>
 -      <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-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.103</version.argeo-commons>
++              <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +              <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
- 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <dependencies>
@@@ -30,7 -27,7 +28,7 @@@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.1.24-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <!-- Avoid slf4j implementations lurking in the classpath. -->

diff --cc org.argeo.entity.api/pom.xml
index 0000000000000000000000000000000000000000,d20f3f60d63a2dee5da99f02d29897cfdb17ad59..c98575c8c57cc199bbfe0fc7fe14effcc70ae1a4
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.entity.api/pom.xml
+++ b/org.argeo.entity.api/pom.xml
@@@ -1,0 -1,21 +1,21 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+               <artifactId>argeo-suite</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.entity.api</artifactId>
+       <name>Entity API</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.enterprise</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.entity.core/pom.xml
index 0000000000000000000000000000000000000000,090ce00d7cc79df377e82bbedcaefaac2d4c8dc8..a0509450235649551d0425768deb16c1e1a25102
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.entity.core/pom.xml
+++ b/org.argeo.entity.core/pom.xml
@@@ -1,0 -1,27 +1,27 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Entity Reference Implementation</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.api</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.entity.ui/pom.xml
index 0000000000000000000000000000000000000000,10c591842eca281d3b67d87e88ee2c6ccbf16274..d53f0d005482a27facaa34eb74961147c9c10c93
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@@ -1,0 -1,43 +1,43 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Entity UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.core</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+ 
+               <!-- Specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.geo.ui/pom.xml
index 0000000000000000000000000000000000000000,cfe3a0e6320ffac541c953ade3c21429384aafbb..5677817aaf9a90a131169ebe903aee18d4c8b28c
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Geography UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- Specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+ 
+       </dependencies>
+ </project>

diff --cc org.argeo.library.ui/pom.xml
index 0000000000000000000000000000000000000000,672634ad7d11b8af7bce5042c17069eaef68906a..c7a67a81c04ae7aba30454025e546bbedef1563c
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Documents UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- Specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+ 
+       </dependencies>
+ </project>

diff --cc org.argeo.people.ui/pom.xml
index 0000000000000000000000000000000000000000,d211fc75d0c2d288f2488f38d105fbcc313b915e..30c8eb8dab6b45f4ead38b50894ac85f7bf3cf0f
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>People UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- Specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+ 
+       </dependencies>
+ </project>

diff --cc org.argeo.publishing.ui/pom.xml
index 0000000000000000000000000000000000000000,f26aeb4391f2e230affba435e1d04bc1a8013a15..59618338c5d38c1fb800d0db84c1a70b4c244a46
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Publishing UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- Specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+ 
+       </dependencies>
+ </project>

diff --cc org.argeo.suite.core/pom.xml
index 0000000000000000000000000000000000000000,e7402fc5594e583925a3a3ca61ca30d489ed57e2..b0750446a57e572de86d421f7d6e9a2d759d87cd
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.suite.core/pom.xml
+++ b/org.argeo.suite.core/pom.xml
@@@ -1,0 -1,32 +1,32 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Suite Core</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.core</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.maintenance</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.suite.theme.default/pom.xml
index 0000000000000000000000000000000000000000,f2927dc84fbb0f99ad4d12522772d774f27c040a..be49f36d486ff136e7124fbe60b96faeb965f913
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.suite.theme.default/pom.xml
+++ b/org.argeo.suite.theme.default/pom.xml
@@@ -1,0 -1,15 +1,15 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+               <artifactId>argeo-suite</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.suite.theme.default</artifactId>
+       <name>Suite Default Theme</name>
+       <packaging>jar</packaging>
+       <dependencies>
+       </dependencies>
+ </project>

diff --cc org.argeo.suite.ui.rap/pom.xml
index 0000000000000000000000000000000000000000,f1f2d8326c34a90cae0311f6319d68da8bdd5c3b..837a369e3ce8eb7897b41559eb2190d4d55708a7
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.suite.ui.rap/pom.xml
+++ b/org.argeo.suite.ui.rap/pom.xml
@@@ -1,0 -1,29 +1,29 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Suite UI RAP</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.suite.ui/pom.xml
index 0000000000000000000000000000000000000000,b5d1b2ae792abf6ead6b81167f0fd032bbb57cb0..54b6b6ff99039e60de59c9a8356ce082ed526211
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@@ -1,0 -1,47 +1,47 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>Suite UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <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.1-SNAPSHOT</version>
+               </dependency>
+ 
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+ 
+               <!-- Eclipse E4 -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.support.geonames/pom.xml
index 0000000000000000000000000000000000000000,ce70b50e19248b28c05edb658e4e91291acf4d6f..3a1e5f3a1a4e6d154fadaf3f285875292117e0a2
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.support.geonames/pom.xml
+++ b/org.argeo.support.geonames/pom.xml
@@@ -1,0 -1,20 +1,20 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+               <artifactId>argeo-suite</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.support.geonames</artifactId>
+       <name>Geonames support</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.support.odk/pom.xml
index 0000000000000000000000000000000000000000,2f97176c4b1c18c891e2e2e2d1db74ae53082566..0379dd45e850f4a89379565d5b56f24a29c1fde0
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.support.odk/pom.xml
+++ b/org.argeo.support.odk/pom.xml
@@@ -1,0 -1,25 +1,25 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>ODK support</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <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.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc org.argeo.support.xforms/pom.xml
index 0000000000000000000000000000000000000000,08149b13b9a258c9c87be008ff6d349e779b4866..9d593144279805078e037eda69f9ee8c1f5a3f6f
mode 000000,100644..100644
--- /dev/null
--- 2/org.argeo.support.xforms/pom.xml
+++ b/org.argeo.support.xforms/pom.xml
@@@ -1,0 -1,20 +1,20 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.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>
+       <name>XForms support</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.core</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+ </project>

diff --cc pom.xml
index c982334c6dc3f3adac03990159262316a2997c91,5e094f23fe7988945ee5ec11fb8523010678b838..b6dd2377acef44792af1bdf5c9fa7463dc1c2bb5
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -7,19 -7,17 +7,17 @@@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.1.24-SNAPSHOT</version>
 -      <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-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
-               <!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
 -              <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>
- 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
++              <!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
                <git.rw />
        </properties>
        <modules>