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

Conflicts:
	pom.xml

diff --cc pom.xml
index 229b84deb959d12444178c753adf8fbfaa6401d3,f7abb8415b7fabad38d4264d2d869309b608af73..fe207bafeffce9b223a4f11a7a2dbb9933b37d79
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -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>