Add odl-guava dependency

odl-yangtools-util is pulling in guava, is should depend on
odl-guava to get it.

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

diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index 26ef1ace548ca18d205c0cb0fc7dacc69208da71..4d9acf92c53d54763cb062dceb658a5b61579f68 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -42,6 +42,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-guava</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..3b22cac
--- /dev/null
+++ b/features/odl-yangtools-util/src/main/feature/feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-util">
+    <feature name="odl-yangtools-util">
+        <feature version="[5,6)">odl-guava</feature>
+        <feature version="[1,2)">pt-triemap</feature>
+    </feature>
+</features>