X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=base%2Fdep%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=00522d96f75370672689b1adac0bd1538369c9f4;hb=f5087dfeb08ce6af4a41216ab166d0bbd97af7e5;hp=2c316b91682593bc19dd13d10a7cf8fd2197072f;hpb=287dc934b53502c1bc59167c2deaa6fe2575ce1b;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 2c316b916..00522d96f 100644
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -4,13 +4,14 @@
 	<parent>
 		<groupId>org.argeo.commons.base</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 	<name>Commons Eclipse RAP Dependencies</name>
 	<properties>
-		<version.rap>2.1.0-R-20130611-2139</version.rap>
+		<version.rap>2.2.0-R-20131204-0942</version.rap>
+		<version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
 	</properties>
 	<build>
 		<plugins>
@@ -21,10 +22,17 @@
 		</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.addons</groupId>
+			<artifactId>binaries</artifactId>
+			<version>${version.rap.addons}</version>
+			<type>pom</type>
+		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.tp.rap.platform</groupId>
@@ -32,53 +40,53 @@
 			<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> -->
+				<!-- <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>
@@ -112,10 +120,10 @@
 
 		<!-- 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>
@@ -138,11 +146,11 @@
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
 
-				<dependency>
-					<groupId>org.argeo.commons.base</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>2.1.2</version>
-				</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.8-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -153,6 +161,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rap.addons</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.rap.addons}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.argeo.tp.rap.platform</groupId>
 				<artifactId>binaries</artifactId>