From: Robert Varga <rovarga@cisco.com>
Date: Wed, 11 Jan 2017 14:46:37 +0000 (+0100)
Subject: Revert "BUG-7446: pull in guava-21"
X-Git-Tag: release/carbon~111
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8f337f5327e7c1334af5eb45d7901141fa302cfe;p=yangtools.git

Revert "BUG-7446: pull in guava-21"

This reverts commit 75b18eff1ab6fcd22c47b837798653668bd797db.

Change-Id: I29a007f8874b480ecc55b1b4605e28f2f86b9fb9
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 9d1b9415fc..b5eb54d76c 100644
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -25,7 +25,6 @@
 
     <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>