You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2021/05/19 06:44:48 UTC
[hadoop-thirdparty] 14/28: HADOOP-17648. Update guava to 30.1.1-jre
(#9)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git
commit cfa67439e84063ec85f943f6d55e63954209240c
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Sun Apr 25 21:10:01 2021 -0700
HADOOP-17648. Update guava to 30.1.1-jre (#9)
Signed-off-by: Akira Ajisaka <aa...@apache.org>
---
LICENSE-binary | 1 +
hadoop-shaded-guava/pom.xml | 8 ++++++++
pom.xml | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 3bf3ddc..bf9ceab 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -206,6 +206,7 @@ This project bundles some components that are also licensed under the Apache
License Version 2.0:
com.google.code.gson:gson:jar:2.8.6
+com.google.guava:guava:jar:30.1.1-jre
com.squareup.okhttp3:okhttp:jar:4.2.2
com.squareup.okio:okio:jar:2.2.2
diff --git a/hadoop-shaded-guava/pom.xml b/hadoop-shaded-guava/pom.xml
index dc650de..8329a4e 100644
--- a/hadoop-shaded-guava/pom.xml
+++ b/hadoop-shaded-guava/pom.xml
@@ -81,6 +81,14 @@
<exclude>com.google.code.findbugs:jsr305</exclude>
</excludes>
</artifactSet>
+ <filters>
+ <filter>
+ <artifact>org.checkerframework:checker-qual</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
<relocations>
<relocation>
<pattern>com/google/</pattern>
diff --git a/pom.xml b/pom.xml
index a49ecbf..dd671fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<shaded.prefix>org.apache.hadoop.thirdparty</shaded.prefix>
<protobuf.shade.prefix>${shaded.prefix}.protobuf</protobuf.shade.prefix>
<protobuf_3_7.version>3.7.1</protobuf_3_7.version>
- <guava.version>29.0-jre</guava.version>
+ <guava.version>30.1.1-jre</guava.version>
<!-- maven plugin versions -->
<maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
@@ -440,4 +440,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org