From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 19:49:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-commons-2.1.101~6
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=097c2213991d3b550ac176a979c0ce0484e2889b;hp=56500b7990ddf90011764620c66c5e5e799f5a88

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

Conflicts:
	pom.xml
---

diff --git a/pom.xml b/pom.xml
index 229b84deb..fe207bafe 100644
--- 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>