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

[lgpl/argeo-commons.git] / base / dep / org.argeo.eclipse.dep.rap / pom.xml

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 3a36fcd0f3df9f5441375151421c36e16f9935d7..660505001d4bc62eb3cc8e866a136fe773b7d306 100644 (file)
--- 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.9-SNAPSHOT</version>
+               <version>2.1.9-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,35 +18,78 @@
                </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.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>
@@ -64,7 +104,7 @@
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.design.example</artifactId>
                                </exclusion>
-                               
+
                                <!-- Troublesome bundles -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
@@ -74,15 +114,19 @@
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.junit.runtime</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <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>
@@ -105,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>