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

diff --cc .project
index 780551523025eba0e4285058ad5b9a021b126663,780551523025eba0e4285058ad5b9a021b126663..e1282551ecbaa1dcf1361aaf5bdd99c7066db358
--- 1/.project
--- 2/.project
+++ b/.project
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
--      <name>argeo-slc</name>
++      <name>argeo-slc-unstable</name>
        <comment></comment>
        <projects>
        </projects>
@@@ -10,7 -10,7 +10,7 @@@
        </natures>
        <filteredResources>
                <filter>
--                      <id>1510764363977</id>
++                      <id>0</id>
                        <name>demo/exec</name>
                        <type>30</type>
                        <matcher>
@@@ -19,7 -19,7 +19,7 @@@
                        </matcher>
                </filter>
                <filter>
--                      <id>1510764363979</id>
++                      <id>0</id>
                        <name>demo/exec</name>
                        <type>22</type>
                        <matcher>

diff --cc cms/org.argeo.cms.integration/pom.xml
index 633f4c05e7e2f3f3a712497d6c318dfc8ca95564,633f4c05e7e2f3f3a712497d6c318dfc8ca95564..32d25f29ed1274d0c03330f28b55ca6ea6b3b412
--- 1/cms/org.argeo.cms.integration/pom.xml
--- 2/cms/org.argeo.cms.integration/pom.xml
+++ b/cms/org.argeo.cms.integration/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.integration</artifactId>

diff --cc cms/org.argeo.ext.equinox.jetty/pom.xml
index 238efab6880e5432553b81217f6573d19ed22a82,238efab6880e5432553b81217f6573d19ed22a82..d5fa5f6ae4f1cb3245488573d5268a907a86eadb
--- 1/cms/org.argeo.ext.equinox.jetty/pom.xml
--- 2/cms/org.argeo.ext.equinox.jetty/pom.xml
+++ b/cms/org.argeo.ext.equinox.jetty/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.ext.equinox.jetty</artifactId>

diff --cc cms/org.argeo.slc.agent.jcr/pom.xml
index 5755937ad3b8fc9b34b54e2958d521216502aeee,5755937ad3b8fc9b34b54e2958d521216502aeee..05e571bdc5838a4d05a4e7ebe9aec44e48d28b56
--- 1/cms/org.argeo.slc.agent.jcr/pom.xml
--- 2/cms/org.argeo.slc.agent.jcr/pom.xml
+++ b/cms/org.argeo.slc.agent.jcr/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.agent.jcr</artifactId>

diff --cc cms/org.argeo.slc.agent/pom.xml
index 18cf670fe4ce1fad9fe3e3eed10f8bc27adc4191,18cf670fe4ce1fad9fe3e3eed10f8bc27adc4191..529eb690ee827076c0407dc848e20704c676432d
--- 1/cms/org.argeo.slc.agent/pom.xml
--- 2/cms/org.argeo.slc.agent/pom.xml
+++ b/cms/org.argeo.slc.agent/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.agent</artifactId>

diff --cc cms/org.argeo.slc.api/pom.xml
index 929d00477982ce56364e0ef37958f7cf6f31e376,929d00477982ce56364e0ef37958f7cf6f31e376..01ebc046f549376fe6d71a53f8cdf9d81bc875df
--- 1/cms/org.argeo.slc.api/pom.xml
--- 2/cms/org.argeo.slc.api/pom.xml
+++ b/cms/org.argeo.slc.api/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.api</artifactId>

diff --cc cms/org.argeo.slc.client.rap/pom.xml
index 3c39852406b1c0a3ad9b2c63ed1b714ead2edfdd,3c39852406b1c0a3ad9b2c63ed1b714ead2edfdd..1f4351c2e1ee2751e1f101754daae74a4a86f4a4
--- 1/cms/org.argeo.slc.client.rap/pom.xml
--- 2/cms/org.argeo.slc.client.rap/pom.xml
+++ b/cms/org.argeo.slc.client.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.rap</artifactId>
@@@ -14,7 -14,7 +14,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Argeo common distribution for Secured UI -->

diff --cc cms/org.argeo.slc.client.ui.dist/pom.xml
index 3d3acadacf0a3baa1f75f9f33a1ddeafbaadce40,3d3acadacf0a3baa1f75f9f33a1ddeafbaadce40..b91e8397bef428bddf23ce005e87222f3087c663
--- 1/cms/org.argeo.slc.client.ui.dist/pom.xml
--- 2/cms/org.argeo.slc.client.ui.dist/pom.xml
+++ b/cms/org.argeo.slc.client.ui.dist/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.ui.dist</artifactId>
@@@ -28,22 -28,22 +28,22 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.server.repo</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Argeo Base dependencies -->

