diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
index 0713467c73..ac8dd5bf1d 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,14 +31,8 @@
 import org.apache.tez.tools.javadoc.util.HtmlWriter;
 import org.apache.tez.tools.javadoc.util.XmlWriter;
 
-import com.sun.javadoc.AnnotationDesc;
-import com.sun.javadoc.AnnotationDesc.ElementValuePair;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.DocErrorReporter;
-import com.sun.javadoc.FieldDoc;
-import com.sun.javadoc.LanguageVersion;
-import com.sun.javadoc.RootDoc;
-import com.sun.tools.doclets.standard.Standard;
+import java.io.IOException;
+import java.util.Map;
 
 public final class ConfigStandardDoclet {
 
@@ -194,40 +188,34 @@ private static void processDoc(ClassDoc doc) {
             }
           }
         }
-      }
 
-      configProperty.description = field.commentText();
-
-    }
+        HtmlWriter writer = new HtmlWriter();
+        try {
+          writer.write(config);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
 
-    HtmlWriter writer = new HtmlWriter();
-    try {
-      writer.write(config);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+        XmlWriter xmlWriter = new XmlWriter();
+        try {
+          xmlWriter.write(config);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
 
-    XmlWriter xmlWriter = new XmlWriter();
-    try {
-      xmlWriter.write(config);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+      private static String stripQuotes (String s){
+        if (s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"') {
+          return s.substring(1, s.length() - 1);
+        }
+        return s;
+      }
 
-  }
+      public static int optionLength (String option){
+        return Standard.optionLength(option);
+      }
 
-  private static String stripQuotes(String s) {
-    if (s.charAt(0) == '"' && s.charAt(s.length()-1) == '"') {
-      return s.substring(1, s.length()-1);
+      public static boolean validOptions (String options[][],DocErrorReporter reporter){
+        return true;
+      }
     }
-    return s;
-  }
-
-  public static int optionLength(String option) {
-    return Standard.optionLength(option);
-  }
-
-  public static boolean validOptions(String options[][], DocErrorReporter reporter) {
-    return true;
-  }
-}
diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
index 604d48ac5e..d35dfd38e1 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
@@ -23,18 +23,17 @@
 
 public class Config {
 
-  public final String templateName;
-  public final String configName;
-  public Map<String, ConfigProperty> configProperties;
+    public final String templateName;
+    public final String configName;
+    public Map<String, ConfigProperty> configProperties;
 
-  public Config(String configName, String templateName) {
-    this.configName = configName;
-    this.templateName = templateName;
-    this.configProperties = new TreeMap<String, ConfigProperty>();
-  }
-
-  public Config() {
-    this(null, null);
-  }
+    public Config(String configName, String templateName) {
+        this.configName = configName;
+        this.templateName = templateName;
+        this.configProperties = new TreeMap<String, ConfigProperty>();
+    }
 
+    public Config() {
+        this(null, null);
+    }
 }
diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
index 89490c4a51..98ab8ae582 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
@@ -20,28 +20,26 @@
 
 public class ConfigProperty {
 
-  public String propertyName;
-  public String defaultValue;
-  public String description;
-  public String type = "string";
-  public boolean isPrivate = false;
-  public boolean isUnstable = false;
-  public boolean isEvolving = false;
-  public boolean isValidConfigProp = false;
-  public String[] validValues;
-  public String inferredType;
+    public String propertyName;
+    public String defaultValue;
+    public String description;
+    public String type = "string";
+    public boolean isPrivate = false;
+    public boolean isUnstable = false;
+    public boolean isEvolving = false;
+    public boolean isValidConfigProp = false;
+    public String[] validValues;
+    public String inferredType;
 
-  @Override
-  public String toString() {
-    return "name=" + propertyName
-        + ", defaultValue=" + defaultValue
-        + ", description=" + description
-        + ", type=" + type
-        + ", inferredType=" + inferredType
-        + ", private=" + isPrivate
-        + ", validValues=" + (validValues == null ? "null" : validValues)
-        + ", isConfigProp=" + isValidConfigProp;
-  }
+    @Override
+    public String toString() {
+        return "name=" + propertyName
+            + ", defaultValue=" + defaultValue
+            + ", description=" + description
+            + ", type=" + type
+            + ", inferredType=" + inferredType
+            + ", private=" + isPrivate
+            + ", validValues=" + (validValues == null ? "null" : validValues)
+            + ", isConfigProp=" + isValidConfigProp;
+    }
 }
-
-
diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
index 4b531e87e5..1586e51439 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
@@ -18,144 +18,136 @@
 
 package org.apache.tez.tools.javadoc.util;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-import org.apache.tez.dag.api.TezException;
 import org.apache.tez.tools.javadoc.model.Config;
 import org.apache.tez.tools.javadoc.model.ConfigProperty;
 
+import java.io.*;
+
 public class HtmlWriter extends Writer {
 
-  private static final String DEFAULT_STYLESHEET = "default-stylesheet.css";
+    private static final String DEFAULT_STYLESHEET = "default-stylesheet.css";
 
-  public void write(Config config) throws IOException {
-    PrintWriter out = null;
+    public void write(Config config) throws IOException {
+        PrintWriter out = null;
 
-    if (config.configName == null || config.configName.isEmpty()) {
-      throw new RuntimeException("Config Name is null or empty");
-    }
+        if (config.configName == null || config.configName.isEmpty()) {
+            throw new RuntimeException("Config Name is null or empty");
+        }
 
-    try {
-      File file = new File(config.configName + ".html");
-      out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
+        try {
+            File file = new File(config.configName + ".html");
+            out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
 
-      out.println("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"no\" ?>");
-      out.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"");
-      out.println("    \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
+            out.println("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"no\" ?>");
+            out.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"");
+            out.println("    \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
 
-      out.println("<html xmlns=\"http://www.w3.org/1999/xhtml\">");
+            out.println("<html xmlns=\"http://www.w3.org/1999/xhtml\">");
 
-      out.println("<head>");
-      out.println("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\" />");
-      out.println("<title>"+ config.configName +"</title>");
+            out.println("<head>");
+            out.println("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\" />");
+            out.println("<title>" + config.configName + "</title>");
 //      out.println("<link rel='stylesheet' type='text/css' href=' " + config.getStyleSheet() + "'/>");
-      out.println("</head>");
-
-      out.println("<style>");
-      out.println("table");
-      out.println("{");
-      out.println("  background-color: #000;");
-      out.println("  border-spacing: 1px;");
-      out.println("  margin: 0 auto 0 auto;");
-      out.println("}");
-      out.println("th");
-      out.println("{");
-      out.println("  background-color: #fff;");
-      out.println("  padding: 5px;");
-      out.println("  margin: 1px;");
-      out.println("}");
-      out.println("td");
-      out.println("{");
-      out.println("  background-color: #fff;");
-      out.println("  padding: 2px;");
-      out.println("}");
-      out.println("table, th, td {");
-      out.println("  border: 1px solid black;");
-      out.println("}");
-      out.println("tr.tr_private td");
-      out.println("{");
-      out.println("  background-color: #FF4500;");
-      out.println("  padding: 2px;");
-      out.println("}");
-      out.println("tr.tr_evolve_unstable td");
-      out.println("{");
-      out.println("  background-color: #FFFFE0;");
-      out.println("  padding: 2px;");
-      out.println("}");
-      out.println("th.th_private");
-      out.println("{");
-      out.println("  background-color: #FF4500;");
-      out.println("}");
-      out.println("th.th_evolve_unstable");
-      out.println("{");
-      out.println("  background-color: #FFFFE0;");
-      out.println("}");
-
-      out.println("</style>");
-
-      out.println("<body>");
-
-      out.println("<div id=\"wrapper\">");
-      out.println("<div id=\"container\">");
-
-      out.println("<h1>"+ config.configName +"</h1>");
-      out.println("<hr />");
-
-      out.println("<table>");
-      out.println("<tr>");
-      out.println("<th>" + "Property Name" + "</th>");
-      out.println("<th>" + "Default Value" + "</th>");
-      out.println("<th>" + "Description" + "</th>");
-      out.println("<th>" + "Type" + "</th>");
-      // out.println("<th>" + "Valid Values" + "</th>");
-      out.println("<th class=\"th_private\">" + "Is Private?" + "</th>");
-      out.println("<th class=\"th_evolve_unstable\">" + "Is Unstable?" + "</th>");
-      out.println("<th class=\"th_evolve_unstable\">" + "Is Evolving?" + "</th>");
-      out.println("</tr>");
-
-      for (ConfigProperty configProperty : config.configProperties.values()) {
-        if (!isValidConfigProperty(configProperty)) {
-          continue;
+            out.println("</head>");
+
+            out.println("<style>");
+            out.println("table");
+            out.println("{");
+            out.println("  background-color: #000;");
+            out.println("  border-spacing: 1px;");
+            out.println("  margin: 0 auto 0 auto;");
+            out.println("}");
+            out.println("th");
+            out.println("{");
+            out.println("  background-color: #fff;");
+            out.println("  padding: 5px;");
+            out.println("  margin: 1px;");
+            out.println("}");
+            out.println("td");
+            out.println("{");
+            out.println("  background-color: #fff;");
+            out.println("  padding: 2px;");
+            out.println("}");
+            out.println("table, th, td {");
+            out.println("  border: 1px solid black;");
+            out.println("}");
+            out.println("tr.tr_private td");
+            out.println("{");
+            out.println("  background-color: #FF4500;");
+            out.println("  padding: 2px;");
+            out.println("}");
+            out.println("tr.tr_evolve_unstable td");
+            out.println("{");
+            out.println("  background-color: #FFFFE0;");
+            out.println("  padding: 2px;");
+            out.println("}");
+            out.println("th.th_private");
+            out.println("{");
+            out.println("  background-color: #FF4500;");
+            out.println("}");
+            out.println("th.th_evolve_unstable");
+            out.println("{");
+            out.println("  background-color: #FFFFE0;");
+            out.println("}");
+
+            out.println("</style>");
+
+            out.println("<body>");
+
+            out.println("<div id=\"wrapper\">");
+            out.println("<div id=\"container\">");
+
+            out.println("<h1>" + config.configName + "</h1>");
+            out.println("<hr />");
+
+            out.println("<table>");
+            out.println("<tr>");
+            out.println("<th>" + "Property Name" + "</th>");
+            out.println("<th>" + "Default Value" + "</th>");
+            out.println("<th>" + "Description" + "</th>");
+            out.println("<th>" + "Type" + "</th>");
+            // out.println("<th>" + "Valid Values" + "</th>");
+            out.println("<th class=\"th_private\">" + "Is Private?" + "</th>");
+            out.println("<th class=\"th_evolve_unstable\">" + "Is Unstable?" + "</th>");
+            out.println("<th class=\"th_evolve_unstable\">" + "Is Evolving?" + "</th>");
+            out.println("</tr>");
+
+            for (ConfigProperty configProperty : config.configProperties.values()) {
+                if (!isValidConfigProperty(configProperty)) {
+                    continue;
+                }
+
+                String altClass = "";
+                if (configProperty.isPrivate) {
+                    altClass = "class=\"tr_private\"";
+                } else if (configProperty.isEvolving || configProperty.isUnstable) {
+                    altClass = "class=\"tr_evolve_unstable\"";
+                }
+
+                out.println("<tr " + altClass + ">");
+                out.println("<td>" + configProperty.propertyName + "</td>");
+                out.println("<td>" + configProperty.defaultValue + "</td>");
+                out.println("<td>" + configProperty.description + "</td>");
+                out.println("<td>" + configProperty.type + "</td>");
+                // Re-enable after adding values
+                // out.println("<td>" + configProperty.validValues + "</td>");
+
+                out.println("<td class=\"" + (configProperty.isPrivate ? "td_private_true" : "td_private_false") + "\">" + configProperty.isPrivate + "</td>");
+                out.println("<td class=\"" + (configProperty.isEvolving ? "td_evolve_true" : "td_evolve_false") + "\">" + configProperty.isEvolving + "</td>");
+                out.println("<td class=\"" + (configProperty.isUnstable ? "td_unstable_true" : "td_unstable_false") + "\">" + configProperty.isUnstable + "</td>");
+                out.println("</tr>");
+            }
+
+            out.println("</table>");
+
+            out.println("</div>");
+            out.println("</div>");
+            out.println("</body>");
+            out.println("</html>");
+        } finally {
+            if (out != null) {
+                out.close();
+            }
         }
-
-        String altClass = "";
-        if (configProperty.isPrivate) {
-          altClass = "class=\"tr_private\"";
-        } else if (configProperty.isEvolving || configProperty.isUnstable) {
-          altClass = "class=\"tr_evolve_unstable\"";
-        }
-
-        out.println("<tr " + altClass + ">");
-        out.println("<td>" + configProperty.propertyName + "</td>");
-        out.println("<td>" + configProperty.defaultValue + "</td>");
-        out.println("<td>" + configProperty.description + "</td>");
-        out.println("<td>" + configProperty.type + "</td>");
-        // Re-enable after adding values
-        // out.println("<td>" + configProperty.validValues + "</td>");
-
-        out.println("<td class=\"" + (configProperty.isPrivate? "td_private_true" : "td_private_false") + "\">" + configProperty.isPrivate + "</td>");
-        out.println("<td class=\"" + (configProperty.isEvolving? "td_evolve_true" : "td_evolve_false") + "\">" + configProperty.isEvolving + "</td>");
-        out.println("<td class=\"" + (configProperty.isUnstable? "td_unstable_true" : "td_unstable_false") + "\">" + configProperty.isUnstable + "</td>");
-        out.println("</tr>");
-      }
-
-      out.println("</table>");
-
-      out.println("</div>");
-      out.println("</div>");
-      out.println("</body>");
-      out.println("</html>");
-
-    } finally {
-      if (out != null) {
-        out.close();
-      }
     }
-  }
-
 }
diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
index cfb0c92738..6b9bcf9b20 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
@@ -18,22 +18,22 @@
 
 package org.apache.tez.tools.javadoc.util;
 
-import java.io.IOException;
-
 import org.apache.tez.tools.javadoc.model.Config;
 import org.apache.tez.tools.javadoc.model.ConfigProperty;
 
+import java.io.IOException;
+
 public abstract class Writer {
 
-  public abstract void write(Config config) throws IOException;
+    public abstract void write(Config config) throws IOException;
 
-  public boolean isValidConfigProperty(ConfigProperty configProperty) {
-    if (!configProperty.isValidConfigProp) {
-      return false;
-    }
-    if (configProperty.propertyName == null || configProperty.propertyName.isEmpty()) {
-      return false;
+    public boolean isValidConfigProperty(ConfigProperty configProperty) {
+        if (!configProperty.isValidConfigProp) {
+            return false;
+        }
+        if (configProperty.propertyName == null || configProperty.propertyName.isEmpty()) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
index e9bdeb3999..e69de29bb2 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
+++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.tools.javadoc.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.tez.tools.javadoc.model.Config;
-import org.apache.tez.tools.javadoc.model.ConfigProperty;
-
-import com.google.common.io.ByteStreams;
-
-public class XmlWriter extends Writer {
-
-  public void write(Config config) throws IOException {
-    PrintWriter out = null;
-
-    if (config.configName == null || config.configName.isEmpty()) {
-      throw new RuntimeException("Config Name is null or empty");
-    }
-
-    String fileName = config.templateName == null ||
-        config.templateName.isEmpty() ? config.configName : config.templateName;
-    if (!fileName.endsWith(".xml")) {
-      fileName += ".xml";
-    }
-
-    try {
-      File file = new File(fileName);
-      writeApacheHeader(file);
-
-      out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file, true), "UTF-8"));
-
-      out.println("<?xml-stylesheet type=\"text/xsl\" href=\"configuration.xsl\"?>");
-      out.println();
-      out.println("<!-- WARNING: THIS IS A GENERATED TEMPLATE PURELY FOR DOCUMENTATION PURPOSES");
-      out.println(" AND SHOULD NOT BE USED AS A CONFIGURATION FILE FOR TEZ -->");
-      out.println();
-      out.println("<configuration>");
-
-      for (ConfigProperty configProperty : config.configProperties.values()) {
-        if (!isValidConfigProperty(configProperty)) {
-          continue;
-        }
-        out.println();
-        out.println("  <property>");
-        out.println("    <name>" + configProperty.propertyName + "</name>");
-        if (configProperty.defaultValue != null && !configProperty.defaultValue.isEmpty()) {
-          out.println("    <defaultValue>" + configProperty.defaultValue + "</defaultValue>");
-        }
-        if (configProperty.description != null && !configProperty.description.isEmpty()) {
-          out.println("    <description>" + StringEscapeUtils.escapeXml(configProperty.description)
-              + "</description>");
-        }
-        if (configProperty.type != null && !configProperty.type.isEmpty()) {
-          out.println("    <type>" + configProperty.type + "</type>");
-        }
-        if (configProperty.isUnstable) {
-          out.println("    <unstable>true</unstable>");
-        }
-        if (configProperty.isEvolving) {
-          out.println("    <evolving>true</evolving>");
-        }
-        if (configProperty.isPrivate) {
-          out.println("    <private>true</private>");
-        }
-        out.println("  </property>");
-      }
-
-      out.println();
-      out.println("</configuration>");
-
-    } finally {
-      if (out != null) {
-        out.close();
-      }
-    }
-  }
-
-  private void writeApacheHeader(File file) throws IOException {
-    try (InputStream in = this.getClass().getClassLoader().getResourceAsStream("apache-licence.xml.header");
-      OutputStream out = new FileOutputStream(file)) {
-      ByteStreams.copy(in, out);
-    }
-  }
-}