You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2020/09/14 16:38:38 UTC

[lucene-solr] 20/39: LUCENE-9490: skip checkMissingDocsDefault on runtime Java > 14.

This is an automated email from the ASF dual-hosted git repository.

thelabdude pushed a commit to branch reference_impl_gradle_updates
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 0adba5e5b15183bbbb1d8ab99a6ab47fcfa0c1f8
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Aug 29 17:17:24 2020 +0200

    LUCENE-9490: skip checkMissingDocsDefault on runtime Java > 14.
---
 gradle/testing/alternative-jdk-support.gradle |  4 ++++
 gradle/validation/missing-docs-check.gradle   | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradle
index 1e69291..f864b64 100644
--- a/gradle/testing/alternative-jdk-support.gradle
+++ b/gradle/testing/alternative-jdk-support.gradle
@@ -32,6 +32,9 @@ JavaInstallation altJvm = {
   }
 }()
 
+// Set up root project's property.
+rootProject.ext.runtimeJava = altJvm
+
 if (!currentJvm.javaExecutable.equals(altJvm.javaExecutable)) {
   // Set up java toolchain tasks to use the alternative Java.
   // This is a related Gradle issue for the future:
@@ -63,6 +66,7 @@ if (!currentJvm.javaExecutable.equals(altJvm.javaExecutable)) {
       options.forkOptions.javaHome = altJvm.installationDirectory.asFile
     }
 
+    // Javadoc compilation.
     def javadocExecutable = altJvm.jdk.get().javadocExecutable.asFile
     tasks.matching { it.name == "renderJavadoc" || it.name == "renderSiteJavadoc" }.all {
       dependsOn ":altJvmWarning"
diff --git a/gradle/validation/missing-docs-check.gradle b/gradle/validation/missing-docs-check.gradle
index 781208a..57399ec 100644
--- a/gradle/validation/missing-docs-check.gradle
+++ b/gradle/validation/missing-docs-check.gradle
@@ -37,6 +37,18 @@ allprojects {
     task checkMissingDocsDefault(type: CheckMissingDocsTask, dependsOn: 'renderJavadoc') {
       dirs += [ project.javadoc.destinationDir ]
 
+      onlyIf {
+        def maxSupported = JavaVersion.VERSION_14
+        def runtimeVersion = runtimeJava.javaVersion
+        if (runtimeVersion > JavaVersion.VERSION_14) {
+          logger.warn("Skipping task because runtime Java version ${runtimeVersion} is " +
+              "higher than Java ${maxSupported}.")
+          return false
+        } else {
+          return true
+        }
+      }
+
       // TODO: add missing docs for all classes and bump this to level=class
       if (project.path.startsWith(":solr")) {
         level = 'package'
@@ -72,7 +84,6 @@ configure(project(':lucene:core')) {
         "org/apache/lucene/index",
         "org/apache/lucene/codecs"
     ].collect { path -> file("${project.javadoc.destinationDir}/${path}") }
-
     checkMissingDocs {
       dependsOn checkMissingDocsMethod
     }