diff --cc cms/org.argeo.slc.client.ui/pom.xml
index c06ebc8df73418228a31a504ff9cd1e5e3d10047,c06ebc8df73418228a31a504ff9cd1e5e3d10047..66bbdb24eea36fcd93598c057a45b9d3bc9dd563
--- 1/cms/org.argeo.slc.client.ui/pom.xml
--- 2/cms/org.argeo.slc.client.ui/pom.xml
+++ b/cms/org.argeo.slc.client.ui/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.ui</artifactId>
@@@ -14,7 -14,7 +14,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Argeo Commons -->

diff --cc cms/org.argeo.slc.factory/pom.xml
index 452873f05ff1613c4b6ea42151e9e711a0dbd5cf,452873f05ff1613c4b6ea42151e9e711a0dbd5cf..178948aae30030c4063332e38128f99ae5115154
--- 1/cms/org.argeo.slc.factory/pom.xml
--- 2/cms/org.argeo.slc.factory/pom.xml
+++ b/cms/org.argeo.slc.factory/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.factory</artifactId>
@@@ -13,12 -13,12 +13,12 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --cc cms/org.argeo.slc.jcr/pom.xml
index b0efc62fc62c5214e3675a89465a0f7b4bd768ee,b0efc62fc62c5214e3675a89465a0f7b4bd768ee..c272faab8a20a9162b3a9444571d06100235c6e4
--- 1/cms/org.argeo.slc.jcr/pom.xml
--- 2/cms/org.argeo.slc.jcr/pom.xml
+++ b/cms/org.argeo.slc.jcr/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.jcr</artifactId>
@@@ -13,12 -13,12 +13,12 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Commons -->

diff --cc cms/org.argeo.slc.launcher/pom.xml
index e7b8755ba8f73b130e09b7c8872f17f8b9a1adf2,e7b8755ba8f73b130e09b7c8872f17f8b9a1adf2..c3190570c5df69233b838a22fbb786de5cb73beb
--- 1/cms/org.argeo.slc.launcher/pom.xml
--- 2/cms/org.argeo.slc.launcher/pom.xml
+++ b/cms/org.argeo.slc.launcher/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.launcher</artifactId>

diff --cc cms/org.argeo.slc.repo/pom.xml
index 54b02b2c4f3e87c684ab2f0c0b8237af6aa3c5b2,54b02b2c4f3e87c684ab2f0c0b8237af6aa3c5b2..9fdfe6a67d0fb0f4cdc20370daa9f79396d864e5
--- 1/cms/org.argeo.slc.repo/pom.xml
--- 2/cms/org.argeo.slc.repo/pom.xml
+++ b/cms/org.argeo.slc.repo/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.repo</artifactId>
@@@ -13,7 -13,7 +13,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Commons -->

diff --cc cms/org.argeo.slc.runtime/pom.xml
index 478a7136c5ef6734c139dbd9675e25e6dd4b47d8,478a7136c5ef6734c139dbd9675e25e6dd4b47d8..4fde08bda4c3eba9f1818f5309b4b32f6468b684
--- 1/cms/org.argeo.slc.runtime/pom.xml
--- 2/cms/org.argeo.slc.runtime/pom.xml
+++ b/cms/org.argeo.slc.runtime/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.runtime</artifactId>
@@@ -13,7 -13,7 +13,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --cc cms/org.argeo.slc.server.repo/pom.xml
index bd5c34b4b4600974a995d10ea4dd8bffd93e1974,bd5c34b4b4600974a995d10ea4dd8bffd93e1974..0ccff86d5d5e4201f50e75d33153963eaa32c786
--- 1/cms/org.argeo.slc.server.repo/pom.xml
--- 2/cms/org.argeo.slc.server.repo/pom.xml
+++ b/cms/org.argeo.slc.server.repo/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.server.repo</artifactId>

