Merge branch 'master' into testing

diff --combined cnf/build.bnd
index 150e1d46aac5b4a2f2fdb38748250a3cf9e7e964,af9c91be7d16ae6c7acaec7b6fc6bf73060d539f..f39af41a12594bcbdb0e07b1236505549564026b
--- 1/cnf/build.bnd
--- 2/cnf/build.bnd
+++ b/cnf/build.bnd
@@@ -1,18 -1,4 +1,4 @@@
- category: org.argeo.commons
- version: 2.1.104
- buildId: S
- #buildId: r${tstamp}
- 
- Bundle-Version: 2.1.104.S
- Bundle-RequiredExecutionEnvironment: JavaSE-11
- 
- Private-Package: org.argeo.*.internal.*
- Export-Package: !org.argeo.*.internal.*; org.argeo.*
- SLC-Category: ${category}
- #SLC-Build-Timestamp: ${tstamp}
- -savemanifest = META-INF/MANIFEST.MF
- -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
- -groupId = ${category}
- Automatic-Module-Name: ${bsn}
- 
- 
+ -include: \
 -${workspace}/cnf/unstable.bnd, \
++${workspace}/cnf/testing.bnd, \
+ ${workspace}/cnf/argeo.bnd, \
+ -${workspace}/cnf/release.bnd

diff --combined cnf/maven.bnd
index 0000000000000000000000000000000000000000,bbd72adec484781db9ddb623f71d54adb067194d..05b92033aeb4caaf4773e064a224fa0db11292dd
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/testing.bnd, \
+ ../cnf/argeo.bnd

diff --combined cnf/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0f1c92e4d4fcb0ac114b198bd01575ec2bd59201
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,0 -1,0 +1,6 @@@
++category=org.argeo.commons
++version.released=2.1.104
++Bundle-RequiredExecutionEnvironment=JavaSE-11
++
++argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
++argeo.rpm.suffix=

diff --combined demo/pom.xml
index 97a5dcef78b81af6ba326a4ccc65499e57f9081b,f152523a12d82e72fb05ee725787d19b8607521e..22d23f847fffca7b6bcf729faf1c068cc105f1b3
--- 1/demo/pom.xml
--- 2/demo/pom.xml
+++ b/demo/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>demo</artifactId>
@@@ -20,7 -20,7 +20,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@@ -42,7 -42,7 +42,7 @@@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>
@@@ -64,7 -64,7 +64,7 @@@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>

