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;hp=-c

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

0346615633181e04be0bdac3dfb13e26cce0976f
diff --combined 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>
@@@ -15,12 -15,60 +15,60 @@@
  	<dependencies>
  		<!-- Base Argeo platform distribution -->
  		<dependency>
- 			<groupId>org.argeo.slc.rcp</groupId>
+ 			<groupId>org.argeo.commons.rcp</groupId>
  			<artifactId>org.argeo.dep.cms.e4.rcp</artifactId>
- 			<version>${version.argeo-slc}</version>
+ 			<version>${version.argeo-rcp}</version>
  			<type>pom</type>
  		</dependency>
  
+ 		<!-- Jackson JSON processor -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp.jackson</groupId>
+ 			<artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.jackson</groupId>
+ 			<artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.jackson</groupId>
+ 			<artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
+ 		</dependency>
+ 
+ 		<!-- POI requirements -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache.commons</groupId>
+ 			<artifactId>org.apache.commons.math3</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache.commons</groupId>
+ 			<artifactId>org.apache.commons.collections4</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xml.security</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xmlbeans</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xalan</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xalan.serializer</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xml.resolver</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.apache</groupId>
+ 			<artifactId>org.apache.xerces</artifactId>
+ 		</dependency>
+ 
  		<!-- Argeo TP Extras -->
  <!-- 		<dependency> -->
  <!-- 			<groupId>org.argeo.tp.payment</groupId> -->
diff --combined dep/pom.xml
index 8db55f6,d2ad0bb..dade9ed
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@@ -1,10 -1,12 +1,12 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <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.suite</groupId>
  		<artifactId>argeo-suite</artifactId>
 -		<version>2.3.2-SNAPSHOT</version>
 +		<version>2.1.23-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dep</artifactId>
diff --combined pom.xml
index a772f14,2290b0b..7c1ba6d
--- 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,7 -9,7 +9,7 @@@
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite</artifactId>
 -	<version>2.3.2-SNAPSHOT</version>
 +	<version>2.1.23-SNAPSHOT</version>
  	<name>Argeo Suite</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
@@@ -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>
@@@ -106,6 -109,18 +109,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>
@@@ -177,7 -192,7 +180,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>