diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 52595d93523..3db58f40bf2 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -122,6 +122,10 @@
javax.xml.bind
jaxb-api
+
+ javax.activation
+ activation
+
xml-apis
xml-apis
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
index 5d4467d8a02..ebe8d57512b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
@@ -116,10 +116,25 @@
org.apache.hadoop
hadoop-yarn-api
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.2.3-1
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.2.11
+
javax.xml.bind
jaxb-api
+
+ javax.activation
+ activation
+ 1.1.1
+
org.codehaus.jettison
jettison
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java
index ff52324261c..c0daac97639 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java
@@ -83,7 +83,7 @@ private ContextFactory() {
public static JAXBContext newContext(Class[] classes,
Map properties) throws Exception {
Class spFactory = Class.forName(
- "com.sun.xml.internal.bind.v2.ContextFactory");
+ "com.sun.xml.bind.v2.ContextFactory");
Method m = spFactory.getMethod("createContext", Class[].class, Map.class);
return (JAXBContext) m.invoke((Object) null, classes, properties);
}
@@ -123,7 +123,7 @@ public static JAXBContext createContext(Class[] classes,
public static JAXBContext createContext(String contextPath, ClassLoader
classLoader, Map properties) throws Exception {
Class spFactory = Class.forName(
- "com.sun.xml.internal.bind.v2.ContextFactory");
+ "com.sun.xml.bind.v2.ContextFactory");
Method m = spFactory.getMethod("createContext", String.class,
ClassLoader.class, Map.class);
return (JAXBContext) m.invoke(null, contextPath, classLoader,