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/parent/pom.xml b/http/parent/pom.xml
index bacb215..248b6b3 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -39,6 +39,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jetty.version>7.6.13.v20130916</jetty.version>
+ <cometd.version>2.7.0</cometd.version>
+ <http.service.version>1.2.0</http.service.version>
+ <servlet.version>2.5</servlet.version>
+
+ <http.api.version>2.0.4</http.api.version>
</properties>
<scm>
@@ -104,19 +110,19 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>