Change OSGi API dependencies to be on the official JAR files. Added core
dependencies where needed.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/http@820576 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/api/pom.xml b/api/pom.xml
index 4b35f48..cd53c16 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -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>
diff --git a/base/pom.xml b/base/pom.xml
index 16580c6..9899f6e 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -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>
diff --git a/bridge/pom.xml b/bridge/pom.xml
index 073eb3b..a657334 100644
--- a/bridge/pom.xml
+++ b/bridge/pom.xml
@@ -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>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index a9948d5..c20773e 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -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>
diff --git a/jetty/pom.xml b/jetty/pom.xml
index 96c4c50..e252259 100644
--- a/jetty/pom.xml
+++ b/jetty/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 523e730..f950530 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index be7eb0c..c6ed995 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -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>
diff --git a/samples/bridge/pom.xml b/samples/bridge/pom.xml
index 4b7b905..c101aef 100644
--- a/samples/bridge/pom.xml
+++ b/samples/bridge/pom.xml
@@ -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>
diff --git a/samples/filter/pom.xml b/samples/filter/pom.xml
index 5fd9b7d..f75004e 100644
--- a/samples/filter/pom.xml
+++ b/samples/filter/pom.xml
@@ -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>
diff --git a/samples/whiteboard/pom.xml b/samples/whiteboard/pom.xml
index e301b8c..c384a7e 100644
--- a/samples/whiteboard/pom.xml
+++ b/samples/whiteboard/pom.xml
@@ -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>
diff --git a/whiteboard/pom.xml b/whiteboard/pom.xml
index 27ea929..292f0a9 100644
--- a/whiteboard/pom.xml
+++ b/whiteboard/pom.xml
@@ -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>