diff --cc cms/org.argeo.slc.spring/pom.xml
index 9a2c203e89ab1a401f07a6610d2114312248d4c8,9a2c203e89ab1a401f07a6610d2114312248d4c8..91c107d8d7b906ffe6e5d774c20051dec64360ab
--- 1/cms/org.argeo.slc.spring/pom.xml
--- 2/cms/org.argeo.slc.spring/pom.xml
+++ b/cms/org.argeo.slc.spring/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.spring</artifactId>
@@@ -43,17 -43,17 +43,17 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.jcr</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Spring -->

diff --cc cms/org.argeo.slc.support/pom.xml
index 8094bc37d6caff77e723e6c3870e79cf4b04a31c,8094bc37d6caff77e723e6c3870e79cf4b04a31c..7fe9329764270eca4a8e9ff28781a2c71ece7230
--- 1/cms/org.argeo.slc.support/pom.xml
--- 2/cms/org.argeo.slc.support/pom.xml
+++ b/cms/org.argeo.slc.support/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.support</artifactId>
@@@ -13,12 -13,12 +13,12 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --cc cms/pom.xml
index bb9ea66ebfcd6efdfabcd54f0103e32e59344100,fbd40ce19703d7e820642fb048381b3702a13ea7..80104f398484b26ab15c12f1de79d27bae815b3a
--- 1/cms/pom.xml
--- 2/cms/pom.xml
+++ b/cms/pom.xml
@@@ -9,7 -9,7 +9,7 @@@
        <artifactId>argeo-slc-cms</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC CMS</name>
--      <version>2.1.18-SNAPSHOT</version>
++      <version>2.3.1-SNAPSHOT</version>
        <properties>
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
@@@ -20,7 -20,7 +20,7 @@@
                <developmentCycle.slc>2.1</developmentCycle.slc>
                <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
  
--              <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>
        </properties>
        <modules>
                <!-- Argeo CMS extensions -->
@@@ -143,6 -142,6 +142,29 @@@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
++              <repository>
++                      <id>argeo-unstable</id>
++                      <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
++                      <releases>
++                              <enabled>true</enabled>
++                              <updatePolicy>never</updatePolicy>
++                              <checksumPolicy>warn</checksumPolicy>
++                      </releases>
++                      <snapshots>
++                              <enabled>false</enabled>
++                      </snapshots>
++              </repository>
++              <!-- Disable Maven default repository -->
++              <repository>
++                      <id>central</id>
++                      <url>http://repo1.maven.org/maven2</url>
++                      <releases>
++                              <enabled>false</enabled>
++                      </releases>
++                      <snapshots>
++                              <enabled>false</enabled>
++                      </snapshots>
++              </repository>
        </repositories>
        <reporting>
                <plugins>
@@@ -214,7 -213,7 +236,7 @@@
        <distributionManagement>
                <site>
                        <id>staging</id>
--                      <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
++                      <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
                </site>
        </distributionManagement>
        <profiles>
@@@ -223,7 -222,7 +245,7 @@@
                        <repositories>
                                <repository>
                                        <id>argeo-extras</id>
--                                      <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
++                                      <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>

diff --cc demo/modules/org.argeo.slc.demo.ant/pom.xml
index 9348f8d4bc982043d65737b9a76271858823e709,9348f8d4bc982043d65737b9a76271858823e709..5e488988fea0cb4591320d6f700b8de3e3d8a314
--- 1/demo/modules/org.argeo.slc.demo.ant/pom.xml
--- 2/demo/modules/org.argeo.slc.demo.ant/pom.xml
+++ b/demo/modules/org.argeo.slc.demo.ant/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.demo</groupId>
                <artifactId>modules</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.ant</artifactId>

diff --cc demo/modules/org.argeo.slc.demo.basic/pom.xml
index 9ef21d23d8d112fe47fa3eba8e1f2e59855ef16e,9ef21d23d8d112fe47fa3eba8e1f2e59855ef16e..d87b1fb34b97d670d9a910e58998bf3265813186
--- 1/demo/modules/org.argeo.slc.demo.basic/pom.xml
--- 2/demo/modules/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.demo</groupId>
                <artifactId>modules</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.basic</artifactId>

diff --cc demo/modules/org.argeo.slc.demo.minimal/pom.xml
index 11a2c12729b8d0804f8cf3ea9e8ec3228a636545,11a2c12729b8d0804f8cf3ea9e8ec3228a636545..3c956fb25ae36c6b8800af4177b6994293ce8e64
--- 1/demo/modules/org.argeo.slc.demo.minimal/pom.xml
--- 2/demo/modules/org.argeo.slc.demo.minimal/pom.xml
+++ b/demo/modules/org.argeo.slc.demo.minimal/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.demo</groupId>
                <artifactId>modules</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.minimal</artifactId>

