X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=base%2Fdep%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=500fb92e19b8a465ae1118d24f1dd364067bd963;hb=3a398c06f6e5cd446bacc8d28fbf34788a60c71f;hp=7aa742e2315e73492ab0bed6f81d0f69c16b98e0;hpb=d4cff055c9f882be5a0c58134de0aba9f2239e4b;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 7aa742e23..500fb92e1 100644
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -4,14 +4,11 @@
 	<parent>
 		<groupId>org.argeo.commons.base</groupId>
 		<artifactId>dep</artifactId>
-		<version>1.1.7</version>
+		<version>2.1.11-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>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -21,58 +18,115 @@
 		</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>
+			<groupId>org.argeo.tp.rap.addons</groupId>
+			<artifactId>binaries</artifactId>
+			<version>${version.rap.addons}</version>
+			<type>pom</type>
+			<exclusions>
+				<exclusion>
+					<!-- TODO remove OSGi runtime from addons -->
+					<groupId>org.argeo.tp.rap.addons</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</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.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>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.equinox.http.jetty</artifactId>
+					<artifactId>org.eclipse.rap.demo</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.mortbay.jetty.server</artifactId>
+					<artifactId>org.eclipse.rap.demo.databinding</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.mortbay.jetty.util</artifactId>
+					<artifactId>org.eclipse.rap.design.example</artifactId>
 				</exclusion>
 
-				<!-- Demo -->
+				<!-- Troublesome bundles -->
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.demo</artifactId>
+					<artifactId>org.eclipse.jdt.junit.runtime</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.demo.databinding</artifactId>
+					<artifactId>org.eclipse.rap.junit.runtime</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.design.example</artifactId>
+					<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>
@@ -95,25 +149,14 @@
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
 
+		<!-- 2014-07-31 mbaudier : Removed, since it feels wrong to put an Argeo 
+			dependency here -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons.base</groupId> -->
+		<!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
+		<!-- <version>2.1.8-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.argeo.tp.rap</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.rap.platform</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>