Skip to content

Commit

Permalink
Fix bundle shading (#5196)
Browse files Browse the repository at this point in the history 
* Fix bundle shading

* Fix typo
  • Loading branch information
@zoewangg
zoewangg committed May 7, 2024
1 parent fcc7bc2 commit b7ee57e
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2 Bundle",
"contributor": "",
"description": "Fix unshaded classes in the AWS SDK for Java v2 bundle. See [#5108](https://github.com/aws/aws-sdk-java-v2/issues/5108)"
}
116 changes: 115 additions & 1 deletion bundle-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,105 @@
<groupId>software.amazon.s3.accessgrants</groupId>
<artifactId>aws-s3-accessgrants-java-plugin</artifactId>
<version>${s3accessgrants.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-spi</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>identity-spi</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3control</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>iam</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>cloudwatch-metric-publisher</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.eventstream</groupId>
<artifactId>eventstream</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand All @@ -82,8 +181,11 @@
<include>software.amazon.awssdk:*</include>
<include>software.amazon:*</include>
<include>software.amazon.s3.accessgrants:*</include>
<inlcude>com.github.ben-manes.caffeine:*</inlcude>
<include>com.github.ben-manes.caffeine:caffeine</include>
<include>com.google.errorprone:error_prone_annotations</include>
<inlcude>org.checkerframework:checker-qual</inlcude>
<include>commons-logging:*</include>
<include>software.amazon.eventstream:eventstream</include>
</includes>
</artifactSet>
<relocations>
Expand All @@ -102,6 +204,18 @@
<pattern>org.slf4j</pattern>
<shadedPattern>software.amazon.awssdk.thirdparty.org.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>com.github.benmanes.caffeine</pattern>
<shadedPattern>software.amazon.awssdk.thirdparty.com.github.benmanes.caffeine</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>software.amazon.awssdk.thirdparty.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.errorprone</pattern>
<shadedPattern>software.amazon.awssdk.thirdparty.com.google.errorprone</shadedPattern>
</relocation>
</relocations>
<shadedArtifactAttached>false</shadedArtifactAttached>
<createDependencyReducedPom>true</createDependencyReducedPom>
Expand Down

0 comments on commit b7ee57e

Please sign in to comment.