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

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

Conflicts:
	pom.xml
---

097c2213991d3b550ac176a979c0ce0484e2889b
diff --cc pom.xml
index 229b84deb,f7abb8415..fe207bafe
--- a/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>