diff --combined dep/org.argeo.dep.cms.client/pom.xml
index 81a2fa76ed73a7a38dae0238c586e48b368ec184,975257ba978fd6a0ccefa8d3e96d45e3751fb337..d7354d9ad0020096929130a8ac69851d47a89552
--- 1/dep/org.argeo.dep.cms.client/pom.xml
--- 2/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -15,17 -15,17 +15,17 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- Third Parties -->
@@@ -234,7 -234,7 +234,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@@ -272,7 -272,9 +272,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-client</name>
+                                                                       <name>argeo-cms-client${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -291,8 -293,8 +293,8 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client-tp</require>
-                                                                               <require>argeo-osgi-boot</require>
+                                                                               <require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@@ -333,7 -335,7 +335,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-client-tp</name>
+                                                                       <name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>

diff --combined dep/org.argeo.dep.cms.e4.rap/pom.xml
index ff12645c65ca21b1a872aacc16c42f27a18aa4bd,a5f1bd42fc35b47fcdb4ac2b185e8b3fe375cb76..df05ac93af6fb955cf2528277f71b433bd9ce124
--- 1/dep/org.argeo.dep.cms.e4.rap/pom.xml
--- 2/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -15,7 -15,7 +15,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  
@@@ -23,12 -23,12 +23,12 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- SVG and CSS -->
@@@ -296,7 -296,9 +296,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-e4-rap</name>
+                                                                       <name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -315,8 -317,8 +317,8 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-ui-rap</require>
-                                                                               <require>argeo-cms-e4-rap-tp</require>
+                                                                               <require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@@ -357,7 -359,7 +359,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-e4-rap-tp</name>
+                                                                       <name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
@@@ -378,7 -380,7 +380,7 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-ui-rap-tp</require>
+                                                                               <require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --combined dep/org.argeo.dep.cms.ext/pom.xml
index f657231f454b4f668e753be05aa6a69f7ee07d57,c53d9ba6798de83f8648672de736258ca8767b53..3749a9f8e839a258818f972ed9d99e47dba7ea7e
--- 1/dep/org.argeo.dep.cms.ext/pom.xml
--- 2/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@@ -5,7 -5,7 +5,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -112,7 -112,7 +112,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ext-tp</name>
+                                                                       <name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
@@@ -133,7 -133,7 +133,7 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --combined dep/org.argeo.dep.cms.node/pom.xml
index 1174ddf97377d29348387d3c8e52b71ace3914d6,2832da4642c13147d78436c02ee8372477bae92b..656da2955630600d72a3f1e282a2156b5020d440
--- 1/dep/org.argeo.dep.cms.node/pom.xml
--- 2/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -15,7 -15,7 +15,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  
@@@ -23,17 -23,17 +23,17 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- CMS Dependencies -->
@@@ -240,7 -240,9 +240,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-node</name>
+                                                                       <name>argeo-cms-node${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -259,8 -261,8 +261,8 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client</require>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-client${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@@ -322,7 -324,7 +324,7 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client-tp</require>
+                                                                               <require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --combined dep/org.argeo.dep.cms.ui.rap/pom.xml
index 064ca8703ffc111f02f43a48579894cee96dbab1,03249c591ec35a16ba17c04586835f14f7917571..b00284f4fc3d26ce034e537f415a6291992f7ff1
--- 1/dep/org.argeo.dep.cms.ui.rap/pom.xml
--- 2/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -15,7 -15,7 +15,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  
@@@ -49,27 -49,27 +49,27 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- SDK -->
@@@ -120,7 -120,9 +120,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ui-rap</name>
+                                                                       <name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -181,7 -183,7 +183,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ui-rap-tp</name>
+                                                                       <name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
@@@ -202,7 -204,7 +204,7 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --combined dep/pom.xml
index 3293a560c91b7665e9bb838e08188521f0261b00,98547404fd7a5dee646c53ada0e34c2ca7d0deb8..7c3b04cb64cbe3fab3c1815962067ca02f7b77f1
--- 1/dep/pom.xml
--- 2/dep/pom.xml
+++ b/dep/pom.xml
@@@ -1,10 -1,12 +1,12 @@@
  <?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">
+ <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.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@@ -19,6 -21,16 +21,16 @@@
        </modules>
        <build>
                <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <configuration>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../cnf/${version.context}.bnd</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@@ -67,6 -79,21 +79,21 @@@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>a2-target</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <configuration>
+                                                       <descriptorRefs>
+                                                               <descriptorRef>a2-target</descriptorRef>
+                                                       </descriptorRefs>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>check-osgi</id>
                        <build>
@@@ -93,7 -120,7 +120,7 @@@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
                        </dependencies>

diff --combined dist/argeo-cli/pom.xml
index 29ec5f5759372e90bdbc8e2d65385d7e88f6de07,ea59e43c397424c0f3f6de9b1e73da35208508d3..4d2aa70c0d798bd2fb37f6df8edd667a4a3c42e0
--- 1/dist/argeo-cli/pom.xml
--- 2/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -16,12 -16,12 +16,12 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@@ -67,7 -67,9 +67,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cli</name>
+                                                                       <name>argeo-cli${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo-cli</directory>

diff --combined dist/argeo-node/pom.xml
index 452e8379c63a014ed2d7513a48473a056ba554b9,dda7589b9fed34c056cdc35112ec1d128e6a1d7f..10be1edb58373ecb64e7c7abf390031ca9b65d1c
--- 1/dist/argeo-node/pom.xml
--- 2/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -16,23 -16,23 +16,23 @@@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>osgi-boot</artifactId>
                                        <type>zip</type>
-                                       <version>2.1.104-SNAPSHOT</version>
 -                                      <version>2.3-SNAPSHOT</version>
++                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                        <build>
@@@ -41,7 -41,7 +41,7 @@@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-node-${project.version}</finalName>
+                                                       <finalName>argeo-node-${version.released}${buildId}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/cms-e4-rap.xml</descriptor>
@@@ -75,7 -75,9 +75,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-node</name>
+                                                                       <name>argeo-node${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>
@@@ -182,8 -184,8 +184,8 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node</require>
-                                                                               <require>argeo-osgi-boot</require>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</require>
                                                                                <!-- do not explicitely require java -->
                                                                        </requires>
                                                                </configuration>

diff --combined dist/containers/pom.xml
index fc92e2c6cad4a1b994af72c2ba48f991a4c15f5c,2c7f6bfcc1925ccc0eccab14936a5d795232d713..cc3242537032469469397fbaac2a5aa44afa81f9
--- 1/dist/containers/pom.xml
--- 2/dist/containers/pom.xml
+++ b/dist/containers/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>

diff --combined dist/osgi-boot/pom.xml
index d339ed5d204f3f275cebee79ed8643b04e417186,06970e72bdc3b45320c96b08ca4c6c923ec7f832..239f3688c231866c588d79684a9f817e9c6060af
--- 1/dist/osgi-boot/pom.xml
--- 2/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -23,7 -23,7 +23,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@@ -69,7 -69,9 +69,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-osgi-boot</name>
+                                                                       <name>argeo-osgi-boot${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
@@@ -117,7 -119,7 +119,7 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-osgi-boot-equinox</require>
+                                                                               <require>argeo-osgi-boot-equinox${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@@ -141,7 -143,7 +143,7 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-osgi-boot-equinox</name>
+                                                                       <name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>

diff --combined dist/pom.xml
index f6f87860d48a50da112007a3d740348ffba7462a,388b1bcdcfee376ecb8b23c996a671397fcbc131..52ed45d55b89d15926e692061e0f4c3b5bed1d91
--- 1/dist/pom.xml
--- 2/dist/pom.xml
+++ b/dist/pom.xml
@@@ -1,10 -1,12 +1,12 @@@
  <?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">
+ <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.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>
@@@ -16,4 -18,18 +18,18 @@@
                <module>argeo-node</module>
                <module>containers</module>
        </modules>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <configuration>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../cnf/${version.context}.bnd</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
  </project>

diff --combined org.argeo.api/pom.xml
index d7f018883b5019f43cff7a07fed5b09d610e3969,efd1bed6b278c58f8eb880680f29673b13faec1c..8f3c15c572306754a0eea712d5fd850363516fe3
--- 1/org.argeo.api/pom.xml
--- 2/org.argeo.api/pom.xml
+++ b/org.argeo.api/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.api</artifactId>

diff --combined org.argeo.cms.e4.rap/pom.xml
index f1ec50191646ebafe14ca88b2f7f5acfe36faccb,7f5269876e709b34d6175bad0fd68c50c617e878..81f2fcacc470be9fefedd7a37659f60728a814b8
--- 1/org.argeo.cms.e4.rap/pom.xml
--- 2/org.argeo.cms.e4.rap/pom.xml
+++ b/org.argeo.cms.e4.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4.rap</artifactId>
@@@ -14,18 -14,18 +14,18 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
  

diff --combined org.argeo.cms.e4/pom.xml
index 24a386afee57c6c3ea0270f737aa57f7f54f09ad,ae12564c5613b8dcf7b401373577e9b7c67a436d..fd1842afd33420104cb604d04ffebe49225ab969
--- 1/org.argeo.cms.e4/pom.xml
--- 2/org.argeo.cms.e4/pom.xml
+++ b/org.argeo.cms.e4/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4</artifactId>
@@@ -14,14 -14,14 +14,14 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- UI -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>

diff --combined org.argeo.cms.ui.rap/pom.xml
index 8f5df3373c23b6a8fadc6a5c9b8846a553e54588,b38871cc29d98e6a7fdb6cbfc9a524b825222c8e..37fdd9a174206488bdd9b6c06f5c2ef2d0e207d4
--- 1/org.argeo.cms.ui.rap/pom.xml
--- 2/org.argeo.cms.ui.rap/pom.xml
+++ b/org.argeo.cms.ui.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.rap</artifactId>
@@@ -14,13 -14,13 +14,13 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
  
@@@ -28,7 -28,7 +28,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- UI -->

diff --combined org.argeo.cms.ui.theme/pom.xml
index e11b0655a63a512500ef07e6429bc6140791640a,be47b820a561b67cdf53fd640e241f12751a1e87..b30460a81a0f79b01dfd8f6fd789366d33c68035
--- 1/org.argeo.cms.ui.theme/pom.xml
--- 2/org.argeo.cms.ui.theme/pom.xml
+++ b/org.argeo.cms.ui.theme/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.theme</artifactId>

diff --combined org.argeo.cms.ui/pom.xml
index af0ea3e2fb0ecf110741881ae1924918d2682583,60eb6203f9465022a5d629881c95213c1d08033f..186bb1e5b3c6b9e56f7742d1a65c449a44035068
--- 1/org.argeo.cms.ui/pom.xml
--- 2/org.argeo.cms.ui/pom.xml
+++ b/org.argeo.cms.ui/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui</artifactId>
@@@ -14,13 -14,13 +14,13 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
  
@@@ -28,7 -28,7 +28,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- UI -->

diff --combined org.argeo.cms/pom.xml
index 351ed53918f1965bdd821c031f2d1d60caaf7e8d,e19f92e01ea955b1e6bd3643cff5a18294e4553d..45aaa917ef8dbed92845eddd1386abfd486e8638
--- 1/org.argeo.cms/pom.xml
--- 2/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms</artifactId>
@@@ -14,27 -14,27 +14,27 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --combined org.argeo.core/pom.xml
index c5a35ccb7fc8998688d88f94ecf1b8872600b8ab,37d89574d4b423eaf9e0d19c5bd0343b7c71910b..b1dfe92c6d6072eac280f73fe11404fd8fef7e0b
--- 1/org.argeo.core/pom.xml
--- 2/org.argeo.core/pom.xml
+++ b/org.argeo.core/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.core</artifactId>
@@@ -13,12 -13,12 +13,12 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --combined org.argeo.eclipse.ui.rap/pom.xml
index b3c1b75bf94020bc67b4262fc4fe9aac7d713915,8b728c16cf41f800efe3e0627b7d8cf28c4cf8b6..e56d4395bfea8e9cdfa0214624e4cc1f645bc1d6
--- 1/org.argeo.eclipse.ui.rap/pom.xml
--- 2/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -13,7 -13,7 +13,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- UI -->

diff --combined org.argeo.eclipse.ui/pom.xml
index 34639d81053aba62f81e1809e5e7d79ce643e392,1574da881d436790acc910e4442a348608df7f90..e3069dd374f7f6ac6618d4144f859f69d3175dd4
--- 1/org.argeo.eclipse.ui/pom.xml
--- 2/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -18,7 -18,7 +18,7 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- UI -->

diff --combined org.argeo.enterprise/pom.xml
index 18701b219556e345cb719123da5cfad172bd2147,7a3677206db0ad3e8c9f612e5bb8775c79c1a45b..fef408449f533085cf6cf13de394f9cebb6070b4
--- 1/org.argeo.enterprise/pom.xml
--- 2/org.argeo.enterprise/pom.xml
+++ b/org.argeo.enterprise/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.enterprise</artifactId>

diff --combined org.argeo.jcr/pom.xml
index ae4e0bc043268d20772d3cef78d9f9b1c105b9be,d8d74920faef20520cf946e05c4b22e09d6fef5e..99becb52ea352f39bd3134682c200b4a96e67c6a
--- 1/org.argeo.jcr/pom.xml
--- 2/org.argeo.jcr/pom.xml
+++ b/org.argeo.jcr/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.jcr</artifactId>

diff --combined org.argeo.maintenance/pom.xml
index 4078554430df83dae8d8ed4f2ae7d673a87ea514,b33e47dfc2fedc45202a68cdaef0923deb091a2f..b061f87cdaed55e12f343bc068a5d4dfd810f285
--- 1/org.argeo.maintenance/pom.xml
--- 2/org.argeo.maintenance/pom.xml
+++ b/org.argeo.maintenance/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.maintenance</artifactId>
@@@ -14,22 -14,22 +14,22 @@@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
  </project>

diff --combined org.argeo.osgi.boot/pom.xml
index 1c870e88c70ea3d02d8296d6924d3e033041e86d,33a858d3a3bdfde40cd15d3a1ce961b56e5d6804..1bf95002e90ca582be34b0c0bf1c6fde34353e89
--- 1/org.argeo.osgi.boot/pom.xml
--- 2/org.argeo.osgi.boot/pom.xml
+++ b/org.argeo.osgi.boot/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>

diff --combined pom.xml
index 96886f01b4ed2173d60ae8954c6c42a0170ae03e,cea1b52dff62062d2afbe8aaa79d3259584d0572..c39b9127073967253c0f1d46156cf4e1a354e29d
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -4,18 -4,17 +4,17 @@@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.4-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.104-SNAPSHOT</version>
 -      <version>2.3-SNAPSHOT</version>
++      <version>2.1-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
 -              <version.context>unstable</version.context>
++              <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <!-- RPM -->
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
@@@ -41,12 -40,11 +40,12 @@@
                <module>dep</module>
                <module>demo</module>
                <module>dist</module>
++              <module>sdk</module>
        </modules>
        <scm>
                <connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
                <url>http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git</developerConnection>
-               <tag>v2.x</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@@ -120,12 -118,12 +119,12 @@@
        <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>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <repositories>
@@@ -141,6 -139,18 +140,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>
                <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
@@@ -226,7 -236,7 +237,7 @@@
                        <repositories>
                                <repository>
                                        <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
+                                       <url>http://localhost:7080/data/java/argeo-2.3</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
@@@ -237,7 -247,7 +248,7 @@@
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+                                       <url>dav:http://localhost:7080/data/java/argeo-2.3/</url>
                                        <uniqueVersion>false</uniqueVersion>
                                </repository>
                        </distributionManagement>