Skip to content

Commit a40dc9e

Browse files
aajisakatasanuma
authored andcommitted
HADOOP-15993. Upgrade Kafka to 2.4.0 in hadoop-kafka module. (#1796)
1 parent bf45f3b commit a40dc9e

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

LICENSE-binary

+3-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ io.swagger:swagger-annotations:1.5.4
283283
javax.inject:javax.inject:1
284284
log4j:log4j:1.2.17
285285
net.java.dev.jna:jna:5.2.0
286-
net.jpountz.lz4:lz4:1.2.0
287286
net.minidev:accessors-smart:1.2
288287
net.minidev:json-smart:2.3
289288
org.apache.avro:avro:1.7.7
@@ -308,7 +307,7 @@ org.apache.htrace:htrace-core:3.1.0-incubating
308307
org.apache.htrace:htrace-core4:4.1.0-incubating
309308
org.apache.httpcomponents:httpclient:4.5.6
310309
org.apache.httpcomponents:httpcore:4.4.10
311-
org.apache.kafka:kafka-clients:0.8.2.1
310+
org.apache.kafka:kafka-clients:2.4.0
312311
org.apache.kerby:kerb-admin:1.0.1
313312
org.apache.kerby:kerb-client:1.0.1
314313
org.apache.kerby:kerb-common:1.0.1
@@ -346,6 +345,7 @@ org.eclipse.jetty:jetty-xml:9.3.27.v20190418
346345
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.27.v20190418
347346
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.3.27.v20190418
348347
org.ehcache:ehcache:3.3.1
348+
org.lz4:lz4-java:1.6.0
349349
org.objenesis:objenesis:1.0:compile
350350
org.xerial.snappy:snappy-java:1.0.5
351351
org.yaml:snakeyaml:1.16:
@@ -365,6 +365,7 @@ hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/com
365365
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree.h
366366
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/{fstatat|openat|unlinkat}.h
367367

368+
com.github.luben:zstd-jni:1.4.3-1
368369
dnsjava:dnsjava:2.1.7
369370
org.codehaus.woodstox:stax2-api:3.1.4
370371

hadoop-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<!-- Version number for xerces used by JDiff -->
4949
<xerces.jdiff.version>2.11.0</xerces.jdiff.version>
5050

51-
<kafka.version>0.8.2.1</kafka.version>
51+
<kafka.version>2.4.0</kafka.version>
5252

5353
<hadoop.assemblies.version>3.3.0-SNAPSHOT</hadoop.assemblies.version>
5454
<commons-daemon.version>1.0.13</commons-daemon.version>

licenses-binary/LICENSE-zstd-jni.txt

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Zstd-jni: JNI bindings to Zstd Library
2+
3+
Copyright (c) 2015-present, Luben Karavelov/ All rights reserved.
4+
5+
BSD License
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice, this
11+
list of conditions and the following disclaimer.
12+
13+
* Redistributions in binary form must reproduce the above copyright notice, this
14+
list of conditions and the following disclaimer in the documentation and/or
15+
other materials provided with the distribution.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
21+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)