Author: rickhall
Date: Thu Oct 1 08:55:33 2009
New Revision: 820576
URL: http://svn.apache.org/viewvc?rev=820576&view=rev
Log:
Change OSGi API dependencies to be on the official JAR files. Added core
dependencies where needed.
Modified:
felix/trunk/http/api/pom.xml
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/pom.xml
felix/trunk/http/proxy/pom.xml
felix/trunk/http/samples/bridge/pom.xml
felix/trunk/http/samples/filter/pom.xml
felix/trunk/http/samples/whiteboard/pom.xml
felix/trunk/http/whiteboard/pom.xml
Modified: felix/trunk/http/api/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Thu Oct 1 08:55:33 2009
@@ -53,7 +53,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/base/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/base/pom.xml (original)
+++ felix/trunk/http/base/pom.xml Thu Oct 1 08:55:33 2009
@@ -56,7 +56,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/bridge/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Thu Oct 1 08:55:33 2009
@@ -65,7 +65,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Thu Oct 1 08:55:33 2009
@@ -70,7 +70,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Thu Oct 1 08:55:33 2009
@@ -65,7 +65,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/pom.xml (original)
+++ felix/trunk/http/pom.xml Thu Oct 1 08:55:33 2009
@@ -114,25 +114,14 @@
<version>2.5</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: felix/trunk/http/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/proxy/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/proxy/pom.xml (original)
+++ felix/trunk/http/proxy/pom.xml Thu Oct 1 08:55:33 2009
@@ -56,7 +56,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/samples/bridge/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/pom.xml (original)
+++ felix/trunk/http/samples/bridge/pom.xml Thu Oct 1 08:55:33 2009
@@ -106,7 +106,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: felix/trunk/http/samples/filter/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/filter/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/samples/filter/pom.xml (original)
+++ felix/trunk/http/samples/filter/pom.xml Thu Oct 1 08:55:33 2009
@@ -72,7 +72,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/samples/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/whiteboard/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/samples/whiteboard/pom.xml (original)
+++ felix/trunk/http/samples/whiteboard/pom.xml Thu Oct 1 08:55:33 2009
@@ -72,7 +72,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/http/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=820576&r1=820575&r2=820576&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Thu Oct 1 08:55:33 2009
@@ -64,7 +64,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
