This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new bcc3819 PHOENIX-6922 Javadoc failure while building connectors with
Java 11
bcc3819 is described below
commit bcc3819c9580838cc746d9a02112b05d27a87872
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Apr 18 07:41:47 2023 +0200
PHOENIX-6922 Javadoc failure while building connectors with Java 11
skip Javadoc generation for Spark connector on JDK 9+
---
phoenix-spark-base/pom.xml | 7 +++++++
phoenix5-spark3/pom.xml | 7 +++++++
pom.xml | 11 +++++++++++
3 files changed, 25 insertions(+)
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
@@ -604,6 +604,13 @@
<target>1.8</target>
</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>
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>
