FELIX-5022 : org.apache.felix.http.bundle-3.0.0.jar contains classes in org.eclipse.jetty.util package from two different versions
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1700725 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 911db76..e06cb53 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.cometd</artifactId>
- <version>2.3.2</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index dbf1e47..b717fdf 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.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
@@ -37,6 +37,10 @@
<url>http://svn.apache.org/viewvc/felix/trunk/http/cometd/</url>
</scm>
+ <properties>
+ <felix.java.version>7</felix.java.version>
+ </properties>
+
<build>
<plugins>
<plugin>