[maven-release-plugin] prepare for next development iteration

[lgpl/argeo-commons.git] / eclipse / runtime / org.argeo.eclipse.ui.rap / pom.xml

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
index a0009ca93d74058ac2ac83eab71f1668c1dacb43..a99da8b8ac5c99c7f2823c3d0d04a0c7c432ccfb 100644 (file)
--- 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">
+<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>0.3.5-SNAPSHOT</version>
                <artifactId>runtime</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -27,15 +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.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,
@@ -46,12 +52,33 @@
                        </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.eclipse</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
+                       <version>0.3.5-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Argeo common distribution for RAP projects -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+                       <version>0.3.5-SNAPSHOT</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.dep.rap</groupId>
+                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
+               </dependency>
+
+               <!-- Logging -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
        </dependencies>
 </project>