From 75b18eff1ab6fcd22c47b837798653668bd797db Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Mon, 26 Dec 2016 21:26:30 +0100
Subject: [PATCH] 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>
---
 common/features/src/main/features/features.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index b5eb54d76c..9d1b9415fc 100644
--- 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>
-- 
2.36.6