Modify framework, main, shell, shell.tui, and obr to depend on official OSGi JAR files (FELIX-1617)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@820449 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index cf8b91b..a88d62c 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -46,11 +46,16 @@
<version>2.2.2</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.1.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/framework/pom.xml b/framework/pom.xml
index edfdcfa..11f84b5 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -30,14 +30,14 @@
<version>2.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
diff --git a/main/pom.xml b/main/pom.xml
index 73fef8c..481c74c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -35,11 +35,11 @@
<version>2.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
@@ -50,11 +50,11 @@
<version>1.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
@@ -88,6 +88,14 @@
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.service.obr</artifactId>
</exclusion>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index 4d568bb..113d003 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -31,9 +31,9 @@
<artifactId>org.apache.felix.shell.tui</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/shell/pom.xml b/shell/pom.xml
index 47bdd3a..875b9fa 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -30,14 +30,14 @@
<version>1.5.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
<build>