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

Conflicts:
	pom.xml

diff --combined pom.xml
index 229b84deb959d12444178c753adf8fbfaa6401d3,f7abb8415b7fabad38d4264d2d869309b608af73..fe207bafeffce9b223a4f11a7a2dbb9933b37d79
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -8,13 -8,13 +8,13 @@@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
 -      <version>2.3.1-SNAPSHOT</version>
 +      <version>2.1.101-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <!-- RPM -->
 -              <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 +              <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
@@@ -119,17 -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>
-               <snapshotRepository>
-                       <id>staging</id>
-                       <url>file:///srv/javafactory/argeo-2.1</url>
-                       <uniqueVersion>true</uniqueVersion>
-               </snapshotRepository>
                <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>
@@@ -145,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>
@@@ -230,7 -237,7 +225,7 @@@
                        <repositories>
                                <repository>
                                        <id>argeo</id>
 -                                      <url>http://localhost:7080/data/java/argeo-2.3</url>
 +                                      <url>http://localhost:7080/data/java/argeo-2.1</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
@@@ -241,7 -248,7 +236,7 @@@
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
 -                                      <url>dav:http://localhost:7080/data/java/argeo-2.3/</url>
 +                                      <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
                                        <uniqueVersion>false</uniqueVersion>
                                </repository>
                        </distributionManagement>