X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.suite.dep.ui.rap%2Fpom.xml;h=b4a6e6121a39f1b4468c644bb2245862512c389e;hb=9dad741609777467f58a508e07139be9a086919b;hp=d94c60991219b26ab27c8a011f8bdc7369c10f96;hpb=f5e1274ffd21323c6a6a2e5a47d8ff1da068ddf3;p=gpl%2Fargeo-suite.git

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index d94c609..b4a6e61 100644
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -1,34 +1,46 @@
 <?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>
 		<artifactId>dep</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
 	<name>Suite Platform UI RAP</name>
 	<packaging>jar</packaging>
 	<dependencies>
-		<!-- Entity Framework -->
+		<!-- Base CMS distribution -->
 		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.entity.api</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<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.suite</groupId>
-			<artifactId>org.argeo.entity.core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<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.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
+			<artifactId>org.argeo.app.api</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.entity.core</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.entity.ui</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Argeo Suite Icons -->
 		<dependency>
@@ -40,89 +52,69 @@
 		<!-- Argeo Suite -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.app.core</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.app.ui</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.theme.default</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.app.theme.default</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.ui.rap</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.app.ui.rap</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo People -->
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.people.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.people.ui</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Argeo Library -->
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.library.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.library.ui</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Argeo Environment -->
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.geo.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.geo.ui</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Argeo Publishing -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.publishing.ui</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.app.servlet.publish</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Knowledge -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.support.xforms</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.support.xforms</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.support.odk</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.support.geonames</artifactId>
-			<version>2.3.1-SNAPSHOT</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>
-		</dependency>
+			<artifactId>org.argeo.app.servlet.odk</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.support.geonames</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- PDFBox -->
 		<dependency>
@@ -138,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>
@@ -189,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>
@@ -248,7 +181,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-suite-ui-rap-unstable</name>
+									<name>argeo-suite-ui-rap${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -267,8 +200,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-ui-rap</require>
-										<require>argeo-suite-ui-rap-tp-unstable</require>
+										<require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+										<require>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -309,9 +242,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-suite-ui-rap-tp-unstable</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>
@@ -329,6 +262,9 @@
 											</sources>
 										</mapping>
 									</mappings>
+									<requires>
+										<require>argeo-cms-ext-tp${argeo.rpm.suffix}</require>
+									</requires>
 								</configuration>
 							</execution>
 						</executions>