You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/09/02 10:10:42 UTC
svn commit: r1700725 - in /felix/trunk/http: bundle/pom.xml cometd/pom.xml
Author: cziegeler
Date: Wed Sep 2 08:10:41 2015
New Revision: 1700725
URL: http://svn.apache.org/r1700725
Log:
FELIX-5022 : org.apache.felix.http.bundle-3.0.0.jar contains classes in org.eclipse.jetty.util package from two different versions
Modified:
felix/trunk/http/bundle/pom.xml
felix/trunk/http/cometd/pom.xml
Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1700725&r1=1700724&r2=1700725&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Wed Sep 2 08:10:41 2015
@@ -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>
Modified: felix/trunk/http/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1700725&r1=1700724&r2=1700725&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Wed Sep 2 08:10:41 2015
@@ -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>