Skip to content

Commit

Permalink
Update to Guava 33.1.0 and remove shading
Browse files Browse the repository at this point in the history
  • Loading branch information
electrum committed May 2, 2024
1 parent 6a5e05e commit 601323e
Showing 1 changed file with 12 additions and 26 deletions.
38 changes: 12 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>33.1.0-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -477,6 +483,11 @@
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<excludes>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>com.google.guava:failureaccess</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.google.j2objc:j2objc-annotations</exclude>
<exclude>org.checkerframework:checker-qual</exclude>
<exclude>org.xerial.snappy:snappy-java</exclude>
<exclude>org.lz4:lz4-java</exclude>
<exclude>com.squareup.okhttp3:okhttp</exclude>
Expand Down Expand Up @@ -525,23 +536,6 @@
<pattern>org.wildfly.openssl</pattern>
<shadedPattern>${shadeBase}.org.wildfly.openssl</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>${shadeBase}.com.google.common</shadedPattern>
</relocation>
<!-- this comes from com.google.guava -->
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>${shadeBase}.com.google.thirdparty</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.j2objc</pattern>
<shadedPattern>${shadeBase}.com.google.j2objc</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.errorprone</pattern>
<shadedPattern>${shadeBase}.com.google.j2objc</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>${shadeBase}.com.google.protobuf</shadedPattern>
Expand Down Expand Up @@ -592,14 +586,6 @@
<pattern>javax.activation</pattern>
<shadedPattern>${shadeBase}.javax.activation</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.mojo</pattern>
<shadedPattern>${shadeBase}.org.codehaus.mojo</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
Expand Down

0 comments on commit 601323e

Please sign in to comment.