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

diff --combined cnf/testing.bnd
index d638826d025887b7d836014c9d59a55019d50f57,0000000000000000000000000000000000000000..0a43c20de19f1e5954bd48898852b45bd55a864f
mode 100644,000000..100644
--- 1/cnf/testing.bnd
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,6 -1,0 +1,8 @@@
- category=org.argeo.commons
 +version.released=2.1.103
++qualifier=.next
++
++category=org.argeo.commons
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=

diff --combined dep/org.argeo.dep.cms.client/pom.xml
index d7354d9ad0020096929130a8ac69851d47a89552,423b9b32cfe55e6d8542de183b4e236d82d9ca06..d1eca2f86ae0aa7ce9fc9f1cf44c1aec81594725
--- 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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
 -                      <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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@@ -273,8 -273,6 +273,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-client${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -337,7 -335,7 +335,7 @@@
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --combined dep/org.argeo.dep.cms.e4.rap/pom.xml
index df05ac93af6fb955cf2528277f71b433bd9ce124,7cdd09255e55f411ae618c0f76344f686d0e5f97..23e185216caedc4a05d4241cdf34624acdaa74cc
--- 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.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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4.rap</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- SVG and CSS -->
@@@ -297,8 -297,6 +297,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <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>
@@@ -361,7 -359,7 +359,7 @@@
                                                                <configuration>
                                                                        <name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --combined dep/org.argeo.dep.cms.ext/pom.xml
index 3749a9f8e839a258818f972ed9d99e47dba7ea7e,af26bb8c79ddeefe0b05e3edcd70cd895b35e8fa..904349332edd716b7d1416014c41ff7a8081b3aa
--- 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
@@@ -1,11 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
- <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>
 -              <version>2.3-SNAPSHOT</version>
 +              <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@@ -114,7 -112,7 +112,7 @@@
                                                                <configuration>
                                                                        <name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --combined dep/org.argeo.dep.cms.node/pom.xml
index 656da2955630600d72a3f1e282a2156b5020d440,f88a1ded9599ea049724550c0776ab85f23810d4..8dc2dd55abdc9b958857058ac5eb991194e6b56e
--- 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.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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- CMS Dependencies -->
@@@ -241,8 -241,6 +241,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@@ -303,9 -301,9 +301,9 @@@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-node-tp</name>
+                                                                       <name>argeo-cms-node-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --combined dep/org.argeo.dep.cms.ui.rap/pom.xml
index b00284f4fc3d26ce034e537f415a6291992f7ff1,bf645715dc5de4903e9ee515460cf44ee47cb82f..93ab967ec5dc603f27476159063ab25fded85b7d
--- 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.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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
 -                      <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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
 -                      <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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- SDK -->
@@@ -121,8 -121,6 +121,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <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>
@@@ -141,8 -139,8 +139,8 @@@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node</require>
-                                                                               <require>argeo-cms-ui-rap-tp</require>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@@ -185,7 -183,7 +183,7 @@@
                                                                <configuration>
                                                                        <name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --combined dep/pom.xml
index 7c3b04cb64cbe3fab3c1815962067ca02f7b77f1,028b83b658340cf9a0ac2a805e2d37f4751cb69d..b83b2886b429a50a57726759c0a61aa36b7e62db
--- 1/dep/pom.xml
--- 2/dep/pom.xml
+++ b/dep/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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.3-SNAPSHOT</version>
 +              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@@ -120,7 -118,7 +118,7 @@@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
 -                                      <version>2.3-SNAPSHOT</version>
 +                                      <version>2.1-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
                        </dependencies>

diff --combined dist/argeo-cli/pom.xml
index 4d2aa70c0d798bd2fb37f6df8edd667a4a3c42e0,73c11bf92e2686048c62f5558b4849a57f58e9bb..d04ba5696ff96ba81eb022ce8137d2f42d655f71
--- 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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@@ -33,7 -33,7 +33,7 @@@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-cli-${project.version}</finalName>
+                                                       <finalName>argeo-cli-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/argeo-cli.xml</descriptor>
@@@ -68,8 -68,6 +68,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <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 10be1edb58373ecb64e7c7abf390031ca9b65d1c,c066a64817056df9d6e62326e0428a07960e2fec..9a6d616b4dfecd59d431f0b34e404807d159a140
--- 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.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.3-SNAPSHOT</version>
 +                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.node</artifactId>
 -                                      <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.3-SNAPSHOT</version>
 +                                      <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>osgi-boot</artifactId>
                                        <type>zip</type>
 -                                      <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-${version.released}${buildId}</finalName>
+                                                       <finalName>argeo-node-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/cms-e4-rap.xml</descriptor>
@@@ -76,8 -76,6 +76,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>

diff --combined dist/osgi-boot/pom.xml
index 239f3688c231866c588d79684a9f817e9c6060af,0217100889513ef12e443788291cc037733a19a4..575b4b4f81709e465ae86987b2801114232ea996
--- 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.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.3-SNAPSHOT</version>
 +                      <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@@ -35,7 -35,7 +35,7 @@@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>osgi-boot-${project.version}</finalName>
+                                                       <finalName>osgi-boot-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/osgi-boot.xml</descriptor>
@@@ -70,8 -70,6 +70,6 @@@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-osgi-boot${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
@@@ -145,7 -143,7 +143,7 @@@
                                                                <configuration>
                                                                        <name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/boot</directory>

diff --combined dist/pom.xml
index 52ed45d55b89d15926e692061e0f4c3b5bed1d91,7e0e208209233f55df39ec2f253fc62e2e39d9e9..f6b9917e090e3f1e61426c1c681ee12f13b91b1a
--- 1/dist/pom.xml
--- 2/dist/pom.xml
+++ b/dist/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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.3-SNAPSHOT</version>
 +              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>
@@@ -14,7 -12,7 +12,7 @@@
        <packaging>pom</packaging>
        <modules>
                <module>osgi-boot</module>
-               <module>argeo-cli</module>
+               <!-- <module>argeo-cli</module> -->
                <module>argeo-node</module>
                <module>containers</module>
        </modules>

diff --combined pom.xml
index c063132e1c5ce6fdf0c780c12e9630ac02cd058d,143a3ea5a449d360d24180871673dae761580401..fb1bedf58c490e66eb7f632c5bcd090146f4d8da
--- 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.4</version>
+               <version>2.1.6</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
 -      <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>
-               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
@@@ -46,6 -45,7 +45,7 @@@
                <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>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@@ -119,12 -119,12 +119,12 @@@
        <distributionManagement>
                <repository>
                        <id>staging</id>
 -                      <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
 +                      <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>
                        <id>staging</id>
 -                      <url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
 +                      <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <repositories>
@@@ -140,6 -140,18 +140,6 @@@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
 -              <repository>
 -                      <id>argeo-unstable</id>
 -                      <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 -                      <releases>
 -                              <enabled>true</enabled>
 -                              <updatePolicy>never</updatePolicy>
 -                              <checksumPolicy>warn</checksumPolicy>
 -                      </releases>
 -                      <snapshots>
 -                              <enabled>false</enabled>
 -                      </snapshots>
 -              </repository>
                <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
@@@ -219,27 -231,4 +219,4 @@@
                        </plugin>
                </plugins>
        </reporting>
-       <profiles>
-               <profile>
-                       <id>localrepo</id>
-                       <repositories>
-                               <repository>
-                                       <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-                       <distributionManagement>
-                               <repository>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
-                                       <uniqueVersion>false</uniqueVersion>
-                               </repository>
-                       </distributionManagement>
-               </profile>
-       </profiles>
  </project>

diff --combined sdk/pom.xml
index 5d0a240fd35086bc2436be5268963f2a7cc3b0a4,54bcb222b201c7fb51a2ab3196ed8e66fa8c1e71..9631f6acd6ad84fee638c96e8d4c11b2f07fe53a
--- 1/sdk/pom.xml
--- 2/sdk/pom.xml
+++ b/sdk/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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.3-SNAPSHOT</version>
 +              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>sdk</artifactId>