From b951b92cd7a4b4c5ebc42b09e497924c191557b7 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Mon, 6 Feb 2017 11:24:52 +0100
Subject: [PATCH] Ignore ow2.asm, it's provided

Change-Id: I815efb3e6e274a908f683bf0b5bd0ce7a7d5904b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 features/odl-akka-clustering-2.4/pom.xml  | 7 +++++++
 features4/odl-akka-clustering-2.4/pom.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/features/odl-akka-clustering-2.4/pom.xml b/features/odl-akka-clustering-2.4/pom.xml
index 4df2ca018..03ba67b18 100644
--- a/features/odl-akka-clustering-2.4/pom.xml
+++ b/features/odl-akka-clustering-2.4/pom.xml
@@ -71,6 +71,13 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-distributed-data-experimental_${scala.version}</artifactId>
+            <exclusions>
+                <!-- ow2.asm is provided -->
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/features4/odl-akka-clustering-2.4/pom.xml b/features4/odl-akka-clustering-2.4/pom.xml
index 8ec4c8cd2..eed50a52e 100644
--- a/features4/odl-akka-clustering-2.4/pom.xml
+++ b/features4/odl-akka-clustering-2.4/pom.xml
@@ -71,6 +71,13 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-distributed-data-experimental_${scala.version}</artifactId>
+            <exclusions>
+                <!-- ow2.asm is provided -->
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
-- 
2.36.6