diff --cc demo/modules/pom.xml
index 1a114a65ad06991b1a52393bf45436bb3e216fdd,1a114a65ad06991b1a52393bf45436bb3e216fdd..3f81490f63268034e8129d4a0af2d1c941566185
--- 1/demo/modules/pom.xml
--- 2/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>demo</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
@@@ -65,13 -65,13 +65,13 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.backend</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                        <optional>true</optional>
                </dependency>

diff --cc demo/pom.xml
index b215746b251760b8974573571832f5d821030b10,b215746b251760b8974573571832f5d821030b10..cf03f88cf74ae4a9f77e3e11fe42196fda329902
--- 1/demo/pom.xml
--- 2/demo/pom.xml
+++ b/demo/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>demo</artifactId>

diff --cc dep/org.argeo.slc.dep.backend/pom.xml
index d1c34f696bb808df7636f3ee8ed0d88798407adf,171af696ba972f269066695405785e8438d90aa1..b4518b909d76c7560199974945c39345d1110736
--- 1/dep/org.argeo.slc.dep.backend/pom.xml
--- 2/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.backend</artifactId>
@@@ -13,7 -16,7 +16,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.spring</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  

diff --cc dep/org.argeo.slc.dep.e4.rap/pom.xml
index e04ed2395102fc2841fb5b6f76b5c5bc356afa5b,fa05eb016335b50456d00a58a8219a559d712294..f4e815f9acd448946169c27a40d375d9ef6ed8db
--- 1/dep/org.argeo.slc.dep.e4.rap/pom.xml
--- 2/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.e4.rap</artifactId>
@@@ -19,7 -19,7 +19,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  

diff --cc dep/org.argeo.slc.dep.minimal/pom.xml
index ef116af9a56ecc44aa6469ddf914e16e2d02b0d6,83efaa3e07319babddc273f3ce529225d7c68398..6df1cc2a379a9194052e910ec8be2e2fede7caf3
--- 1/dep/org.argeo.slc.dep.minimal/pom.xml
--- 2/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@@ -3,7 -5,7 +5,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.minimal</artifactId>

diff --cc dep/org.argeo.slc.dep.spring/pom.xml
index 0de07e5182c52ec1758cbeb2c3f663b8beb0bb00,cda79b6b58f9896c35794f090ad46ca75c86d484..860e4243a69ae45b1207c818fbea9b42694bf8dd
--- 1/dep/org.argeo.slc.dep.spring/pom.xml
--- 2/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/dep/org.argeo.slc.dep.spring/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.spring</artifactId>
@@@ -13,7 -16,7 +16,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  

diff --cc dep/pom.xml
index 1278b3e347018ef361c53f8fb2fa004537c18171,924f06a7f7d75c28e76bc455b8c7cb4d190fe670..ddea13232f625e9898f43e225d75f9e56e68da2b
--- 1/dep/pom.xml
--- 2/dep/pom.xml
+++ b/dep/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --cc ide/features/pom.xml
index 0ab722a6b651592ab5c94224f99426f27641ab68,0ab722a6b651592ab5c94224f99426f27641ab68..ec6efa0e2595b1e7c21120932257a4a47cdba80c
--- 1/ide/features/pom.xml
--- 2/ide/features/pom.xml
+++ b/ide/features/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>features</artifactId>

diff --cc ide/plugins/pom.xml
index aac315d3b35b65397fa2946c44178741b9cc49a2,aac315d3b35b65397fa2946c44178741b9cc49a2..989db0e824e3b5c10e05fd4cfe98df84c521abe8
--- 1/ide/plugins/pom.xml
--- 2/ide/plugins/pom.xml
+++ b/ide/plugins/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>plugins</artifactId>

diff --cc ide/pom.xml
index 7f618f0ba4307a9ada7666baef172bc8359c471d,7f618f0ba4307a9ada7666baef172bc8359c471d..7b7aeeda7ed0c3bfabb8cd1aa19a15d9a08f13f7
--- 1/ide/pom.xml
--- 2/ide/pom.xml
+++ b/ide/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.ide</groupId>

