Adapt to Argeo TP v2.1.20

diff --git a/org.argeo.slc.client.rap/pom.xml b/org.argeo.slc.client.rap/pom.xml
index 2432fadb02de91bfd5dc8026894fb85a5d3f121d..c04a27e97d2c91fa66e9b60b97672a9768446bb4 100644 (file)
--- a/org.argeo.slc.client.rap/pom.xml
+++ b/org.argeo.slc.client.rap/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -23,5 +24,15 @@
                        <artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/org.argeo.slc.client.ui.dist/pom.xml b/org.argeo.slc.client.ui.dist/pom.xml
index d1b34035adab46b31c6d90b81f3072628e7ee041..b6cecc405d28dacb2c2c90a1a1d966c0b36ed3a6 100644 (file)
--- a/org.argeo.slc.client.ui.dist/pom.xml
+++ b/org.argeo.slc.client.ui.dist/pom.xml
@@ -47,6 +47,15 @@
                        <artifactId>org.argeo.util</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
                
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui/pom.xml b/org.argeo.slc.client.ui/pom.xml
index 253b37aa0f52f1c0ba95c5890baf91b237ae8b25..ebf81526e8e67febee115fdb359417a0550bf9fb 100644 (file)
--- a/org.argeo.slc.client.ui/pom.xml
+++ b/org.argeo.slc.client.ui/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -34,5 +35,15 @@
                        <artifactId>org.argeo.cms.ui.workbench</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 5830fa18d9d272eb86355aefe2bf5ba2f2d27b91..0e7c4eab85d786a435fdc344eb9e9dd9e02f7fbf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<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.commons</groupId>
@@ -11,13 +12,14 @@
        <name>Argeo SLC</name>
        <version>2.1.11-SNAPSHOT</version>
        <properties>
-               <developmentCycle.slc>2.1</developmentCycle.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-<!--           <version.argeo-rcp>2.1.15</version.argeo-rcp> -->
                <version.slc>2.1.11-SNAPSHOT</version.slc>
-               <version.equinox>3.11.1.v20160708-1632</version.equinox>
+               <developmentCycle.slc>2.1</developmentCycle.slc>
+
+               <version.argeo-rcp>2.1.17-SNAPSHOT</version.argeo-rcp>
+               <version.equinox>3.12.50.v20170928-1321</version.equinox>
                <!-- Embedded Maven -->
-               <version.maven>3.2.5</version.maven>
+               <!-- <version.maven>3.2.5</version.maven> -->
        </properties>
        <modules>
                <!-- Runtime -->
@@ -25,7 +27,7 @@
                <module>org.argeo.slc.core</module>
                <module>org.argeo.slc.unit</module>
                <module>org.argeo.slc.support</module>
-<!--           <module>org.argeo.slc.support.maven</module> -->
+               <!-- <module>org.argeo.slc.support.maven</module> -->
                <module>org.argeo.slc.repo</module>
                <module>org.argeo.slc.factory</module>
                <module>org.argeo.slc.launcher</module>
@@ -42,6 +44,7 @@
 
                <module>lib</module>
                <module>dep</module>
+               <module>ide</module>
                <module>dist</module>
                <module>demo</module>
        </modules>