From e444df1435f3e24e6f09db47d9d369b3d4e85f12 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 12 Oct 2020 12:25:13 +0200 Subject: [PATCH] SOLR-14922: Include solr-ref-guide tasks in sourceSets for IntelliJ (#1973) --- gradle/ide/intellij-idea.gradle | 16 ---------------- solr/solr-ref-guide/tools/BuildNavDataFiles.java | 1 - .../tools/CheckLinksAndAnchors.java | 11 ----------- 3 files changed, 28 deletions(-) diff --git a/gradle/ide/intellij-idea.gradle b/gradle/ide/intellij-idea.gradle index edc17d6090c..1d5b8d21bd5 100644 --- a/gradle/ide/intellij-idea.gradle +++ b/gradle/ide/intellij-idea.gradle @@ -35,19 +35,3 @@ allprojects { } } } - -// Remove tools source set entirely if we're running under IntelliJ. Otherwise -// files that reference ant can't be compiled. -if (isIdea) { - configure(project(":solr:solr-ref-guide")) { - afterEvaluate { - sourceSets { - main { - java { - srcDirs = [] - } - } - } - } - } -} \ No newline at end of file diff --git a/solr/solr-ref-guide/tools/BuildNavDataFiles.java b/solr/solr-ref-guide/tools/BuildNavDataFiles.java index dbba9ca3d51..548573f3c37 100644 --- a/solr/solr-ref-guide/tools/BuildNavDataFiles.java +++ b/solr/solr-ref-guide/tools/BuildNavDataFiles.java @@ -18,7 +18,6 @@ import java.io.*; import java.io.FilenameFilter; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.json.*; diff --git a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java index 7aeb1ed7723..b2fe1a53a64 100644 --- a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java +++ b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java @@ -20,29 +20,19 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.net.MalformedURLException; -import java.nio.file.Files; -import java.util.Arrays; import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.nodes.Node; -import org.jsoup.nodes.TextNode; -import org.jsoup.parser.Parser; import org.jsoup.parser.Tag; import org.jsoup.select.Elements; -import org.jsoup.select.NodeVisitor; /** * Check various things regarding anchors, links & general doc structure in the generated HTML site. @@ -422,5 +412,4 @@ public class CheckLinksAndAnchors { // TODO: rename this class now that it does } return s.substring(0, 17) + "..."; } - }