diff --git a/phoenix-spark-base/pom.xml b/phoenix-spark-base/pom.xml
index 353841c..6b64570 100644
--- a/phoenix-spark-base/pom.xml
+++ b/phoenix-spark-base/pom.xml
@@ -605,6 +605,13 @@
           </configuration>
         </plugin>
         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+                <skip>${skip.spark.javadoc}</skip>
+            </configuration>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <executions>
diff --git a/phoenix5-spark3/pom.xml b/phoenix5-spark3/pom.xml
index 13ff51a..aad4d9e 100644
--- a/phoenix5-spark3/pom.xml
+++ b/phoenix5-spark3/pom.xml
@@ -183,6 +183,13 @@
             </ignoredDependencies>
           </configuration>
         </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+                <skip>${skip.spark.javadoc}</skip>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 575fa2e..caeaf31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,7 @@
     <phoenix.main.version>4</phoenix.main.version>
 
     <skip-scala-tests>true</skip-scala-tests>
+    <skip.spark.javadoc>false</skip.spark.javadoc>
   </properties>
 
   <build>
@@ -927,6 +928,16 @@
         <javadoc.opts>-Xdoclint:none</javadoc.opts>
       </properties>
     </profile>
+    <!-- Skip Javadoc for 1.8+ See PHOENIX-6922 -->
+    <profile>
+        <id>disable-javadoc-for-spark</id>
+        <activation>
+            <jdk>(8,)</jdk>
+        </activation>
+        <properties>
+            <skip.spark.javadoc>true</skip.spark.javadoc>
+        </properties>
+    </profile>
     <!-- this profile should be activated for release builds -->
     <profile>
       <id>release</id>