X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=base%2Fdep%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=02b22f795fe9d285c3b1973bbead19a94e730450;hb=20c8fafc7b68d2d669cba6e7235cb17a3284cf64;hp=3b494c501fe841f2072a728036fe66c8ce1bd0ce;hpb=1704dc48bb56e7f4d54c52e6f3d30a386fae47d1;p=lgpl%2Fargeo-commons.git

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 3b494c501..02b22f795 100644
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -4,13 +4,13 @@
 	<parent>
 		<groupId>org.argeo.commons.base</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 	<name>Commons Eclipse RAP Dependencies</name>
 	<properties>
-		<version.rap>1.3.2</version.rap>
+		<version.rap>2.1.0-R-20130611-2139</version.rap>
 	</properties>
 	<build>
 		<plugins>
@@ -21,35 +21,64 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp</groupId> -->
+<!-- 			<artifactId>org.eclipse.osgi</artifactId> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.argeo.tp.rap.platform</groupId>
 			<artifactId>binaries</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.rap}</version>
 			<type>pom</type>
 			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>javax.servlet</artifactId>
-				</exclusion>
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>javax.servlet</artifactId> -->
+<!-- 				</exclusion> -->
 
 				<!-- Jetty -->
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.equinox.http.jetty</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.mortbay.jetty.server</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.mortbay.jetty.util</artifactId>
-				</exclusion>
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.mortbay.jetty.server</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.mortbay.jetty.util</artifactId> -->
+<!-- 				</exclusion> -->
+
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.security</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.http</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.server</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.continuation</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.util</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.io</artifactId> -->
+<!-- 				</exclusion> -->
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
+<!-- 					<artifactId>org.eclipse.jetty.servlet</artifactId> -->
+<!-- 				</exclusion> -->
 
 				<!-- Demo -->
 				<exclusion>
@@ -64,7 +93,7 @@
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.rap.design.example</artifactId>
 				</exclusion>
-				
+
 				<!-- Troublesome bundles -->
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
@@ -74,15 +103,19 @@
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.rap.junit.runtime</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.rwt.testfixture</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<!-- Dependency to enable file upload. Should be included directly in coming 
 			rap distribution -->
-		<dependency>
-			<groupId>org.argeo.tp.rap</groupId>
-			<artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.rap</groupId> -->
+<!-- 			<artifactId>org.eclipse.rwt.widgets.upload</artifactId> -->
+<!-- 		</dependency> -->
 		<!-- Needed by the bundle above -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -105,6 +138,11 @@
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
 
+				<dependency>
+					<groupId>org.argeo.commons.base</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>2.1.6-SNAPSHOT</version>
+				</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -118,7 +156,7 @@
 			<dependency>
 				<groupId>org.argeo.tp.rap.platform</groupId>
 				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.rap}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>