From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Sep 2021 09:51:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.23~3
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0346615633181e04be0bdac3dfb13e26cce0976f

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

0346615633181e04be0bdac3dfb13e26cce0976f
diff --cc dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 57e5b2b,f525362..119d7a0
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dep</artifactId>
- 		<version>2.1.16-SNAPSHOT</version>
 -		<version>2.3.2-SNAPSHOT</version>
++		<version>2.1.23-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
diff --cc pom.xml
index a772f14,2290b0b..7c1ba6d
--- a/pom.xml
+++ b/pom.xml
@@@ -15,10 -17,11 +17,11 @@@
  		<!-- 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.1.104-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-commons>2.1.103</version.argeo-commons>
+ 		<!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
  		<version.argeo-suite-icons>2.1.1</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>