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

Conflicts:
	pom.xml

diff --git a/pom.xml b/pom.xml
index 229b84deb959d12444178c753adf8fbfaa6401d3..fe207bafeffce9b223a4f11a7a2dbb9933b37d79 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -122,11 +122,6 @@
                        <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.1/site/argeo-commons/</url>