Skip to content

Commit f7430a5

Browse files
vtutrinovMaksim Myskov
authored andcommitted
HDDS-10588. Bump hadoop-shaded-guava to 1.2.0 (apache#6440)
(cherry picked from commit 6822d53)
1 parent b2107b3 commit f7430a5

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

hadoop-hdds/hadoop-dependency-client/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
4343
<groupId>org.xerial.snappy</groupId>
4444
<artifactId>snappy-java</artifactId>
4545
</exclusion>
46+
<exclusion>
47+
<groupId>org.apache.hadoop.thirdparty</groupId>
48+
<artifactId>hadoop-shaded-guava</artifactId>
49+
</exclusion>
4650
<exclusion>
4751
<groupId>org.apache.hadoop</groupId>
4852
<artifactId>hadoop-annotations</artifactId>
@@ -194,12 +198,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
194198
</exclusions>
195199

196200
</dependency>
201+
<dependency>
202+
<groupId>org.apache.hadoop.thirdparty</groupId>
203+
<artifactId>hadoop-shaded-guava</artifactId>
204+
</dependency>
197205
<dependency>
198206
<groupId>org.apache.hadoop</groupId>
199207
<artifactId>hadoop-hdfs</artifactId>
200208
<version>${hadoop.version}</version>
201209
<scope>compile</scope>
202210
<exclusions>
211+
<exclusion>
212+
<groupId>org.apache.hadoop.thirdparty</groupId>
213+
<artifactId>hadoop-shaded-guava</artifactId>
214+
</exclusion>
203215
<exclusion>
204216
<groupId>com.google.guava</groupId>
205217
<artifactId>guava</artifactId>

hadoop-hdds/hadoop-dependency-server/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
4343
<groupId>org.xerial.snappy</groupId>
4444
<artifactId>snappy-java</artifactId>
4545
</exclusion>
46+
<exclusion>
47+
<groupId>org.apache.hadoop.thirdparty</groupId>
48+
<artifactId>hadoop-shaded-guava</artifactId>
49+
</exclusion>
4650
<exclusion>
4751
<groupId>org.apache.curator</groupId>
4852
<artifactId>*</artifactId>
@@ -101,6 +105,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
101105
</exclusion>
102106
</exclusions>
103107
</dependency>
108+
<dependency>
109+
<groupId>org.apache.hadoop.thirdparty</groupId>
110+
<artifactId>hadoop-shaded-guava</artifactId>
111+
</dependency>
104112
<dependency>
105113
<!-- commons-cli is required by DFSUtil.addPBProtocol -->
106114
<groupId>commons-cli</groupId>
@@ -112,6 +120,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
112120
<version>${hadoop.version}</version>
113121
<scope>compile</scope>
114122
<exclusions>
123+
<exclusion>
124+
<groupId>org.apache.hadoop.thirdparty</groupId>
125+
<artifactId>hadoop-shaded-guava</artifactId>
126+
</exclusion>
115127
<exclusion>
116128
<groupId>io.netty</groupId>
117129
<artifactId>*</artifactId>

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
313313
<vault.driver.version>5.1.0</vault.driver.version>
314314
<native.lib.tmp.dir></native.lib.tmp.dir>
315315
<snappy-java.version>1.1.10.5</snappy-java.version>
316+
<hadoop-shaded-guava.version>1.2.0</hadoop-shaded-guava.version>
316317
</properties>
317318

318319

@@ -1571,6 +1572,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
15711572
<artifactId>snappy-java</artifactId>
15721573
<version>${snappy-java.version}</version>
15731574
</dependency>
1575+
<dependency>
1576+
<groupId>org.apache.hadoop.thirdparty</groupId>
1577+
<artifactId>hadoop-shaded-guava</artifactId>
1578+
<version>${hadoop-shaded-guava.version}</version>
1579+
</dependency>
15741580
</dependencies>
15751581
</dependencyManagement>
15761582

0 commit comments

Comments
 (0)