From c66756ebc158d77bf0467b2d32cf2d2f11587dbf Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Thu, 14 Aug 2014 23:18:45 +0000 Subject: [PATCH] svn merge -c 1618080 FIXES: MAPREDUCE-5878. some standard JDK APIs are not part of system classes defaults. Contributed by Sangjin Lee git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618081 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 97a6c6b4ca2..434219c9958 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -75,6 +75,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw) + MAPREDUCE-5878. some standard JDK APIs are not part of system classes + defaults (Sangjin Lee via jlowe) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 67da7907bfa..bc612d2552f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -1658,9 +1658,9 @@ mapreduce.job.classloader.system.classes - java.,javax.,org.apache.commons.logging.,org.apache.log4j., - org.apache.hadoop.,core-default.xml,hdfs-default.xml, - mapred-default.xml,yarn-default.xml + java.,javax.,org.w3c.dom.,org.xml.sax.,org.apache.commons.logging., + org.apache.log4j.,org.apache.hadoop.,core-default.xml, + hdfs-default.xml,mapred-default.xml,yarn-default.xml A comma-separated list of classes that should be loaded from the system classpath, not the user-supplied JARs, when mapreduce.job.classloader is enabled. Names ending in '.' (period) are treated as package names,