[lucene-solr] branch LUCENE-9215 updated: fix merge problem

[us...@apache.org]

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

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


The following commit(s) were added to refs/heads/LUCENE-9215 by this push:
     new 0497790  fix merge problem
0497790 is described below

commit 0497790360d44497746be23ed56100502882b089
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Tue Sep 1 18:45:08 2020 +0200

    fix merge problem
---
 gradle/documentation/render-javadoc.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index 39116cc..a34d8a1 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -84,12 +84,6 @@ allprojects {
   project.tasks.withType(RenderJavadocTask) {
     title = "${project.path.startsWith(':lucene') ? 'Lucene' : 'Solr'} ${project.version} ${project.name} API"
 
-    // Set up titles and link up some offline docs for all documentation
-    // (they may be unused but this doesn't do any harm).
-    def taskResources = "${rootProject.projectDir}/gradle/documentation/render-javadoc"
-    def javaJavadocPackages = rootProject.file("${taskResources}/java11/")
-    def junitJavadocPackages = rootProject.file("${taskResources}/junit/")
-
     offlineLinks += [
         "https://docs.oracle.com/en/java/javase/11/docs/api/": javaJavadocPackages,
         "https://junit.org/junit4/javadoc/4.12/": junitJavadocPackages