diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 19659f2d79..f81c1ad8b1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java-version: [8, 11]
+        java-version: [8, 11, 17]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/tez-tools/pom.xml b/tez-tools/pom.xml
index 8811d80687..8640957497 100644
--- a/tez-tools/pom.xml
+++ b/tez-tools/pom.xml
@@ -50,6 +50,25 @@
         <module>tez-tfile-parser</module>
       </modules>
     </profile>
+    <profile>
+      <id>jdk8-16</id>
+      <activation>
+        <jdk>[8,16]</jdk>
+      </activation>
+      <modules>
+        <module>tez-javadoc-tools-base-jdk8</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>jdk17plus</id>
+      <activation>
+        <!-- JDK9 starts strong encapsulation of Java internals, JDK17 removes/hides those -->
+        <jdk>[17,)</jdk>
+      </activation>
+      <modules>
+        <module>tez-javadoc-tools-base</module>
+      </modules>
+    </profile>
   </profiles>
 
 </project>
diff --git a/tez-tools/tez-javadoc-tools-base-jdk8/findbugs-exclude.xml b/tez-tools/tez-javadoc-tools-base-jdk8/findbugs-exclude.xml
new file mode 100644
index 0000000000..d6e84af607
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/findbugs-exclude.xml
@@ -0,0 +1,28 @@
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<FindBugsFilter>
+
+  <Match>
+    <Class name="org.apache.tez.tools.javadoc.model.ConfigProperty"/>
+    <Field name="description"/>
+    <Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"/>
+  </Match>
+
+  <Match>
+    <Class name="org.apache.tez.tools.javadoc.model.ConfigProperty"/>
+    <Field name="validValues"/>
+    <Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"/>
+  </Match>
+
+</FindBugsFilter>
diff --git a/tez-tools/tez-javadoc-tools-base-jdk8/pom.xml b/tez-tools/tez-javadoc-tools-base-jdk8/pom.xml
new file mode 100644
index 0000000000..f611309e63
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.tez</groupId>
+    <artifactId>tez-tools</artifactId>
+    <version>0.10.5-SNAPSHOT</version>
+  </parent>
+  <artifactId>tez-javadoc-tools-base-jdk8</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tez</groupId>
+      <artifactId>tez-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>platform-macosx</id>
+      <activation>
+        <file>
+          <exists>${java.home}/../Classes/classes.jar</exists>
+        </file>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.sun</groupId>
+          <artifactId>tools</artifactId>
+          <version>${java.version}</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../Classes/classes.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>other-os</id>
+      <activation>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.sun</groupId>
+          <artifactId>tools</artifactId>
+          <version>${java.version}</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <excludePackageNames>org.apache.tez.tools.javadoc.doclet</excludePackageNames>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
similarity index 92%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
index 0713467c73..186491e0bd 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/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.
@@ -21,6 +21,15 @@
 import java.io.IOException;
 import java.util.Map;
 
+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 org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -31,21 +40,13 @@
 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;
-
 public final class ConfigStandardDoclet {
 
   private static final String DEBUG_SWITCH = "-debug";
   private static boolean debugMode = false;
 
-  private ConfigStandardDoclet() {}
+  private ConfigStandardDoclet() {
+  }
 
   public static LanguageVersion languageVersion() {
     return LanguageVersion.JAVA_1_5;
@@ -194,31 +195,27 @@ 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);
+    if (s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"') {
+      return s.substring(1, s.length() - 1);
     }
     return s;
   }
diff --git a/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java
new file mode 100644
index 0000000000..3c18e02a5b
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.dag.api.client.rpc;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
similarity index 95%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
index 604d48ac5e..834c3ab1c2 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/Config.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.
@@ -36,5 +36,4 @@ public Config(String configName, String templateName) {
   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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
similarity index 96%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
index 89490c4a51..3b3fdb3e7b 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.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.
@@ -43,5 +43,3 @@ public String toString() {
         + ", isConfigProp=" + isValidConfigProp;
   }
 }
