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

[gpl/argeo-suite.git] / dep / org.argeo.suite.dep.ui.rap / pom.xml

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index 84d06e72cfd924b20219bbc415a219dbe4ae8474..1740dd37e4d899519064093c13d26b121da3920f 100644 (file)
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -4,28 +4,42 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.20</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
        <name>Suite Platform UI RAP</name>
        <packaging>jar</packaging>
        <dependencies>
+               <!-- Base CMS distribution -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ext</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+
                <!-- Entity Framework -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite Icons -->
@@ -39,87 +53,67 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.theme.default</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo People -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.people.ui</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Library -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.documents.ui</artifactId>
-                       <version>2.1.20</version>
+                       <artifactId>org.argeo.library.ui</artifactId>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Environment -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.geo.ui</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Publishing -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.publishing.ui</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Knowledge -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.1.20</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.1.20</version>
-               </dependency>
-
-               <!-- 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>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- PDFBox -->
@@ -136,40 +130,6 @@
                        <artifactId>org.apache.pdfbox.jempbox</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>
-
                <!-- POI (MS office documents) -->
                <dependency>
                        <groupId>org.argeo.tp.apache</groupId>
@@ -187,31 +147,6 @@
                        <groupId>org.argeo.tp.apache</groupId>
                        <artifactId>org.apache.poi.scratchpad</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>
-
-               <!-- Base CMS distribution -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Argeo TP Extras -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.payment</groupId> -->
-               <!-- <artifactId>com.stripe</artifactId> -->
-               <!-- </dependency> -->
-
        </dependencies>
        <profiles>
                <profile>
@@ -246,7 +181,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap</name>
+                                                                       <name>argeo-suite-ui-rap${argeo.rpm.suffix}</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -265,8 +200,8 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-ui-rap</require>
-                                                                               <require>argeo-suite-ui-rap-tp</require>
+                                                                               <require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -307,9 +242,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap-tp</name>
+                                                                       <name>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <version>${version.argeo-tp}</version>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -327,6 +262,9 @@
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-ext-tp${argeo.rpm.suffix}</require>
+                                                                       </requires>
                                                                </configuration>
                                                        </execution>
                                                </executions>