From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 10 Nov 2021 06:11:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/v2.x'
X-Git-Tag: argeo-commons-2.3.2~29
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=043d226a5504a212eb5673c3ed4441c1167724d7;hp=-c

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

043d226a5504a212eb5673c3ed4441c1167724d7
diff --combined demo/pom.xml
index 40855213e,97a5dcef7..1716fa853
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.commons</groupId>
  		<artifactId>argeo-commons</artifactId>
 -		<version>2.1.104-SNAPSHOT</version>
 +		<version>2.3.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>demo</artifactId>
@@@ -20,7 -20,7 +20,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.osgi.boot</artifactId>
 -			<version>2.1.104-SNAPSHOT</version>
 +			<version>2.3.1-SNAPSHOT</version>
  		</dependency>
  	</dependencies>
  	<profiles>
@@@ -41,8 -41,8 +41,8 @@@
  			<dependencies>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
- 					<artifactId>org.argeo.dep.cms.sdk</artifactId>
+ 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
  			</dependencies>
  		</profile>
@@@ -64,7 -64,7 +64,7 @@@
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
  			</dependencies>
  		</profile>
diff --combined dep/org.argeo.dep.cms.ext/pom.xml
index 000000000,f657231f4..19b5b4875
mode 000000,100644..100644
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@@ -1,0 -1,146 +1,146 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <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.commons</groupId>
 -		<version>2.1.104-SNAPSHOT</version>
++		<version>2.3.1-SNAPSHOT</version>
+ 		<artifactId>dep</artifactId>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.dep.cms.ext</artifactId>
+ 	<name>CMS Optional Third Parties</name>
+ 	<description>Bulky generic third parties which are not required by the CMS, but necessary for upper layers.</description>
+ 	<dependencies>
+ 		<!-- Additional Third Parties -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp.javax</groupId>
+ 			<artifactId>javax.xml.bind</artifactId>
+ 		</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>
+ 
+ 		<!-- Mail -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp.javax</groupId>
+ 			<artifactId>javax.activation</artifactId>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.tp.javax</groupId>
+ 			<artifactId>javax.mail</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>
+ 
+ 	</dependencies>
+ 
+ 	<profiles>
+ 		<profile>
+ 			<id>rpmbuild-tp</id>
+ 			<build>
+ 				<plugins>
+ 					<plugin>
+ 						<artifactId>maven-assembly-plugin</artifactId>
+ 						<executions>
+ 							<execution>
+ 								<id>prepare-source-tp</id>
+ 								<phase>package</phase>
+ 								<goals>
+ 									<goal>single</goal>
+ 								</goals>
+ 								<configuration>
+ 									<descriptorRefs>
+ 										<descriptorRef>a2-source-tp</descriptorRef>
+ 									</descriptorRefs>
+ 								</configuration>
+ 							</execution>
+ 						</executions>
+ 					</plugin>
+ 					<plugin>
+ 						<groupId>org.codehaus.mojo</groupId>
+ 						<artifactId>rpm-maven-plugin</artifactId>
+ 						<executions>
+ 							<execution>
+ 								<id>rpm-tp</id>
+ 								<phase>package</phase>
+ 								<goals>
+ 									<goal>rpm</goal>
+ 								</goals>
+ 								<configuration>
+ 									<name>argeo-cms-ext-tp</name>
+ 									<projversion>${version.argeo-tp}</projversion>
+ 									<release>${maven.build.timestamp}</release>
+ 									<mappings>
+ 										<mapping>
+ 											<directory>/usr/share/osgi</directory>
+ 											<username>root</username>
+ 											<groupname>root</groupname>
+ 											<filemode>644</filemode>
+ 											<directoryIncluded>false</directoryIncluded>
+ 											<sources>
+ 												<source>
+ 													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+ 													<includes>
+ 														<include>**/*.jar</include>
+ 													</includes>
+ 												</source>
+ 											</sources>
+ 										</mapping>
+ 									</mappings>
+ 									<requires>
+ 										<require>argeo-cms-node-tp</require>
+ 									</requires>
+ 								</configuration>
+ 							</execution>
+ 						</executions>
+ 					</plugin>
+ 				</plugins>
+ 			</build>
+ 		</profile>
+ 	</profiles>
+ </project>
diff --combined dep/pom.xml
index 0d0c750ae,3293a560c..37e847f05
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.commons</groupId>
  		<artifactId>argeo-commons</artifactId>
 -		<version>2.1.104-SNAPSHOT</version>
 +		<version>2.3.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dep</artifactId>
@@@ -15,7 -15,7 +15,7 @@@
  		<module>org.argeo.dep.cms.node</module>
  		<module>org.argeo.dep.cms.ui.rap</module>
  		<module>org.argeo.dep.cms.e4.rap</module>
- 		<module>org.argeo.dep.cms.sdk</module>
+ 		<module>org.argeo.dep.cms.ext</module>
  	</modules>
  	<build>
  		<plugins>
@@@ -93,7 -93,7 +93,7 @@@
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.osgi.boot</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  					<scope>test</scope>
  				</dependency>
  			</dependencies>
diff --combined dist/argeo-node/pom.xml
index b0f9aa268,452e8379c..f37d15d1d
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.1.104-SNAPSHOT</version>
 +		<version>2.3.1-SNAPSHOT</version>
  		<artifactId>dist</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -16,28 -16,23 +16,23 @@@
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.client</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.node</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
- 				<dependency>
- 					<groupId>org.argeo.commons</groupId>
- 					<artifactId>org.argeo.dep.cms.sdk</artifactId>
- 					<version>2.3.1-SNAPSHOT</version>
- 				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>osgi-boot</artifactId>
  					<type>zip</type>
 -					<version>2.1.104-SNAPSHOT</version>
 +					<version>2.3.1-SNAPSHOT</version>
  				</dependency>
  			</dependencies>
  			<build>