[maven-release-plugin] prepare release argeo-commons-2.1.2

[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 e2f81dcd8266fd82844c080023cb2d25ff229e6e..2c316b91682593bc19dd13d10a7cf8fd2197072f 100644 (file)
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -2,15 +2,15 @@
 <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>
+               <groupId>org.argeo.commons.base</groupId>
                <artifactId>dep</artifactId>
-               <version>1.1.4-SNAPSHOT</version>
+               <version>2.1.2</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>
+               <version.rap>2.1.0-R-20130611-2139</version.rap>
        </properties>
        <build>
                <plugins>
@@ -21,58 +21,101 @@
                </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> -->
+<!--           </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,6 +138,11 @@
                        <artifactId>org.eclipse.equinox.security</artifactId>
                </dependency>
 
+                               <dependency>
+                                       <groupId>org.argeo.commons.base</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>2.1.2</version>
+                               </dependency>
        </dependencies>
        <dependencyManagement>
                <dependencies>
@@ -108,7 +156,7 @@
                        <dependency>
                                <groupId>org.argeo.tp.rap.platform</groupId>
                                <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
+                               <version>${version.rap}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>