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: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=bf08be4b1dd28f8d7639db1badf0bbd449b5e388

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

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

bf08be4b1dd28f8d7639db1badf0bbd449b5e388
diff --cc 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
@@@ -25,9 -25,16 +25,16 @@@
  		<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>
diff --cc lib/pom.xml
index cf59082,b3a10b9..56048e6
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@@ -15,9 -15,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</argeo.rpm.stagingRepository>
 +		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
  		<git.rw />
  	</properties>
  	<dependencies>
diff --cc pom.xml
index 1944bdd,63e46ff..952753f
--- a/pom.xml
+++ b/pom.xml
@@@ -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>