Merge master into v2.x, without modifying versions in Maven pom files.

diff --git a/pom.xml b/pom.xml
index 2a2d5f53cf0844a37a5ae1344a523ff7a7d1a44b..f85bda54e08ed482e236b3f23fafadaebe68f84c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,11 @@
                </plugins>
        </reporting>
        <distributionManagement>
+               <repository>
+                       <id>staging</id>
+                       <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.1/site/argeo-suite/</url>