X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.rap%2Fpom.xml;h=f4f219e8e0263f6b4856ca9da5604ecdd0911c59;hb=4ae93488abaa2617f7a0eb46d05e37914e80068d;hp=3f47275f0a1bddf856abd26043738750606759e7;hpb=1df1bf64759d35d3d72b9d96b26b71118fdbe031;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 3f47275f0..ff01e15f0 100644
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -1,78 +1,54 @@
-<?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">
+<?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</groupId>
-		<version>2.1.12-SNAPSHOT</version>
+		<version>2.1.85</version>
 		<artifactId>argeo-commons</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 	<name>Commons Eclipse UI RAP</name>
-	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-
-				<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>
-						<!-- 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.apache.commons.io,
-							org.argeo,
-							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,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
-		org.eclipse.jface.dialogs, -->
 	<dependencies>
-			<dependency>
+		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>2.1.85</version>
 		</dependency>
-	
-		<!-- Argeo common distribution for RAP projects -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<artifactId>org.argeo.util</artifactId>
+			<version>2.1.85</version>
 		</dependency>
 
-		<!-- Logging -->
+		<!-- UI -->
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.rwt</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.core.commands</artifactId>
+			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.jface</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- File upload -->
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.filedialog</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.fileupload</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file