From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 20:10:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.19~7
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3;hp=-c

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

Conflicts:
	pom.xml
---

6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3
diff --combined pom.xml
index f85bda5,7626c1c..6b82c1e
--- a/pom.xml
+++ b/pom.xml
@@@ -1,4 -1,6 +1,6 @@@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.maven</groupId>
@@@ -7,17 -9,17 +9,17 @@@
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite</artifactId>
- 	<packaging>pom</packaging>
- 	<name>Argeo Suite</name>
- 	<description />
 -	<version>2.3.1-SNAPSHOT</version>
 +	<version>2.1.19-SNAPSHOT</version>
+ 	<name>Argeo Suite</name>
+ 	<packaging>pom</packaging>
+ 	<url>http://www.argeo.org/</url>
  	<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 -40,7 +40,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 -107,18 +107,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>
@@@ -176,7 -190,7 +178,7 @@@
  	<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>