X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.rap%2Fpom.xml;h=ea42d0a0baf43a86c1d1c40ab8c970dd758d21f7;hb=6c878278b0f233efe33531824d29b632ea4eef60;hp=a852e57d13a9cb20084ec480ceb7f01f7cc06297;hpb=f93298706f9e5fd657e260ae0f42cebf74d21a34;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
index a852e57d1..ea42d0a0b 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -1,9 +1,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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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.commons.eclipse</groupId>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>1.1.2</version>
 		<artifactId>runtime</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -27,18 +26,22 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
 						<Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.core.runtime</Require-Bundle>
+						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.rwt.widgets.upload,org.eclipse.core.runtime</Require-Bundle>
+						<!-- IMPORTANT : Note that we must exclude certain packages that are 
+							provided by dependencies to be sure that packages used in the current workspace 
+							are those provided by the require-bundles. Especially rwt.widgets.upload 
+							by instance. -->
 						<Import-Package>
-							org.springframework.beans.factory,
-							org.springframework.core.io.support,
 							org.apache.commons.io,
 							org.argeo,
-							org.argeo.eclipse.ui.dialogs,
+							org.springframework.beans.factory,
+							org.springframework.core.io.support,
+							!org.eclipse.rwt.widgets,
 							!org.eclipse.core.runtime,
 							!org.eclipse.core.commands,
 							!org.eclipse.ui.plugin,
@@ -49,17 +52,27 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
+		org.eclipse.jface.dialogs, -->
 	<dependencies>
-		<!-- Argeo Commons for Eclipse (not specific) -->
+			<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+	
+		<!-- Argeo common distribution for RAP projects -->
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<version>1.1.2</version>
 		</dependency>
+
+		<!-- Logging -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.io</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-
 	</dependencies>
-</project>
+</project>
\ No newline at end of file