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/cometd/pom.xml b/http/cometd/pom.xml
index 1f4534d..77b2548 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix Http Cometd</name>
<artifactId>org.apache.felix.http.cometd</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.2.2-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
@@ -49,9 +49,9 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.http.cometd;version=${project.version},
- org.cometd.bayeux;version=2.4.2,
- org.cometd.bayeux.client;version=2.4.2,
- org.cometd.client;version=2.4.2
+ org.cometd.bayeux;version=${cometd.version},
+ org.cometd.bayeux.client;version=${cometd.version},
+ org.cometd.client;version=${cometd.version}
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -87,27 +87,27 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.3.v20120416</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-server</artifactId>
- <version>2.4.2</version>
+ <version>${cometd.version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-client</artifactId>
- <version>2.4.2</version>
+ <version>${cometd.version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-common</artifactId>
- <version>2.4.2</version>
+ <version>${cometd.version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>bayeux-api</artifactId>
- <version>2.4.2</version>
+ <version>${cometd.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>