X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.e4.rap%2Fpom.xml;h=62c49cac82ac6751d569873971c5462bb2a30578;hb=refs%2Ftags%2Fargeo-commons-2.3.5;hp=7b7a6393f9ad0b73fd28a0e4bf8fe52ffeddb492;hpb=f0ebe8a96cd5e8c987b2af3f724c3a0561a219fe;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 7b7a6393f..62c49cac8 100644
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.75-SNAPSHOT</version>
+		<version>2.3.5</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -14,42 +14,76 @@
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.node</artifactId>
-			<version>2.1.75-SNAPSHOT</version>
+			<artifactId>org.argeo.dep.cms.ui.rap</artifactId>
+			<version>2.3.5</version>
 			<type>pom</type>
 		</dependency>
+
+		<!-- E4 Specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms.e4</artifactId>
-			<version>2.1.75-SNAPSHOT</version>
+			<version>2.3.5</version>
 		</dependency>
+		
+		<!-- RAP specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.cms.e4.rap</artifactId>
-			<version>2.1.75-SNAPSHOT</version>
+			<version>2.3.5</version>
 		</dependency>
 
+		<!-- SVG and CSS -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.xmlgraphics.commons</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.w3c.dom.svg</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.batik.i18n</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.batik.util</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.batik.css</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.jsoup</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.w3c.css.sac</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>com.steadystate.css</artifactId> -->
+		<!-- </dependency> -->
+
 		<!-- Misc Third Parties -->
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.parser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcmail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcpg</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant.launch</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcmail</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcpg</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
+		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz</artifactId> -->
@@ -58,35 +92,23 @@
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.mail</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.javax</groupId> -->
+		<!-- <artifactId>javax.mail</artifactId> -->
+		<!-- </dependency> -->
 
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aspects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context.support</artifactId>
-		</dependency>
+		<!-- Nebula -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.tx</artifactId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.nebula.widgets.richtext</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web</artifactId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.nebula.widgets.grid</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.nebula.jface.gridviewer</artifactId>
 		</dependency>
 
 		<!-- Eclipse Core -->
@@ -108,16 +130,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>com.ibm.icu.base</artifactId>
+			<artifactId>com.ibm.icu</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.core.contenttype</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.rwt.osgi</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.jface.databinding</artifactId>
@@ -139,25 +157,6 @@
 			<artifactId>org.eclipse.help</artifactId>
 		</dependency>
 
-		<!-- RAP Workbench -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.forms</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.views</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.workbench</artifactId> -->
-		<!-- </dependency> -->
-
-
 		<!-- Dependencies required / provided by Eclipse 4 -->
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
@@ -242,10 +241,6 @@
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.e4.ui.services</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.fileupload</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.e4.core.di.extensions</artifactId>
@@ -255,19 +250,17 @@
 			<artifactId>org.eclipse.e4.ui.workbench</artifactId>
 		</dependency>
 
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp</groupId> -->
-		<!-- <artifactId>argeo-tp-rap-e4</artifactId> -->
-		<!-- <version>${version.argeo-tp}</version> -->
-		<!-- <scope>provided</scope> -->
-		<!-- </dependency> -->
-
 		<!-- SDK -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 	<dependencyManagement>
@@ -277,29 +270,6 @@
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.commons</includeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<executions>
@@ -328,7 +298,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-e4-rap</name>
+									<name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -345,17 +315,10 @@
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <directoryIncluded>false</directoryIncluded> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>argeo-cms-e4-rap-tp</require>
+										<require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+										<require>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -368,28 +331,6 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-tp</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
-					<!-- <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<executions>
@@ -418,8 +359,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-e4-rap-tp</name>
+									<name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
+									<release>${argeo.rpm.release.tp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -438,7 +380,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -448,5 +390,4 @@
 			</build>
 		</profile>
 	</profiles>
-
 </project>
\ No newline at end of file