From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 20:04:32 +0000 (+0100)
Subject: Merge master into v2.x, without modifying versions in Maven pom files.
X-Git-Tag: argeo-suite-2.1.19~9
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=f26f31d47c3a11e90870e46d88b29705fe5b6998

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

f26f31d47c3a11e90870e46d88b29705fe5b6998
diff --cc pom.xml
index 2a2d5f5,9843790..f85bda5
--- a/pom.xml
+++ b/pom.xml
@@@ -174,6 -186,11 +174,11 @@@
  		</plugins>
  	</reporting>
  	<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>
  		<site>
  			<id>staging</id>
  			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>