From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Nov 2021 09:03:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.104~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=b501b98fb7447a359b9effb12ccd0908851957ba;hp=-c;p=lgpl%2Fargeo-commons.git

Merge remote-tracking branch 'origin/unstable' into testing
---

b501b98fb7447a359b9effb12ccd0908851957ba
diff --combined pom.xml
index fb1bedf58,d6f35ab9c..08dec90e2
--- a/pom.xml
+++ b/pom.xml
@@@ -4,16 -4,16 +4,16 @@@
  	<parent>
  		<groupId>org.argeo.maven</groupId>
  		<artifactId>argeo-osgi-parent</artifactId>
- 		<version>2.1.6</version>
+ 		<version>2.1.7</version>
  	</parent>
  	<groupId>org.argeo.commons</groupId>
  	<artifactId>argeo-commons</artifactId>
 -	<version>2.3-SNAPSHOT</version>
 +	<version>2.1-SNAPSHOT</version>
  	<name>Argeo Commons</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
  	<properties>
 -		<version.context>unstable</version.context>
 +		<version.context>testing</version.context>
  		<version.argeo-tp>2.1.27</version.argeo-tp>
  	</properties>
  	<modules>
@@@ -119,12 -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>
  		<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>
@@@ -140,6 -140,18 +140,6 @@@
  				<enabled>false</enabled>
  			</snapshots>
  		</repository>
 -		<repository>
 -			<id>argeo-unstable</id>
 -			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 -			<releases>
 -				<enabled>true</enabled>
 -				<updatePolicy>never</updatePolicy>
 -				<checksumPolicy>warn</checksumPolicy>
 -			</releases>
 -			<snapshots>
 -				<enabled>false</enabled>
 -			</snapshots>
 -		</repository>
  		<!-- Disable Maven default repository -->
  		<repository>
  			<id>central</id>