Do not wrap Guava as a bundle in features' definition

As it will refresh the bundle when the feature is loaded,
because it will certainly be already installed,and hence
will refresh all bundles depending on Guava.

Also, this is not necessary.

This patch is not directly tied to BUG-6956 but it's a result of it

Change-Id: If2fff1c6326fb8b53786d59e94c364cf0f3292c3
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit 622a8cf869f13ad75777e39612c9a26374132e3b)

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 396eefc6d61124cbebe6b2d3fa6e2c2deedd4dcb..39ea939aaebe4e306fa82a6ee7b95a2b190df47d 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -306,11 +306,6 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
       </dependency>
-
-      <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-      </dependency>
   </dependencies>
 
   <!--

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index b2d8ba1a25859e5fd2014f6a7b2b299a64b9ed43..6352b5cdd2f787ad83835739e78374286b525ad2 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -57,7 +57,6 @@
 
     <feature name='odl-bgpcep-bgp-dependencies' version='${project.version}'>
         <!--  concepts -->
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index a4b14c91f55e9e837aa11e077dbc27f03fff5228..14f046ed47928094d314509df7c80c2f0cdb921f 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -119,11 +119,6 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
       </dependency>
-
-      <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-      </dependency>
   </dependencies>
 
   <!--

diff --git a/features/extras/src/main/features/features.xml b/features/extras/src/main/features/features.xml
index b302e854968cfb5b019d7ac1adedd5c97429e188..d2c487613140fcadde081c5e34d89ffb9b4804c0 100644 (file)
--- a/features/extras/src/main/features/features.xml
+++ b/features/extras/src/main/features/features.xml
@@ -19,7 +19,6 @@
 
     <feature name='odl-bgpcep-dependencies' version='${project.version}'>
         <!--  concepts -->
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
index f182fd2a9bb1cfd0b3c62dca730d373df401843d..86b6e3839f667408ab232adb5a1b262e04b91afa 100644 (file)
--- a/features/pcep/pom.xml
+++ b/features/pcep/pom.xml
@@ -239,11 +239,6 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
       </dependency>
-
-      <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-      </dependency>
   </dependencies>
 
   <!--

diff --git a/features/pcep/src/main/features/features.xml b/features/pcep/src/main/features/features.xml
index 9fe4e1ed1d9fd0ef00eb14b9b96bd58ddf9271f4..a0ab7bb4869e852663e8ea49957af09afc1e25c9 100644 (file)
--- a/features/pcep/src/main/features/features.xml
+++ b/features/pcep/src/main/features/features.xml
@@ -37,7 +37,6 @@
 
     <feature name='odl-bgpcep-pcep-dependencies' version='${project.version}'>
         <!--  concepts -->
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->

diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml
index 0aa6eee098f8cd5ee46462e5ebc938c1411fb00e..a78403be45584167d50564af4ea886cfe6955def 100644 (file)
--- a/features/rsvp/pom.xml
+++ b/features/rsvp/pom.xml
@@ -66,10 +66,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>features-mdsal-model</artifactId>

diff --git a/features/rsvp/src/main/features/features.xml b/features/rsvp/src/main/features/features.xml
index b6e32ccd0751b5b33bf869b82151fa6b721f9fea..7cb515ce148695fd6143df43cc1e896bec163c9b 100644 (file)
--- a/features/rsvp/src/main/features/features.xml
+++ b/features/rsvp/src/main/features/features.xml
@@ -23,7 +23,6 @@
 
     <feature name='odl-bgpcep-rsvp-dependencies' version='${project.version}'>
         <!--  concepts -->
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${mdsal.binding.base}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->