Skip to content

Commit 2e2773e

Browse files
committed
HADOOP-19237. Upgrade to dnsjava 3.6.0 due to CVEs
1 parent 4525c7e commit 2e2773e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

LICENSE-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree
379379
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/{fstatat|openat|unlinkat}.h
380380

381381
com.github.luben:zstd-jni:1.5.2-1
382-
dnsjava:dnsjava:2.1.7
382+
dnsjava:dnsjava:3.6.0
383383
org.codehaus.woodstox:stax2-api:4.2.1
384384

385385

hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public void testMissingReverseLookup() throws Exception {
350350
Name name = Name.fromString("19.1.17.172.in-addr.arpa.");
351351
Record question = Record.newRecord(name, Type.PTR, DClass.IN);
352352
Message query = Message.newQuery(question);
353-
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
353+
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
354354
query.addRecord(optRecord, Section.ADDITIONAL);
355355
byte[] responseBytes = getRegistryDNS().generateReply(query, null);
356356
Message response = new Message(responseBytes);
@@ -392,7 +392,7 @@ private List<Record> assertDNSQuery(String lookup, int type, int numRecs)
392392
Name name = Name.fromString(lookup);
393393
Record question = Record.newRecord(name, type, DClass.IN);
394394
Message query = Message.newQuery(question);
395-
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
395+
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
396396
query.addRecord(optRecord, Section.ADDITIONAL);
397397
byte[] responseBytes = getRegistryDNS().generateReply(query, null);
398398
Message response = new Message(responseBytes);
@@ -421,7 +421,7 @@ private List<Record> assertDNSQueryNotNull(
421421
Name name = Name.fromString(lookup);
422422
Record question = Record.newRecord(name, type, DClass.IN);
423423
Message query = Message.newQuery(question);
424-
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
424+
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
425425
query.addRecord(optRecord, Section.ADDITIONAL);
426426
byte[] responseBytes = getRegistryDNS().generateReply(query, null);
427427
Message response = new Message(responseBytes);
@@ -592,7 +592,7 @@ public void testReadMasterFile() throws Exception {
592592
Name name = Name.fromString("5.0.17.172.in-addr.arpa.");
593593
Record question = Record.newRecord(name, Type.PTR, DClass.IN);
594594
Message query = Message.newQuery(question);
595-
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
595+
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
596596
query.addRecord(optRecord, Section.ADDITIONAL);
597597
byte[] responseBytes = getRegistryDNS().generateReply(query, null);
598598
Message response = new Message(responseBytes);

hadoop-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<zookeeper.version>3.8.4</zookeeper.version>
107107
<curator.version>5.2.0</curator.version>
108108
<findbugs.version>3.0.5</findbugs.version>
109-
<dnsjava.version>3.4.0</dnsjava.version>
109+
<dnsjava.version>3.6.0</dnsjava.version>
110110

111111
<guava.version>27.0-jre</guava.version>
112112
<guice.version>5.1.0</guice.version>

0 commit comments

Comments
 (0)