This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push: new 5782380 [FLINK-23326] Bump guava to 30.1.1-jre 5782380 is described below commit 5782380675a0bcfb85031e9985a9bd4ae5f19259 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Wed Jul 7 11:40:21 2021 +0200 [FLINK-23326] Bump guava to 30.1.1-jre --- flink-shaded-guava-18/pom.xml | 11 +++++++++-- flink-shaded-guava-18/src/main/resources/META-INF/NOTICE | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml index a585fa4..140df56 100644 --- a/flink-shaded-guava-18/pom.xml +++ b/flink-shaded-guava-18/pom.xml @@ -36,7 +36,7 @@ under the License. <packaging>jar</packaging> <properties> - <guava.version>18.0</guava.version> + <guava.version>30.1.1-jre</guava.version> </properties> <dependencies> @@ -44,6 +44,13 @@ under the License. <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> + <exclusions> + <exclusion> + <!-- this dependency is actually empty and appears to be some weird legacy artifact --> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> @@ -70,7 +77,7 @@ under the License. <relocations> <relocation> <pattern>com.google</pattern> - <shadedPattern>${shading.prefix}.guava18.com.google</shadedPattern> + <shadedPattern>${shading.prefix}.guava30.com.google</shadedPattern> </relocation> </relocations> </configuration> diff --git a/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE b/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE index 9af6155..0daf6e3 100644 --- a/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE @@ -6,4 +6,5 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- com.google.guava:guava:18.0 \ No newline at end of file +- com.google.guava:guava:30.1.1-jre +- com.google.guava:failureaccess:1.0.1 \ No newline at end of file