Skip to content

Commit 899f873

Browse files
committed
Add bundle relocation fixes
- Relocate Netty - Correctly include and relocate Ion
1 parent c175873 commit 899f873

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

bundle/pom.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,39 @@
7272
<include>org.reactivestreams:*</include>
7373
<include>org.slf4j:*</include>
7474
<include>commons-codec:commons-codec</include>
75-
<include>software.amazon.awssdk.ion:ion-java</include>
75+
<include>software.amazon.ion:ion-java</include>
7676
<include>software.amazon.awssdk:*</include>
7777
<include>commons-logging:*</include>
7878
</includes>
7979
</artifactSet>
8080
<relocations>
8181
<relocation>
8282
<pattern>com.fasterxml.jackson</pattern>
83-
<shadedPattern>software.amazon.awssdk.thirdparty.jackson</shadedPattern>
83+
<shadedPattern>software.amazon.awssdk.thirdparty.com.fasterxml.jackson</shadedPattern>
8484
</relocation>
8585
<relocation>
86-
<pattern>org.apache.http</pattern>
87-
<shadedPattern>software.amazon.awssdk.thirdparty.apache.http</shadedPattern>
86+
<pattern>org.apache</pattern>
87+
<shadedPattern>software.amazon.awssdk.thirdparty.org.apache</shadedPattern>
8888
</relocation>
8989
<relocation>
90-
<pattern>org.apache.commons.codec</pattern>
91-
<shadedPattern>software.amazon.awssdk.thirdparty.apache.codec</shadedPattern>
90+
<pattern>software.amazon.ion</pattern>
91+
<shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
9292
</relocation>
9393
<relocation>
94-
<pattern>software.amazon.awssdk.ion</pattern>
95-
<shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
94+
<pattern>io.netty</pattern>
95+
<shadedPattern>software.amazon.awssdk.thirdparty.io.netty</shadedPattern>
96+
</relocation>
97+
<relocation>
98+
<pattern>com.typesafe</pattern>
99+
<shadedPattern>software.amazon.awssdk.thirdparty.com.typesafe</shadedPattern>
100+
</relocation>
101+
<relocation>
102+
<pattern>org.reactivestreams</pattern>
103+
<shadedPattern>software.amazon.awssdk.thirdparty.org.reactivestreams</shadedPattern>
96104
</relocation>
97105
<relocation>
98-
<pattern>org.apache.commons.logging</pattern>
99-
<shadedPattern>software.amazon.awssdk.thirdparty.apache.logging</shadedPattern>
106+
<pattern>org.slf4j</pattern>
107+
<shadedPattern>software.amazon.awssdk.thirdparty.org.slf4j</shadedPattern>
100108
</relocation>
101109
</relocations>
102110
<shadedArtifactAttached>false</shadedArtifactAttached>

0 commit comments

Comments
 (0)