From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Feb 2021 13:05:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.20~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=bf08be4b1dd28f8d7639db1badf0bbd449b5e388;hp=-c

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

Conflicts:
	lib/pom.xml
	pom.xml
---

bf08be4b1dd28f8d7639db1badf0bbd449b5e388
diff --combined dep/org.argeo.suite.dep.ui.rap/pom.xml
index d6c3dc1,a70a582..34f4abe
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dep</artifactId>
 -		<version>2.3.1-SNAPSHOT</version>
 +		<version>2.1.20-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@@ -15,84 -15,91 +15,91 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.api</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.core</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
+ 		<!-- Argeo Suite Icons -->
+ 		<dependency>
+ 			<groupId>org.argeo.suite.icons</groupId>
+ 			<artifactId>org.argeo.suite.icons.default</artifactId>
+ 			<version>${version.argeo-suite-icons}</version>
+ 		</dependency>
+ 
  		<!-- Argeo Suite -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.core</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.theme.default</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.ui.rap</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo People -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.people.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Library -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.documents.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Environment -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.geo.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Publishing -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.publishing.ui</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Knowledge -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.xforms</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.odk</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.geonames</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Additional Third Parties -->
diff --combined lib/pom.xml
index cf59082,b3a10b9..56048e6
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@@ -10,14 -10,15 +10,15 @@@
  	<packaging>pom</packaging>
  	<name>Parent POM for Argeo Suite Extensions</name>
  	<description />
 -	<version>2.3.1-SNAPSHOT</version>
 +	<version>2.1.20-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.101</version.argeo-commons>
+ 		<version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
  
 -		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
 +		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
  		<git.rw />
  	</properties>
  	<dependencies>
@@@ -29,7 -30,7 +30,7 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
 -			<version>2.3.1-SNAPSHOT</version>
 +			<version>2.1.20-SNAPSHOT</version>
  			<scope>provided</scope>
  			<exclusions>
  				<exclusion>
@@@ -91,6 -92,18 +92,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>
@@@ -159,8 -172,4 +160,8 @@@
  			</plugin>
  		</plugins>
  	</reporting>
 +
 +  <scm>
 +    <tag>v2.x</tag>
 +  </scm>
  </project>
diff --combined pom.xml
index 1944bdd,63e46ff..952753f
--- a/pom.xml
+++ b/pom.xml
@@@ -1,4 -1,6 +1,4 @@@
 -<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,7 -9,7 +7,7 @@@
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite</artifactId>
 -	<version>2.3.1-SNAPSHOT</version>
 +	<version>2.1.20-SNAPSHOT</version>
  	<name>Argeo Suite</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
@@@ -15,9 -17,10 +15,10 @@@
  		<!-- 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.101</version.argeo-commons>
+ 		<version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
  
 -		<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 -41,7 +39,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 -108,18 +106,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 -191,7 +177,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>