You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2024/02/25 15:38:07 UTC

(lucene) branch branch_9x updated: Remove hardcoded "--release" from renderJavadoc task (#13132)

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

uschindler pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 5683676765c Remove hardcoded "--release" from renderJavadoc task (#13132)
5683676765c is described below

commit 5683676765c422a407b9502fd9f8f88a5c3d55fc
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Feb 25 16:32:30 2024 +0100

    Remove hardcoded "--release" from renderJavadoc task (#13132)
    
    # Conflicts:
    #       gradle/documentation/render-javadoc.gradle
---
 gradle/documentation/render-javadoc.gradle | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index ff7a05a8f08..7c39f8e8567 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -55,6 +55,7 @@ allprojects {
       dependsOn sourceSets.main.compileClasspath
       classpath = sourceSets.main.compileClasspath
       srcDirSet = sourceSets.main.java
+      releaseVersion = rootProject.minJavaVersion
 
       outputDir = project.javadoc.destinationDir
     }
@@ -74,6 +75,7 @@ allprojects {
         dependsOn sourceSets.main.compileClasspath
         classpath = sourceSets.main.compileClasspath
         srcDirSet = sourceSets.main.java
+        releaseVersion = rootProject.minJavaVersion
 
         relativeProjectLinks = true
 
@@ -265,7 +267,10 @@ class RenderJavadocTask extends DefaultTask {
   boolean relativeProjectLinks = false
 
   @Input
-  def offlineLinks = [:]
+  JavaVersion releaseVersion
+
+  @Input
+  Map<String, File> offlineLinks = [:]
 
   @Input
   @Optional
@@ -399,7 +404,7 @@ class RenderJavadocTask extends DefaultTask {
       opts << [ '-linkoffline', url, dir ]
     }
 
-    opts << [ '--release', 11 ]
+    opts << [ '--release', releaseVersion.toString() ]
     opts << '-Xdoclint:all,-missing'
 
     // Increase Javadoc's heap.