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

diff --cc demo/pom.xml
index 40855213e94199d519099747b8f628bed81de88d,97a5dcef78b81af6ba326a4ccc65499e57f9081b..1716fa8533e13459a295c7fda3c418c323bd2071
--- 1/demo/pom.xml
--- 2/demo/pom.xml
+++ b/demo/pom.xml
@@@ -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>

diff --cc dep/org.argeo.dep.cms.ext/pom.xml
index 0000000000000000000000000000000000000000,f657231f454b4f668e753be05aa6a69f7ee07d57..19b5b4875b3e1b65ae32f5c0bc894f4341d6ea36
mode 000000,100644..100644
--- /dev/null
--- 2/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@@ -1,0 -1,146 +1,146 @@@
 -              <version>2.1.104-SNAPSHOT</version>
+ <?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.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 --cc dep/pom.xml
Simple merge

diff --cc dist/argeo-node/pom.xml
index b0f9aa2686846540a03245b4e978abbf2e620c31,452e8379c63a014ed2d7513a48473a056ba554b9..f37d15d1db018d9050d251f59ca8eee1cd09112c
--- 1/dist/argeo-node/pom.xml
--- 2/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@@ -26,13 -26,8 +26,8 @@@
                                <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>