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 f5ce7c8d4529074d27f346a7be48bffd794c90fe..de76f4886a86f27fc53961897c51f392c60a597a 100644 (file)
--- 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 8ee80f59b6ee5669ccb65206196e1a1fde66a90b..e056ce21a5d685615b0b2a49641af555ef6c9f72 100644 (file)
--- 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>