FELIX-4310, FELIX-4282 - mixed Jetty versions:
- the cometd project referenced an older version of Jetty (7.6.3),
which is not directly incorrect, but not inline with the other
projects;
- due to this, classes of two different Jetty versions were inlined
in the http.bundle project, causing subtle errors at runtime;
- upgraded Cometd to 2.7.0 as Cometd 2.4.2 uses Jetty 7.6.3 as
compile-time dependency, while the 2.7.0 uses Jetty 7.6.13;
- reverted changes for Jetty 9 to make use of latest Jetty 7.6.13
version (for fix-release);
- updated POMs to use version-properties for most of the used
libraries. Also downgraded the version numbers in preparation for
a fix-release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1540479 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 735868e..e474cf8 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix Http Jetty</name>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.2.2-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
@@ -38,7 +38,7 @@
</scm>
<properties>
- <jetty.version>9.0.5.v20130815</jetty.version>
+ <!-- jetty.version is moved to http-parent POM -->
</properties>
<build>
@@ -52,9 +52,9 @@
org.apache.felix.http.jetty.internal.JettyActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.http.api;version=2.0.4,
- org.osgi.service.http,
- javax.servlet.*;version=2.5;-split-package:=merge-first
+ org.apache.felix.http.api;version=${http.api.version},
+ org.osgi.service.http;version=${http.service.version},
+ javax.servlet.*;version=${servlet.version};-split-package:=merge-first
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -81,13 +81,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -127,12 +125,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>2.2.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>