From d8810eea2500f90921b7e5ebf1c5aa35db724924 Mon Sep 17 00:00:00 2001
From: Dongie Agnir <dongie@amazon.com>
Date: Mon, 11 Jun 2018 17:41:54 -0700
Subject: [PATCH] Add bundle relocation fixes

 - Relocate Netty
 - Correctly include and relocate Ion
---
 bundle/pom.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index 2ac8d3c6e985..9c1e99ab1baa 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -72,7 +72,7 @@
                             <include>org.reactivestreams:*</include>
                             <include>org.slf4j:*</include>
                             <include>commons-codec:commons-codec</include>
-                            <include>software.amazon.awssdk.ion:ion-java</include>
+                            <include>software.amazon.ion:ion-java</include>
                             <include>software.amazon.awssdk:*</include>
                             <include>commons-logging:*</include>
                         </includes>
@@ -80,23 +80,31 @@
                     <relocations>
                         <relocation>
                             <pattern>com.fasterxml.jackson</pattern>
-                            <shadedPattern>software.amazon.awssdk.thirdparty.jackson</shadedPattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.com.fasterxml.jackson</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>org.apache.http</pattern>
-                            <shadedPattern>software.amazon.awssdk.thirdparty.apache.http</shadedPattern>
+                            <pattern>org.apache</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.org.apache</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>org.apache.commons.codec</pattern>
-                            <shadedPattern>software.amazon.awssdk.thirdparty.apache.codec</shadedPattern>
+                            <pattern>software.amazon.ion</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>software.amazon.awssdk.ion</pattern>
-                            <shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
+                            <pattern>io.netty</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.io.netty</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.typesafe</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.com.typesafe</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.reactivestreams</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.org.reactivestreams</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>org.apache.commons.logging</pattern>
-                            <shadedPattern>software.amazon.awssdk.thirdparty.apache.logging</shadedPattern>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>software.amazon.awssdk.thirdparty.org.slf4j</shadedPattern>
                         </relocation>
                     </relocations>
                     <shadedArtifactAttached>false</shadedArtifactAttached>