-
-
diff --git a/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java
new file mode 100644
index 0000000000..3c18e02a5b
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.dag.api.client.rpc;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
similarity index 88%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
index 4b531e87e5..f5a6126bc3 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.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.
@@ -52,7 +52,7 @@ public void write(Config config) throws IOException {
 
       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("<title>" + config.configName + "</title>");
 //      out.println("<link rel='stylesheet' type='text/css' href=' " + config.getStyleSheet() + "'/>");
       out.println("</head>");
 
@@ -103,7 +103,7 @@ public void write(Config config) throws IOException {
       out.println("<div id=\"wrapper\">");
       out.println("<div id=\"container\">");
 
-      out.println("<h1>"+ config.configName +"</h1>");
+      out.println("<h1>" + config.configName + "</h1>");
       out.println("<hr />");
 
       out.println("<table>");
@@ -138,9 +138,15 @@ public void write(Config config) throws IOException {
         // 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(
+            "<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>");
       }
 
@@ -150,12 +156,10 @@ public void write(Config config) throws IOException {
       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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
similarity index 95%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
index cfb0c92738..33d64c6f61 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/Writer.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.
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-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
similarity index 95%
rename from tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
rename to tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
index e9bdeb3999..62e526277d 100644
--- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.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.
@@ -71,8 +71,7 @@ public void write(Config config) throws IOException {
           out.println("    <defaultValue>" + configProperty.defaultValue + "</defaultValue>");
         }
         if (configProperty.description != null && !configProperty.description.isEmpty()) {
-          out.println("    <description>" + StringEscapeUtils.escapeXml(configProperty.description)
-              + "</description>");
+          out.println("    <description>" + StringEscapeUtils.escapeXml(configProperty.description) + "</description>");
         }
         if (configProperty.type != null && !configProperty.type.isEmpty()) {
           out.println("    <type>" + configProperty.type + "</type>");
@@ -91,7 +90,6 @@ public void write(Config config) throws IOException {
 
       out.println();
       out.println("</configuration>");
-
     } finally {
       if (out != null) {
         out.close();
@@ -101,7 +99,7 @@ public void write(Config config) throws IOException {
 
   private void writeApacheHeader(File file) throws IOException {
     try (InputStream in = this.getClass().getClassLoader().getResourceAsStream("apache-licence.xml.header");
-      OutputStream out = new FileOutputStream(file)) {
+         OutputStream out = new FileOutputStream(file)) {
       ByteStreams.copy(in, out);
     }
   }
diff --git a/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java
new file mode 100644
index 0000000000..3c18e02a5b
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base-jdk8/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.dag.api.client.rpc;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
diff --git a/tez-tools/tez-javadoc-tools-base/findbugs-exclude.xml b/tez-tools/tez-javadoc-tools-base/findbugs-exclude.xml
new file mode 100644
index 0000000000..d6e84af607
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/findbugs-exclude.xml
@@ -0,0 +1,28 @@
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<FindBugsFilter>
+
+  <Match>
+    <Class name="org.apache.tez.tools.javadoc.model.ConfigProperty"/>
+    <Field name="description"/>
+    <Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"/>
+  </Match>
+
+  <Match>
+    <Class name="org.apache.tez.tools.javadoc.model.ConfigProperty"/>
+    <Field name="validValues"/>
+    <Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"/>
+  </Match>
+
+</FindBugsFilter>
diff --git a/tez-tools/tez-javadoc-tools-base/pom.xml b/tez-tools/tez-javadoc-tools-base/pom.xml
new file mode 100644
index 0000000000..d2c4043c0e
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.tez</groupId>
+    <artifactId>tez-tools</artifactId>
+    <version>0.10.5-SNAPSHOT</version>
+  </parent>
+  <artifactId>tez-javadoc-tools-base</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tez</groupId>
+      <artifactId>tez-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
+
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <excludePackageNames>org.apache.tez.tools.javadoc.doclet</excludePackageNames>
+        </configuration>
+      </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>9</source>
+                <target>9</target>
+            </configuration>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
new file mode 100644
index 0000000000..d4c7feba3b
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/ConfigStandardDoclet.java
@@ -0,0 +1,291 @@
+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.tools.javadoc.doclet;
+
+import com.sun.source.util.DocTrees;
+import jdk.javadoc.doclet.Doclet;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.apache.tez.common.annotation.ConfigurationClass;
+import org.apache.tez.common.annotation.ConfigurationProperty;
+import org.apache.tez.tools.javadoc.model.Config;
+import org.apache.tez.tools.javadoc.model.ConfigProperty;
+import org.apache.tez.tools.javadoc.util.HtmlWriter;
+import org.apache.tez.tools.javadoc.util.XmlWriter;
+
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.tools.Diagnostic;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+public class ConfigStandardDoclet implements Doclet {
+
+  private static boolean debugMode = false;
+
+  private Reporter reporter;
+
+  private static String stripQuotes(String s) {
+    if (s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"') {
+      return s.substring(1, s.length() - 1);
+    }
+    return s;
+  }
+
+  @Override
+  public void init(Locale locale, Reporter reporter) {
+    this.reporter = reporter;
+  }
+
+  @Override
+  public String getName() {
+    return "Tez";
+  }
+
+  @Override
+  public SourceVersion getSupportedSourceVersion() {
+    return SourceVersion.RELEASE_9;
+  }
+
+  private void logMessage(String message) {
+    if (!debugMode) {
+      return;
+    }
+    reporter.print(Diagnostic.Kind.NOTE, message);
+  }
+
+  @Override
+  public boolean run(DocletEnvironment docEnv) {
+    logMessage("Running doclet " + ConfigStandardDoclet.class.getSimpleName());
+    DocTrees docTrees = docEnv.getDocTrees();
+    for (Element element : docEnv.getIncludedElements()) {
+      if (element.getKind().equals(ElementKind.CLASS) && element instanceof TypeElement) {
+        processDoc(docTrees, (TypeElement) element);
+      }
+    }
+
+    return true;
+  }
+
+  private void processDoc(DocTrees docTrees, TypeElement doc) {
+    logMessage("Parsing : " + doc);
+    if (!doc.getKind().equals(ElementKind.CLASS)) {
+      logMessage("Ignoring non-class: " + doc);
+      return;
+    }
+
+    List<? extends AnnotationMirror> annotations = doc.getAnnotationMirrors();
+    boolean isConfigClass = false;
+    String templateName = null;
+    for (AnnotationMirror annotation : annotations) {
+      logMessage("Checking annotation: " + annotation.getAnnotationType());
+      if (annotation.getAnnotationType().asElement().toString().equals(
+          ConfigurationClass.class.getName())) {
+        isConfigClass = true;
+        Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues = annotation.getElementValues();
+        for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> element : elementValues.entrySet()) {
+          if (element.getKey().getSimpleName().toString().equals("templateFileName")) {
+            templateName = stripQuotes(element.getValue().getValue().toString());
+          }
+        }
+        break;
+      }
+    }
+
+    if (!isConfigClass) {
+      logMessage("Ignoring non-config class: " + doc);
+      return;
+    }
+
+    logMessage("Processing config class: " + doc);
+    Config config = new Config(doc.getSimpleName().toString(), templateName);
+    Map<String, ConfigProperty> configProperties = config.configProperties;
+
+    processElements(docTrees, doc, configProperties);
+
+    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);
+    }
+  }
+
+  private void processElements(DocTrees docTrees, TypeElement doc, Map<String, ConfigProperty> configProperties) {
+    List<? extends Element> elements = doc.getEnclosedElements();
+    for (Element f : elements) {
+      if (!(f instanceof VariableElement)) {
+        continue;
+      }
+
+      if (!f.getKind().equals(ElementKind.FIELD)) {
+        continue;
+      }
+
+      VariableElement field = (VariableElement) f;
+
+      if (field.getModifiers().contains(Modifier.PRIVATE)) {
+        logMessage("Skipping private field: " + field);
+        continue;
+      }
+      if (field.getModifiers().contains(Modifier.STATIC)) {
+        logMessage("Skipping non-static field: " + field);
+        continue;
+      }
+
+      String fieldName = field.getSimpleName().toString();
+      if (fieldName.endsWith("_PREFIX")) {
+        logMessage("Skipping non-config prefix constant field: " + field);
+        continue;
+      }
+      if (fieldName.equals("TEZ_SITE_XML")) {
+        logMessage("Skipping constant field: " + field);
+        continue;
+      }
+
+      if (fieldName.endsWith("_DEFAULT")) {
+
+        String name = fieldName.substring(0, fieldName.lastIndexOf("_DEFAULT"));
+        if (!configProperties.containsKey(name)) {
+          configProperties.put(name, new ConfigProperty());
+        }
+        ConfigProperty configProperty = configProperties.get(name);
+        if (field.getConstantValue() == null) {
+          String val = field.getConstantValue().toString();
+          logMessage("Got null constant value"
+              + ", name=" + name
+              + ", field=" + fieldName
+              + ", val=" + val);
+          configProperty.defaultValue = val;
+        } else {
+          configProperty.defaultValue = field.getConstantValue().toString();
+        }
+        configProperty.inferredType = field.getSimpleName().toString();
+
+        if (name.equals("TEZ_AM_STAGING_DIR") && configProperty.defaultValue != null) {
+          String defaultValue = configProperty.defaultValue;
+          defaultValue = defaultValue.replace(System.getProperty("user.name"), "${user.name}");
+          configProperty.defaultValue = defaultValue;
+        }
+
+        continue;
+      }
+
+      if (!configProperties.containsKey(fieldName)) {
+        configProperties.put(fieldName, new ConfigProperty());
+      }
+      ConfigProperty configProperty = configProperties.get(fieldName);
+      configProperty.propertyName = field.getConstantValue().toString();
+
+      List<? extends AnnotationMirror> annotationDescs = field.getAnnotationMirrors();
+
+      for (AnnotationMirror annotationDesc : annotationDescs) {
+        String elementFqName = annotationDesc.getAnnotationType().asElement().toString();
+        if (elementFqName.equals(Private.class.getCanonicalName())) {
+          configProperty.isPrivate = true;
+        }
+        if (elementFqName.equals(Unstable.class.getCanonicalName())) {
+          configProperty.isUnstable = true;
+        }
+        if (elementFqName.equals(Evolving.class.getCanonicalName())) {
+          configProperty.isEvolving = true;
+        }
+        if (elementFqName.equals(ConfigurationProperty.class.getCanonicalName())) {
+          configProperty.isValidConfigProp = true;
+
+          for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> element
+              : annotationDesc.getElementValues().entrySet()) {
+            if (element.getKey().getSimpleName().toString().equals("type")) {
+              configProperty.type = stripQuotes(element.getValue().getValue().toString());
+            } else {
+              logMessage("Unhandled annotation property: " + element.getKey().getSimpleName());
+            }
+          }
+        }
+      }
+      configProperty.description = docTrees.getDocCommentTree(field).getFullBody().toString();
+    }
+  }
+
+  @Override
+  public Set<? extends Option> getSupportedOptions() {
+    Option[] options = {
+        new Option() {
+          private final List<String> someOption = Arrays.asList(
+              "-debug",
+              "--debug"
+          );
+
+          @Override
+          public int getArgumentCount() {
+            return 0;
+          }
+
+          @Override
+          public String getDescription() {
+            return "Debug mode";
+          }
+
+          @Override
+          public Option.Kind getKind() {
+            return Kind.STANDARD;
+          }
+
+          @Override
+          public List<String> getNames() {
+            return someOption;
+          }
+
+          @Override
+          public String getParameters() {
+            return "";
+          }
+
+          @Override
+          public boolean process(String opt, List<String> arguments) {
+            debugMode = true;
+            return true;
+          }
+        }
+    };
+    return new HashSet<>(Arrays.asList(options));
+  }
+}
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java
new file mode 100644
index 0000000000..190ae4622e
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/doclet/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.tools.javadoc.doclet;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/Config.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
new file mode 100644
index 0000000000..834c3ab1c2
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/Config.java
@@ -0,0 +1,39 @@
+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.tools.javadoc.model;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+public class Config {
+
+  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);
+  }
+}
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
new file mode 100644
index 0000000000..3b3fdb3e7b
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java
@@ -0,0 +1,45 @@
+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.tools.javadoc.model;
+
+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;
+
+  @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-base/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java
new file mode 100644
index 0000000000..76acd05258
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/model/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.tools.javadoc.model;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
new file mode 100644
index 0000000000..286416e899
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/HtmlWriter.java
@@ -0,0 +1,160 @@
+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.tools.javadoc.util;
+
+import org.apache.tez.tools.javadoc.model.Config;
+import org.apache.tez.tools.javadoc.model.ConfigProperty;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+public class HtmlWriter extends Writer {
+
+  private static final String DEFAULT_STYLESHEET = "default-stylesheet.css";
+
+  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");
+    }
+
+    try {
+      File file = new File(config.configName + ".html");
+      out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.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("<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("<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;
+        }
+
+        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-base/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
new file mode 100644
index 0000000000..6242362e42
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/Writer.java
@@ -0,0 +1,36 @@
+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.tools.javadoc.util;
+
+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 boolean isValidConfigProperty(ConfigProperty configProperty) {
+    if (!configProperty.isValidConfigProp) {
+      return false;
+    }
+    return configProperty.propertyName != null && !configProperty.propertyName.isEmpty();
+  }
+}
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
new file mode 100644
index 0000000000..984cb94a20
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java
@@ -0,0 +1,108 @@
+/**
+ * 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
+ * <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.
+ * 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 java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+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), StandardCharsets.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 = Files.newOutputStream(file.toPath())) {
+      ByteStreams.copy(in, out);
+    }
+  }
+}
diff --git a/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java
new file mode 100644
index 0000000000..d458619729
--- /dev/null
+++ b/tez-tools/tez-javadoc-tools-base/src/main/java/org/apache/tez/tools/javadoc/util/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+@Private
+package org.apache.tez.tools.javadoc.util;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
diff --git a/tez-tools/tez-javadoc-tools/pom.xml b/tez-tools/tez-javadoc-tools/pom.xml
index 1ef4d13089..369c3bcbb6 100644
--- a/tez-tools/tez-javadoc-tools/pom.xml
+++ b/tez-tools/tez-javadoc-tools/pom.xml
@@ -78,6 +78,33 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>jdk8-16</id>
+      <activation>
+        <jdk>[8,16]</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.tez</groupId>
+          <artifactId>tez-javadoc-tools-base-jdk8</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    </profile>
+    <profile>
+      <id>jdk17plus</id>
+      <activation>
+        <!-- JDK9 starts strong encapsulation of Java internals, JDK17 removes/hides those -->
+        <jdk>[17,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.tez</groupId>
+          <artifactId>tez-javadoc-tools-base</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>