Use jdbc/war features

Now that we have proxies to depend on for bringing in core
karaf features, use them to not pull in org.osgi.enterprise.

Change-Id: I18d9135a40ab670668826094162c0041184a4298
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/authn/odl-aaa-authn-mdsal-cluster/pom.xml b/features/authn/odl-aaa-authn-mdsal-cluster/pom.xml
index eea478e4812bbb666660152ef6408f8d530d63bf..07a87da615b5879e4837d26e3e64b09f66f067ae 100644 (file)
--- a/features/authn/odl-aaa-authn-mdsal-cluster/pom.xml
+++ b/features/authn/odl-aaa-authn-mdsal-cluster/pom.xml
@@ -216,9 +216,12 @@
         </dependency>
 
         <!-- REST -->
-        <!-- TODO
-            <feature>war</feature>
-        -->
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-karaf-feat-war</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-servlet</artifactId>
@@ -262,4 +265,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/authn/odl-aaa-authn/pom.xml b/features/authn/odl-aaa-authn/pom.xml
index 8835acee83f5647a9781a9119aecd2309adbc4d2..cf1b9e57e6c4e2ca1815201440554b5b73ac923e 100644 (file)
--- a/features/authn/odl-aaa-authn/pom.xml
+++ b/features/authn/odl-aaa-authn/pom.xml
@@ -83,10 +83,12 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- REST -->
-        <!-- TODO
-            <feature>war</feature>
-        -->
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-karaf-feat-war</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-servlet</artifactId>
@@ -174,9 +176,10 @@
 
         <!--H2 Store -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
-            <version>5.0.0</version>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-karaf-feat-jdbc</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -266,4 +269,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>