Skip to content

Commit b7ee57e

Browse files
zoewanggzoewangg
authored
Fix bundle shading (#5196)
* Fix bundle shading * Fix typo
1 parent fcc7bc2 commit b7ee57e

File tree

2 files changed

+121
-1
lines changed

2 files changed

+121
-1
lines changed

‎.changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "bugfix",
3+
"category": "AWS SDK for Java v2 Bundle",
4+
"contributor": "",
5+
"description": "Fix unshaded classes in the AWS SDK for Java v2 bundle. See [#5108](https://github.com/aws/aws-sdk-java-v2/issues/5108)"
6+
}

‎bundle-sdk/pom.xml

Lines changed: 115 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,105 @@
6060
<groupId>software.amazon.s3.accessgrants</groupId>
6161
<artifactId>aws-s3-accessgrants-java-plugin</artifactId>
6262
<version>${s3accessgrants.version}</version>
63+
<optional>true</optional>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>software.amazon.awssdk</groupId>
67+
<artifactId>http-auth-spi</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<groupId>software.amazon.awssdk</groupId>
71+
<artifactId>identity-spi</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>software.amazon.awssdk</groupId>
75+
<artifactId>s3control</artifactId>
76+
</exclusion>
77+
<exclusion>
78+
<groupId>software.amazon.awssdk</groupId>
79+
<artifactId>s3</artifactId>
80+
</exclusion>
81+
<exclusion>
82+
<groupId>software.amazon.awssdk</groupId>
83+
<artifactId>iam</artifactId>
84+
</exclusion>
85+
<exclusion>
86+
<groupId>software.amazon.awssdk</groupId>
87+
<artifactId>sts</artifactId>
88+
</exclusion>
89+
<exclusion>
90+
<groupId>software.amazon.awssdk</groupId>
91+
<artifactId>cloudwatch-metric-publisher</artifactId>
92+
</exclusion>
93+
<exclusion>
94+
<groupId>software.amazon.eventstream</groupId>
95+
<artifactId>eventstream</artifactId>
96+
</exclusion>
97+
<exclusion>
98+
<groupId>org.slf4j</groupId>
99+
<artifactId>slf4j-api</artifactId>
100+
</exclusion>
101+
<exclusion>
102+
<groupId>io.netty</groupId>
103+
<artifactId>netty-codec-http</artifactId>
104+
</exclusion>
105+
<exclusion>
106+
<groupId>io.netty</groupId>
107+
<artifactId>netty-codec-http2</artifactId>
108+
</exclusion>
109+
<exclusion>
110+
<groupId>io.netty</groupId>
111+
<artifactId>netty-codec</artifactId>
112+
</exclusion>
113+
<exclusion>
114+
<groupId>io.netty</groupId>
115+
<artifactId>netty-transport</artifactId>
116+
</exclusion>
117+
<exclusion>
118+
<groupId>io.netty</groupId>
119+
<artifactId>netty-common</artifactId>
120+
</exclusion>
121+
<exclusion>
122+
<groupId>io.netty</groupId>
123+
<artifactId>netty-buffer</artifactId>
124+
</exclusion>
125+
<exclusion>
126+
<groupId>io.netty</groupId>
127+
<artifactId>netty-handler</artifactId>
128+
</exclusion>
129+
<exclusion>
130+
<groupId>io.netty</groupId>
131+
<artifactId>netty-transport-classes-epoll</artifactId>
132+
</exclusion>
133+
<exclusion>
134+
<groupId>io.netty</groupId>
135+
<artifactId>netty-resolver</artifactId>
136+
</exclusion>
137+
<exclusion>
138+
<groupId>io.netty</groupId>
139+
<artifactId>netty-resolver-dns</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>org.apache.httpcomponents</groupId>
143+
<artifactId>httpcomponents-client</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<groupId>org.apache.httpcomponents</groupId>
147+
<artifactId>httpcore</artifactId>
148+
</exclusion>
149+
<exclusion>
150+
<groupId>org.apache.httpcomponents</groupId>
151+
<artifactId>httpclient</artifactId>
152+
</exclusion>
153+
<exclusion>
154+
<groupId>commons-codec</groupId>
155+
<artifactId>commons-codec</artifactId>
156+
</exclusion>
157+
<exclusion>
158+
<groupId>org.reactivestreams</groupId>
159+
<artifactId>reactive-streams</artifactId>
160+
</exclusion>
161+
</exclusions>
63162
</dependency>
64163
</dependencies>
65164

@@ -82,8 +181,11 @@
82181
<include>software.amazon.awssdk:*</include>
83182
<include>software.amazon:*</include>
84183
<include>software.amazon.s3.accessgrants:*</include>
85-
<inlcude>com.github.ben-manes.caffeine:*</inlcude>
184+
<include>com.github.ben-manes.caffeine:caffeine</include>
185+
<include>com.google.errorprone:error_prone_annotations</include>
186+
<inlcude>org.checkerframework:checker-qual</inlcude>
86187
<include>commons-logging:*</include>
188+
<include>software.amazon.eventstream:eventstream</include>
87189
</includes>
88190
</artifactSet>
89191
<relocations>
@@ -102,6 +204,18 @@
102204
<pattern>org.slf4j</pattern>
103205
<shadedPattern>software.amazon.awssdk.thirdparty.org.slf4j</shadedPattern>
104206
</relocation>
207+
<relocation>
208+
<pattern>com.github.benmanes.caffeine</pattern>
209+
<shadedPattern>software.amazon.awssdk.thirdparty.com.github.benmanes.caffeine</shadedPattern>
210+
</relocation>
211+
<relocation>
212+
<pattern>org.checkerframework</pattern>
213+
<shadedPattern>software.amazon.awssdk.thirdparty.org.checkerframework</shadedPattern>
214+
</relocation>
215+
<relocation>
216+
<pattern>com.google.errorprone</pattern>
217+
<shadedPattern>software.amazon.awssdk.thirdparty.com.google.errorprone</shadedPattern>
218+
</relocation>
105219
</relocations>
106220
<shadedArtifactAttached>false</shadedArtifactAttached>
107221
<createDependencyReducedPom>true</createDependencyReducedPom>

0 commit comments

Comments
 (0)