Clean up odl-aaa-web

This needs Guava, so use odl-guava-23.

Change-Id: I666b0aff22329a6e77998c7e280146f71a2a734f
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index d6bf50c8316e095d14d4f314a2158eecb25f7e79..71ab0d74b375c9f173958113049842709e7dbf57 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -26,6 +26,13 @@
     <name>ODL :: aaa :: ${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-guava-23</artifactId>
+            <version>3.0.2</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->

diff --git a/features/odl-aaa-web/src/main/feature/feature.xml b/features/odl-aaa-web/src/main/feature/feature.xml
index a910c5ec1e4967ae6e5d3834fc22f75371350afc..0f12ab4c4761858b1904e9ea42b7ace9e1454ff9 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -2,5 +2,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
         <feature version="[3.0.0,4)">odl-karaf-feat-jetty</feature>
+        <feature version="[3.0.0,4)">odl-guava-23</feature>
     </feature>
 </features>