Prepare reintroduction of Argeo Suite RCP.

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 57e5b2b77dc9037a7867cce2b80c9ab7e0a4b1cd..f52536231419fad80da93381703134cf37bf644f 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -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>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
@@ -15,12 +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 --git a/dep/pom.xml b/dep/pom.xml
index f963b64ecfb6ec76ef62cba544ea4cf2e3968693..d2ad0bb07d2c06732df84a47abae5281d9a11fb9 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,7 @@
 <?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>

diff --git a/pom.xml b/pom.xml
index 2f9836a24f014d9329145ec77746337d91773b32..2290b0b2a8576eed7c217f06d1b157e859ba5ce5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +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>
@@ -15,7 +17,8 @@
                <!-- 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.103</version.argeo-commons>
+               <version.argeo-commons>2.1.104-SNAPSHOT</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>