From 6e60688371b91fc7ddc127fd1da22f9d68c7ef25 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 7 May 2019 14:34:24 +0200
Subject: [PATCH] Exclude byte-buddy from features

While shade-plugin installs a dependency-reduced pom.xml, maven
does not see that but rather the original, hence we need to
explicitly exclude byte-buddy so as not to leak it.

JIRA: MDSAL-444
Change-Id: I58e6a22b94cc46ebfff7c9fe63ffaf135971da71
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/odl-mdsal-binding-runtime/pom.xml | 12 ++++++++++++
 features/odl-mdsal-trace/pom.xml           |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/features/odl-mdsal-binding-runtime/pom.xml b/features/odl-mdsal-binding-runtime/pom.xml
index 5704393286..66923765ce 100644
--- a/features/odl-mdsal-binding-runtime/pom.xml
+++ b/features/odl-mdsal-binding-runtime/pom.xml
@@ -57,6 +57,18 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
+            <exclusions>
+                <exclusion>
+                    <!-- This dependency is shaded, but the build reactor
+                         still sees it, hence we need to explicitly exclude it -->
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-codec-osgi</artifactId>
diff --git a/features/odl-mdsal-trace/pom.xml b/features/odl-mdsal-trace/pom.xml
index 1525fe7139..82e63b1159 100644
--- a/features/odl-mdsal-trace/pom.xml
+++ b/features/odl-mdsal-trace/pom.xml
@@ -28,6 +28,15 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-trace-impl</artifactId>
+             <exclusions>
+                 <exclusion>
+                    <!-- This dependency is shaded in mdsal-binding-dom-codec, but
+                         the build reactor still sees it, hence we need to explicitly
+					     exclude it -->
+                     <groupId>net.bytebuddy</groupId>
+                     <artifactId>byte-buddy</artifactId>
+                 </exclusion>
+             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-- 
2.36.6