Author: cziegeler
Date: Wed Nov 22 07:21:58 2017
New Revision: 1816005
URL: http://svn.apache.org/viewvc?rev=1816005&view=rev
Log:
Use latest R7 API snapshots directly
Modified:
felix/trunk/http/whiteboard/pom.xml
felix/trunk/osgi-r7/http/base/pom.xml
felix/trunk/osgi-r7/http/jetty/pom.xml
Modified: felix/trunk/http/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=1816005&r1=1816004&r2=1816005&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Wed Nov 22 07:21:58 2017
@@ -83,9 +83,15 @@
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -110,4 +116,11 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>osgi-snapshots</id>
+ <name>OSGi Snapshot Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ </repository>
+ </repositories>
</project>
Modified: felix/trunk/osgi-r7/http/base/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/osgi-r7/http/base/pom.xml?rev=1816005&r1=1816004&r2=1816005&view=diff
==============================================================================
--- felix/trunk/osgi-r7/http/base/pom.xml (original)
+++ felix/trunk/osgi-r7/http/base/pom.xml Wed Nov 22 07:21:58 2017
@@ -51,9 +51,15 @@
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -87,4 +93,12 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>osgi-snapshots</id>
+ <name>OSGi Snapshot Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ </repository>
+ </repositories>
</project>
Modified: felix/trunk/osgi-r7/http/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/osgi-r7/http/jetty/pom.xml?rev=1816005&r1=1816004&r2=1816005&view=diff
==============================================================================
--- felix/trunk/osgi-r7/http/jetty/pom.xml (original)
+++ felix/trunk/osgi-r7/http/jetty/pom.xml Wed Nov 22 07:21:58 2017
@@ -64,7 +64,6 @@
org.osgi.service.http.runtime,
org.osgi.service.http.runtime.dto,
org.osgi.service.http.whiteboard,
- org.apache.felix.http.api,
org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}},
org.apache.felix.http.jetty
</Export-Package>
@@ -87,7 +86,6 @@
org.osgi.service.log;resolution:=optional;version="[1.3,2)",
org.osgi.service.metatype;resolution:=optional;version="[1.1,2)",
org.osgi.service.useradmin;resolution:=optional,
- org.apache.felix.http.api;version="[2.0,2.1)",
org.osgi.service.http;version="[1.2.1,1.3)",
org.osgi.service.http.context;version="[1.1,1.2)",
org.osgi.service.http.runtime;version="[1.1,1.2)",
@@ -191,9 +189,16 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -219,4 +224,11 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>osgi-snapshots</id>
+ <name>OSGi Snapshot Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ </repository>
+ </repositories>
</project>
