This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6822d53e93 HDDS-10588. Bump hadoop-shaded-guava to 1.2.0 (#6440)
6822d53e93 is described below
commit 6822d53e9398daa40b54d369e640b1d3f51db9cc
Author: Slava Tutrinov <[email protected]>
AuthorDate: Wed Mar 27 18:28:46 2024 +0300
HDDS-10588. Bump hadoop-shaded-guava to 1.2.0 (#6440)
---
hadoop-hdds/hadoop-dependency-client/pom.xml | 12 ++++++++++++
hadoop-hdds/hadoop-dependency-server/pom.xml | 12 ++++++++++++
pom.xml | 6 ++++++
3 files changed, 30 insertions(+)
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml
b/hadoop-hdds/hadoop-dependency-client/pom.xml
index f29232090f..93f2d275a9 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
@@ -202,12 +206,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml
b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 82e4c33325..84d3117ae8 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>*</artifactId>
@@ -109,6 +113,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </dependency>
<dependency>
<!-- commons-cli is required by DFSUtil.addPBProtocol -->
<groupId>commons-cli</groupId>
@@ -120,6 +128,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<version>${hadoop.version}</version>
<scope>compile</scope>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
diff --git a/pom.xml b/pom.xml
index 49eb6b64a3..538e324076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,6 +303,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<properties.maven.plugin.version>1.2.1</properties.maven.plugin.version>
<maven.core.version>3.9.6</maven.core.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
+ <hadoop-shaded-guava.version>1.2.0</hadoop-shaded-guava.version>
</properties>
<dependencyManagement>
@@ -1215,6 +1216,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>snappy-java</artifactId>
<version>${snappy-java.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ <version>${hadoop-shaded-guava.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
