FELIX-4452 - removed transitive dependencies:
- the cometd bundle introduced some transitive dependencies that caused
the all-in-bundle to not resolve; applied patch from David B;
- fixed a typo in the export clause of the Felix HTTP-API in the all-in-
one bundle.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1575941 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 6f07745..bb39c8d 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -56,9 +56,9 @@
org.cometd.bayeux;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.client;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.server;version=${cometd.version};-split-package:=merge-first,
- org.apache.felix.http.api;version${http.api.version};-split-package:=merge-first,
+ org.apache.felix.http.api;version=${http.api.version};-split-package:=merge-first,
org.apache.felix.http.cometd;version=${project.version};-split-package:=merge-first,
- org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}}
+ org.eclipse.jetty.*;version=${version;===;${jetty.version}};-split-package:=merge-first
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*;-split-package:=merge-first,
diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index a292cab..f3bf4bf 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -105,11 +105,35 @@
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-server</artifactId>
<version>${cometd.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-client</artifactId>
<version>${cometd.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
@@ -126,6 +150,36 @@
<artifactId>org.apache.felix.http.base</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ <!-- The dependencies below are newer versions of the transitive
+ Jetty dependencies pulled in by cometd. It should be able to
+ remove these once the cometd dependencies on Jetty line up
+ with the ones that the Felix Http Service project uses. -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ </dependencies>
</project>