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/08/06 00:36:30 UTC
svn commit: r1694339 - in /felix/trunk/http: api/pom.xml
api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
api/src/main/java/org/apache/felix/http/api/package-info.java
api/src/main/java/org/osgi/ parent/pom.xml
Author: cziegeler
Date: Wed Aug 5 22:36:30 2015
New Revision: 1694339
URL: http://svn.apache.org/r1694339
Log:
Move to official R6 releases
Removed:
felix/trunk/http/api/src/main/java/org/osgi/
Modified:
felix/trunk/http/api/pom.xml
felix/trunk/http/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
felix/trunk/http/api/src/main/java/org/apache/felix/http/api/package-info.java
felix/trunk/http/parent/pom.xml
Modified: felix/trunk/http/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1694339&r1=1694338&r2=1694339&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Wed Aug 5 22:36:30 2015
@@ -81,26 +81,14 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <!-- Explicitely use 5.0.0 to export version 1.2.1 of the http service api -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
</dependencies>
Modified: felix/trunk/http/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java?rev=1694339&r1=1694338&r2=1694339&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java (original)
+++ felix/trunk/http/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java Wed Aug 5 22:36:30 2015
@@ -22,11 +22,10 @@ import javax.servlet.Filter;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
-import aQute.bnd.annotation.ProviderType;
-
/**
* The {@link ExtHttpService} allows other bundles in the OSGi environment to dynamically
* register resources, {@link Filter}s and {@link Servlet}s into the URI namespace of a
Modified: felix/trunk/http/api/src/main/java/org/apache/felix/http/api/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/apache/felix/http/api/package-info.java?rev=1694339&r1=1694338&r2=1694339&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/apache/felix/http/api/package-info.java (original)
+++ felix/trunk/http/api/src/main/java/org/apache/felix/http/api/package-info.java Wed Aug 5 22:36:30 2015
@@ -20,5 +20,5 @@
@Version("2.0.6")
package org.apache.felix.http.api;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: felix/trunk/http/parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/parent/pom.xml?rev=1694339&r1=1694338&r2=1694339&view=diff
==============================================================================
--- felix/trunk/http/parent/pom.xml (original)
+++ felix/trunk/http/parent/pom.xml Wed Aug 5 22:36:30 2015
@@ -95,10 +95,8 @@
<dependencies>
<dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>1.50.0</version>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
</dependency>
</dependencies>
@@ -112,16 +110,22 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>