Bug 8502 related: Remove duplicated org.osgi.compendium

because you got it twice, once from <groupId>org.osgi (this is the one
we "support" in odlparent), and once from <groupId>org.apache.felix
(that seems to be an outdated old version, and the exclusion of the
annoying org.osgi.foundation which Bug 8502 c/57340 puts into odlparent
does not kick in for it).

Change-Id: I5c762e9a935e2fc8c8b675a95044f0812e7ccbf1
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/bundles/authentication/pom.xml b/bundles/authentication/pom.xml
index 806e3c3415d2ec84fcf06901b653f3ecfb9f48f2..79afdaf74edace33b0cf62d40c85935bbf0e82cc 100644 (file)
--- a/bundles/authentication/pom.xml
+++ b/bundles/authentication/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index fa3f41530ffec069dba5c7290f8c87512f056e41..fb35b955e12d10150316506b4e6e270180a5525e 100644 (file)
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/general/pom.xml b/bundles/general/pom.xml
index 09f005e27f10e7db843c72b70737c8e50bd7adff..fb205b78e962dda5a485969e0ca27197e5b354b5 100644 (file)
--- a/bundles/general/pom.xml
+++ b/bundles/general/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/layout/pom.xml b/bundles/layout/pom.xml
index 91fd48dcaf0e9301446d9a509d8966836ba140eb..9460de162bd497fe915a34d2331869baa32eb038 100644 (file)
--- a/bundles/layout/pom.xml
+++ b/bundles/layout/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/login/pom.xml b/bundles/login/pom.xml
index edbe167aa546d2a1b105aee2f44398d48238144c..983c62e5062f006cf2087e9f80e7bc65a6334aee 100644 (file)
--- a/bundles/login/pom.xml
+++ b/bundles/login/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/navigation/pom.xml b/bundles/navigation/pom.xml
index 092a52dab6502ef8c1161b69fa0e04527457f950..e7a3b1ac6c97085cdc2bd36f6a42d495af9171c5 100644 (file)
--- a/bundles/navigation/pom.xml
+++ b/bundles/navigation/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/node/pom.xml b/bundles/node/pom.xml
index 1fa8c5143c7d6405c8717a14968b6b0effee7eb2..e8411cf1c9f585dbcf74c5e2bffabd3ac428392b 100644 (file)
--- a/bundles/node/pom.xml
+++ b/bundles/node/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/sigmatopology/pom.xml b/bundles/sigmatopology/pom.xml
index 1797b0a1c57a245744b95c6b919e3f142b45f6cd..61f3ea117123d277369fe6747a0cb249363fefd6 100644 (file)
--- a/bundles/sigmatopology/pom.xml
+++ b/bundles/sigmatopology/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/topbar/pom.xml b/bundles/topbar/pom.xml
index 1576db88ff83cc5b14a53febf5911ee80412570b..eefd92d3c6c467a3e17f7b23caea641d68971b79 100644 (file)
--- a/bundles/topbar/pom.xml
+++ b/bundles/topbar/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/topology/pom.xml b/bundles/topology/pom.xml
index be0625e420d959dfa5b0e66b1782618344e370c2..19a21e58fee7f5d2b73f329c35135121d10d605b 100644 (file)
--- a/bundles/topology/pom.xml
+++ b/bundles/topology/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/yangman/pom.xml b/bundles/yangman/pom.xml
index 8a8a91e97ee629f20206bd6433ac89e8252c89d9..237f3efbd79823ba1a8d652c38d30908ec93749e 100644 (file)
--- a/bundles/yangman/pom.xml
+++ b/bundles/yangman/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/yangui/pom.xml b/bundles/yangui/pom.xml
index 30ec4f9f20b00e3c9e09ee0ac4528e9fc60c3e6c..7c0a7238241e444019dfac3a7bb90d547a16a803 100644 (file)
--- a/bundles/yangui/pom.xml
+++ b/bundles/yangui/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/yangutils/pom.xml b/bundles/yangutils/pom.xml
index b53338f1a8c5e6de8e3354011cbd3c9406b5cdfc..2f6953eb22d357bff76eab928575d55d3536ca87 100644 (file)
--- a/bundles/yangutils/pom.xml
+++ b/bundles/yangutils/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/bundles/yangvisualizer/pom.xml b/bundles/yangvisualizer/pom.xml
index a5b7d4d64ded9e0912d09538bd754731e392fc8f..6a5cc42ed4e28330d35cfed4b23adf604c3eb038 100644 (file)
--- a/bundles/yangvisualizer/pom.xml
+++ b/bundles/yangvisualizer/pom.xml
@@ -19,11 +19,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/pom.xml b/pom.xml
index 3455b2f3c1275056a8674ba0bfc4910a822c9dfb..49ccea8a4c04c32082ca573e5bccbcfb4ecbf9b4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
     <feature.dlux.version>0.6.0-SNAPSHOT</feature.dlux.version>
     <feature.flow.version>1.6.0-SNAPSHOT</feature.flow.version>
     <feature.yangtools.version>1.2.0-SNAPSHOT</feature.yangtools.version>
-    <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
     <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
     <karaf.empty.version>1.9.0-SNAPSHOT</karaf.empty.version>
   </properties>