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: I79a3adac4dd8d21757f8c7756b0239413ee55589
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml
index 5be5814eae7c38404e03ccec624b114742e7c14d..b202e540532a93e4675f3feaa5e7d82809c16567 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -76,10 +76,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-persister-feature-adapter</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-persister-feature-adapter</artifactId>
     </dependency>

-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>

     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/features/config-persister/src/main/features/features.xml b/features/config-persister/src/main/features/features.xml
index 57eda21f15257e63a4e22a0fd202679d5c422b4a..9a2fb9dd5b485c4b797c660e3dc62903dea62c0d 100644 (file)
--- a/features/config-persister/src/main/features/features.xml
+++ b/features/config-persister/src/main/features/features.xml
@@ -22,7 +22,6 @@
     <bundle>mvn:org.opendaylight.controller/config-persister-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.controller/config-persister-feature-adapter/{{VERSION}}</bundle>
 
     <bundle>mvn:org.opendaylight.controller/config-persister-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.controller/config-persister-feature-adapter/{{VERSION}}</bundle>
 

-    <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>

     <bundle>mvn:commons-io/commons-io/{{VERSION}}</bundle>
     <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
     <bundle>wrap:mvn:javax.validation/validation-api/{{VERSION}}</bundle>
     <bundle>mvn:commons-io/commons-io/{{VERSION}}</bundle>
     <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
     <bundle>wrap:mvn:javax.validation/validation-api/{{VERSION}}</bundle>