You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/08/01 16:54:21 UTC

[solr] branch branch_9x updated: SOLR-16298: Clean javadocs directory before building (#944)

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 3cfe8662b35 SOLR-16298: Clean javadocs directory before building (#944)
3cfe8662b35 is described below

commit 3cfe8662b35c7802aa4c37861326f533904e9f29
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Aug 1 12:51:18 2022 -0400

    SOLR-16298: Clean javadocs directory before building (#944)
    
    (cherry picked from commit d840a6fd40bc1682769d9ef087c6ad75a99ddf94)
---
 gradle/documentation/render-javadoc.gradle | 1 +
 solr/CHANGES.txt                           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index c56f609be5e..7cfc30dc520 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -267,6 +267,7 @@ class RenderJavadocTask extends DefaultTask {
     def optionsFile = project.file("${getTemporaryDir()}/javadoc-options.txt")
 
     // create the directory, so relative link calculation knows that it's a directory:
+    project.delete(outputDir);
     outputDir.mkdirs();
 
     def opts = []
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index da92ac2bef1..eaa4d70bdef 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -131,6 +131,8 @@ Build
 
 * SOLR-16299: Ref-guide examples are no longer symlinked from SolrJ, they live in the ref-guide module (Houston Putman)
 
+* SOLR-16298: Clean the javadocs directory before building (Houston Putman, Mike Drob, Uwe Schindler)
+
 ==================  9.0.0 ==================
 
 New Features