From: Alexis de Talhouët <adetalhouet@inocybe.com>
Date: Tue, 18 Oct 2016 21:24:48 +0000 (-0400)
Subject: Bug 6956 - Do not wrap Guava as a bundle in the feature definition
X-Git-Tag: release/carbon~19^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a8b2f8dd16b0cbfb668146a9419b8b8ab2a25684;p=dlux.git

Bug 6956 - Do not wrap Guava as a bundle in the feature definition

As this will cause all features doing the same to have their blueprint
container refreshed.
Also, it is unecessary.

Change-Id: I3440144ed8e67166ba05f8a45050e924be4a0e66
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
---

diff --git a/features/pom.xml b/features/pom.xml
index f5ce7c8d..de76f488 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -30,10 +30,6 @@
          <version>1.8.0-SNAPSHOT</version>
          <type>zip</type>
       </dependency>
-      <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-      </dependency>
       <dependency>
           <groupId>org.opendaylight.dlux</groupId>
           <artifactId>loader</artifactId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 8ee80f59..e056ce21 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -15,7 +15,6 @@
     <feature name='odl-dlux-core' version='${project.version}' description="Opendaylight dlux minimal feature">
         <feature>http</feature>
         <feature version="${restconf.version}">odl-restconf</feature>
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.dlux/loader/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.dlux/loader.implementation/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.dlux/dlux.core/{{VERSION}}</bundle>