<parent>
<groupId>org.argeo.commons.base</groupId>
<artifactId>dep</artifactId>
- <version>2.1.5-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>2.1.0-R-20130611-2139</version.rap>
- </properties>
<build>
<plugins>
<plugin>
</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.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>
<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> -->
+ <!-- <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>
<!-- 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>
<artifactId>org.eclipse.equinox.security</artifactId>
</dependency>
- <dependency>
- <groupId>org.argeo.commons.base</groupId>
- <artifactId>org.argeo.osgi.boot</artifactId>
- <version>2.1.5-SNAPSHOT</version>
- </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.rap}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<profiles>
<profile>
<id>check-osgi</id>