Clean out last vestiges of OSGi-meddling

Nothing in AAA has a dependency on dependency manager and metatype
is alreayd provided by framework. Remove all the remaining references,
greatly improving the quality of living for everyone.

Change-Id: I91ad79f65e50f71a9e4bdbf39f4bbddba81553b2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index ce84a7ad0f6630f837097be0ed02309a7cd6fc38..327b4f486dd6bf24d6b2f8d9c311d7e95e68eb50 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -45,16 +45,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- OSGI -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.dependencymanager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.metatype</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-jolokia</artifactId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 7eab6f4a2811b69d6246d608e1f46c21047164a9..e9d43f6776e2bddc4a185723fa9cffba266a535c 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,10 +44,6 @@
         <artifactId>javax.json</artifactId>
         <version>1.0.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.metatype</artifactId>
-      </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-web</artifactId>
@@ -58,16 +54,6 @@
         <artifactId>shiro-core</artifactId>
         <version>1.3.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.dependencymanager</artifactId>
-        <version>4.4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-        <version>4.0.6</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>