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;hp=-c

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

f26f31d47c3a11e90870e46d88b29705fe5b6998
diff --combined pom.xml
index 2a2d5f5,9843790..f85bda5
--- a/pom.xml
+++ b/pom.xml
@@@ -10,14 -10,14 +10,14 @@@
  	<packaging>pom</packaging>
  	<name>Argeo Suite</name>
  	<description />
 -	<version>2.3.1-SNAPSHOT</version>
 +	<version>2.1.19-SNAPSHOT</version>
  	<properties>
  		<!-- Dependencies -->
  		<version.argeo-tp>2.1.27</version.argeo-tp>
  		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -		<version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-commons>2.1.100</version.argeo-commons>
  
 -		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 +		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
  		<git.rw />
  	</properties>
  	<modules>
@@@ -38,7 -38,7 +38,7 @@@
  		<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
  		<url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
  		<developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
 -		<tag>HEAD</tag>
 +		<tag>v2.x</tag>
  	</scm>
  	<organization>
  		<name>Argeo GmbH</name>
@@@ -105,6 -105,18 +105,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>
  	</repositories>
  	<reporting>
  		<plugins>
@@@ -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>