BUG-7446: pull in guava-21

This is a preparatory patch for pulling in guava-21, so both versions
are available at run-time. Once the switch upstream has been flipped
we will drop guava-18.

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

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index b5eb54d76c9ba9466c8a71f3572d661d01c03792..9d1b9415fcf01be6172a97263ffbdbbc813c72c4 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -25,6 +25,7 @@
 
     <feature name='odl-yangtools-common' version='${project.version}' description='OpenDaylight :: Yangtools :: Common'>
         <feature version="[1.7.0, 2.0.0)" dependency="true">odl-guava-18</feature>
+        <feature version="[1.7.0, 2.0.0)" dependency="true">odl-guava-21</feature>
         <feature version="[1.7.0, 2.0.0)" dependency="true">odl-triemap-0.2</feature>
         <bundle>mvn:org.opendaylight.yangtools/concepts/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-common/{{VERSION}}</bundle>