Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-suite.git] / dep / org.argeo.suite.dep.e4.rcp / pom.xml

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 77dffe6a01f1b428e5b3741ab37d3097931d884c..17b9ae3c78e9bd10c173abd3ce975ee197fd9a83 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -6,71 +6,27 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
        <name>Suite E4 Platform RCP</name>
        <packaging>jar</packaging>
        <dependencies>
-               <!-- Default Assembly for supported minimal set of Argeo Suite Features -->
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.suite.cms</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.suite.e4</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.suite</groupId> -->
-               <!-- <artifactId>org.argeo.suite.e4.rap</artifactId> -->
-               <!-- <version>0.1.13-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-
-               <!-- Base Argeo platform distribution -->
-               <dependency>
-                       <groupId>org.argeo.connect</groupId>
-                       <artifactId>org.argeo.connect.dep.node</artifactId>
-                       <version>${version.argeo-connect}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Base CMS distribution -->
-               <dependency>
-                       <groupId>org.argeo.connect</groupId>
-                       <artifactId>org.argeo.theme.argeo2</artifactId>
-                       <version>${version.argeo-connect}</version>
-               </dependency>
-
-               <!-- UIs -->
-               <dependency>
-                       <groupId>org.argeo.connect</groupId>
-                       <artifactId>org.argeo.connect.ui</artifactId>
-                       <version>${version.argeo-connect}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.connect</groupId>
-                       <artifactId>org.argeo.connect.e4</artifactId>
-                       <version>${version.argeo-connect}</version>
-               </dependency>
-
                <!-- 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>
 
-               <!-- Argeo TP Extras -->
                <dependency>
-                       <groupId>org.argeo.tp.payment</groupId>
-                       <artifactId>com.stripe</artifactId>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ext</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
                </dependency>
-
        </dependencies>
        <profiles>
                <profile>
@@ -126,7 +82,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-e4-rcp</name>
+                                                                       <name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>