From: Robert Varga <rovarga@cisco.com>
Date: Thu, 13 Nov 2014 22:12:38 +0000 (+0100)
Subject: Remove unneeded embedded dependency
X-Git-Tag: release/lithium~867^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b0ab6a3cbc68fbd859151507622c651f823714a5;hp=-c

Remove unneeded embedded dependency

yangtools:util already embeds the dependency with a different version,
causing a potential clash. Since sal-dom-broker is not a direct user,
this will work just fine.

Change-Id: If92555d6feb15c6ee9495fb789244750a48e9129
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

b0ab6a3cbc68fbd859151507622c651f823714a5
diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 264709f687..60581f99cb 100644
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -10,10 +10,6 @@
   <packaging>bundle</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>com.github.romix</groupId>
-      <artifactId>java-concurrent-hash-trie-map</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -103,7 +99,6 @@
                             org.opendaylight.yangtools.yang.util,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.impl.rev131028.*</Private-Package>
             <Import-Package>*</Import-Package>
-            <Embed-Dependency>java-concurrent-hash-trie-map;inline=true</Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>