Switch to odl-guava feature

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

diff --git a/features/odl-triemap/pom.xml b/features/odl-triemap/pom.xml
index a5c0bf738a6760ec773a48aec16baabb6c9c9ab4..c9734cccb128bcffa56e4316217dca84f503b810 100644 (file)
--- a/features/odl-triemap/pom.xml
+++ b/features/odl-triemap/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava-23</artifactId>
+            <artifactId>odl-guava</artifactId>
             <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/odl-triemap/src/main/feature/feature.xml b/features/odl-triemap/src/main/feature/feature.xml
index 0414b3439b3a05af4baff042af4a6877895c5220..baac20f01e38965a490a1c8837394d25d477a70a 100644 (file)
--- a/features/odl-triemap/src/main/feature/feature.xml
+++ b/features/odl-triemap/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-triemap">
     <feature name="odl-triemap">
-        <feature version="[3.1.0,4)">odl-guava-23</feature>
+        <feature version="[4,5)">odl-guava</feature>
     </feature>
 </features>