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/base/pom.xml b/http/base/pom.xml
index eb38d42..8a5115e 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix Http Base</name>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.2.2-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -74,9 +73,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>2.2.0</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>