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/01/29 14:13:33 UTC
svn commit: r1655646 - in /felix/trunk/http: base/pom.xml bridge/pom.xml
bundle/pom.xml jetty/pom.xml parent/pom.xml
Author: cziegeler
Date: Thu Jan 29 13:13:33 2015
New Revision: 1655646
URL: http://svn.apache.org/r1655646
Log:
FELIX-4060 : Implement HTTP Service Update (RFC-189)
Modified:
felix/trunk/http/base/pom.xml
felix/trunk/http/bridge/pom.xml
felix/trunk/http/bundle/pom.xml
felix/trunk/http/jetty/pom.xml
felix/trunk/http/parent/pom.xml
Modified: felix/trunk/http/base/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/pom.xml?rev=1655646&r1=1655645&r2=1655646&view=diff
==============================================================================
--- felix/trunk/http/base/pom.xml (original)
+++ felix/trunk/http/base/pom.xml Thu Jan 29 13:13:33 2015
@@ -28,7 +28,7 @@
<name>Apache Felix Http Base</name>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>2.4.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
@@ -66,6 +66,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/http/bridge/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=1655646&r1=1655645&r2=1655646&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Thu Jan 29 13:13:33 2015
@@ -49,7 +49,7 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.http.api,
- org.osgi.service.http;version=${http.service.version}
+ org.osgi.service.http
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -84,12 +84,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>[2.0,3)</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>[2.4.0-SNAPSHOT,2.5)</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1655646&r1=1655645&r2=1655646&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Thu Jan 29 13:13:33 2015
@@ -56,7 +56,7 @@
</Bundle-Activator>
<Export-Package>
javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
- org.osgi.service.http;version=${http.service.version};-split-package:=merge-first,
+ org.osgi.service.http;-split-package:=merge-first,
org.cometd.bayeux;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.client;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.server;version=${cometd.version};-split-package:=merge-first,
Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1655646&r1=1655645&r2=1655646&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Thu Jan 29 13:13:33 2015
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/http/parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/parent/pom.xml?rev=1655646&r1=1655645&r2=1655646&view=diff
==============================================================================
--- felix/trunk/http/parent/pom.xml (original)
+++ felix/trunk/http/parent/pom.xml Thu Jan 29 13:13:33 2015
@@ -41,7 +41,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.2.6.v20141205</jetty.version>
<cometd.version>2.8.0</cometd.version>
- <http.service.version>1.2.1</http.service.version>
<servlet.version>3.1.0</servlet.version>
<!--
Java API and class file compliance. This property supports