From c7e56c8eda7f49431773e021ebccbfd9ed00d2af Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Thu, 15 Aug 2024 15:14:10 +0200 Subject: [PATCH] fix actual javadoc error, and revert some changes --- .github/workflows/maven.yml | 1 - .../hive/ql/pushdown/PhoenixSearchCondition.java | 2 +- .../hive/ql/pushdown/PhoenixSearchCondition.java | 2 +- pom.xml | 16 +++++++++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0164d1c4..1a35ec01 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,6 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 - # cannot ignore javadoc violations on Zulu distribution: 'temurin' - name: Test run: | diff --git a/phoenix5-hive/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java b/phoenix5-hive/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java index bf27835c..37a89a7d 100644 --- a/phoenix5-hive/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java +++ b/phoenix5-hive/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java @@ -29,7 +29,7 @@ /** * IndexSearchCondition represents an individual search condition found by - * {@link IndexPredicateAnalyzer}. + * {@link PhoenixPredicateAnalyzer}. * */ public class PhoenixSearchCondition { diff --git a/phoenix5-hive4/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java b/phoenix5-hive4/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java index bf27835c..37a89a7d 100644 --- a/phoenix5-hive4/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java +++ b/phoenix5-hive4/src/main/java/org/apache/phoenix/hive/ql/pushdown/PhoenixSearchCondition.java @@ -29,7 +29,7 @@ /** * IndexSearchCondition represents an individual search condition found by - * {@link IndexPredicateAnalyzer}. + * {@link PhoenixPredicateAnalyzer}. * */ public class PhoenixSearchCondition { diff --git a/pom.xml b/pom.xml index 89f63169..99602a98 100644 --- a/pom.xml +++ b/pom.xml @@ -361,9 +361,6 @@ 8 true - - -Xdoclint:none @@ -430,6 +427,9 @@ jar + + ${javadoc.opts} + @@ -988,6 +988,16 @@ ${phoenix-surefire.jdk11.flags} ${phoenix-surefire.jdk17.flags} ${phoenix-surefire.jdk17.tuning.flags} ${phoenix-surefire.argLine} + + + java8-doclint-disabled + + [1.8,) + + + -Xdoclint:none + + disable-javadoc-for-spark