From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 4 Feb 2021 15:51:32 +0000 (+0100)
Subject: Merge branch 'master' of https://mbaudier@code.argeo.org/git/gpl/argeo-suite.git
X-Git-Tag: argeo-suite-2.3.0~3
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=752c9319203b089119cadf68b4d58ca9d39a027c;hp=-c

Merge branch 'master' of https://mbaudier@code.argeo.org/git/gpl/argeo-suite.git
---

752c9319203b089119cadf68b4d58ca9d39a027c
diff --combined lib/pom.xml
index c238678,fdb865c..4501d11
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@@ -10,12 -10,12 +10,12 @@@
  	<packaging>pom</packaging>
  	<name>Parent POM for Argeo Suite Extensions</name>
  	<description />
- 	<version>2.1.18-SNAPSHOT</version>
+ 	<version>2.3.0-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.1.100</version.argeo-commons>
 +		<version.argeo-commons>2.3.0</version.argeo-commons>
  
  		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
  		<git.rw />
@@@ -29,7 -29,7 +29,7 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
- 			<version>2.1.18-SNAPSHOT</version>
+ 			<version>2.3.0-SNAPSHOT</version>
  			<scope>provided</scope>
  			<exclusions>
  				<exclusion>
diff --combined pom.xml
index dd86622,22f189c..f4b5266
--- a/pom.xml
+++ b/pom.xml
@@@ -10,12 -10,12 +10,12 @@@
  	<packaging>pom</packaging>
  	<name>Argeo Suite</name>
  	<description />
- 	<version>2.1.18-SNAPSHOT</version>
+ 	<version>2.3.0-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.1.100</version.argeo-commons>
 +		<version.argeo-commons>2.3.0</version.argeo-commons>
  
  		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
  		<git.rw />