diff --cc lib/org.argeo.slc.lib.build/pom.xml
index 85ff5c25a0a12860c02f04b9235882f82d1936a5,85ff5c25a0a12860c02f04b9235882f82d1936a5..e304b70a315e21ac2eea8f1f6a6efff4b8724274
--- 1/lib/org.argeo.slc.lib.build/pom.xml
--- 2/lib/org.argeo.slc.lib.build/pom.xml
+++ b/lib/org.argeo.slc.lib.build/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.lib.build</artifactId>

diff --cc lib/org.argeo.slc.lib.jcr/pom.xml
index d9ef6ccc48ee4341b583486c090336fc8d340d55,d9ef6ccc48ee4341b583486c090336fc8d340d55..d08fa3a3944630adb9cb6a1a7e101b5d025d2570
--- 1/lib/org.argeo.slc.lib.jcr/pom.xml
--- 2/lib/org.argeo.slc.lib.jcr/pom.xml
+++ b/lib/org.argeo.slc.lib.jcr/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.lib.jcr</artifactId>

diff --cc lib/org.argeo.slc.lib.repo/pom.xml
index 6a0b221dc284a33acb0fbfc4ee473f726b086b95,6a0b221dc284a33acb0fbfc4ee473f726b086b95..003a4c06666ff6b96780a24db00558f2a95b1fd6
--- 1/lib/org.argeo.slc.lib.repo/pom.xml
--- 2/lib/org.argeo.slc.lib.repo/pom.xml
+++ b/lib/org.argeo.slc.lib.repo/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.lib.repo</artifactId>

diff --cc lib/org.argeo.slc.lib.rpmfactory/pom.xml
index 1324bb05ad520692337a983e24e59cc6ec4949b2,1324bb05ad520692337a983e24e59cc6ec4949b2..93aae57a1dd7ebe51eaea022be9aed113299560a
--- 1/lib/org.argeo.slc.lib.rpmfactory/pom.xml
--- 2/lib/org.argeo.slc.lib.rpmfactory/pom.xml
+++ b/lib/org.argeo.slc.lib.rpmfactory/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.lib.rpmfactory</artifactId>

diff --cc lib/pom.xml
index cf45120d128de012a202e3852084f7560692aebf,cf45120d128de012a202e3852084f7560692aebf..ab399b485116d45e73c9e51176eeb39284283bda
--- 1/lib/pom.xml
--- 2/lib/pom.xml
+++ b/lib/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
--              <version>2.1.18-SNAPSHOT</version>
++              <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>lib</artifactId>
@@@ -74,7 -74,7 +74,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
--                      <version>2.1.18-SNAPSHOT</version>
++                      <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
        </dependencies>

diff --cc pom.xml
index 9431b2d668805394b0add9f7e8c24451732ca8e3,768f4a698afe559f00b9a0a768db918c04f8006b..a9283b106371917f79a52ea167537043d038f734
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -9,18 -9,18 +9,18 @@@
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
--      <version>2.1.18-SNAPSHOT</version>
++      <version>2.3.1-SNAPSHOT</version>
        <properties>
                <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-commons>2.3.1-SNAPSHOT</version.argeo-commons>
  
--              <version.slc>2.1.18-SNAPSHOT</version.slc>
++              <version.slc>2.3.1-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
--              <developmentCycle.slc>2.1</developmentCycle.slc>
++              <developmentCycle.slc>2.3</developmentCycle.slc>
                <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
  
--              <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>
        </properties>
        <modules>
                <!-- Legacy UI -->
@@@ -102,11 -101,11 +101,34 @@@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
++              <repository>
++                      <id>argeo-unstable</id>
++                      <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
++                      <releases>
++                              <enabled>true</enabled>
++                              <updatePolicy>never</updatePolicy>
++                              <checksumPolicy>warn</checksumPolicy>
++                      </releases>
++                      <snapshots>
++                              <enabled>false</enabled>
++                      </snapshots>
++              </repository>
++              <!-- Disable Maven default repository -->
++              <repository>
++                      <id>central</id>
++                      <url>http://repo1.maven.org/maven2</url>
++                      <releases>
++                              <enabled>false</enabled>
++                      </releases>
++                      <snapshots>
++                              <enabled>false</enabled>
++                      </snapshots>
++              </repository>
        </repositories>
        <distributionManagement>
                <site>
                        <id>staging</id>
--                      <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
++                      <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
                </site>
        </distributionManagement>
        <profiles>
@@@ -115,7 -114,7 +137,7 @@@
                        <repositories>
                                <repository>
                                        <id>argeo-extras</id>
--                                      <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
++                                      <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>