Merge remote-tracking branch 'upstream/master'

* upstream/master: (218 commits) LUCENE-9412 Do not validate jenkins HTTPS cert LUCENE-8962: add ability to selectively merge on commit (apache#1552) Replace DWPT.DocState with simple method parameters (apache#1594) LUCENE-9402: Let MultiCollector handle minCompetitiveScore (apache#1567) SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 2) SOLR-14561 CoreAdminAPI's parameters instanceDir and dataDir are now validated (apache#1572) SOLR-14532: Add *.iml files to gitignore SOLR-14577: Return BAD REQUEST when field is missing in terms QP (apache#1588) SOLR-14574: Fix or suppress warnings in solr/core/src/test (part 1) remove debug code LUCENE-9408: roll back only called once enforcement LUCENE-8962: Allow waiting for all merges in a merge spec (apache#1585) SOLR-14572 document missing SearchComponents (apache#1581) LUCENE-9359: Avoid test failures when the extra file is a dir. SOLR-14573: Fix or suppress warnings in solrj/src/test LUCENE-9353: Move terms metadata to its own file. (apache#1473) Cleanup TermsHashPerField (apache#1573) SOLR-14558: Record all log lines in SolrLogPostTool (apache#1570) LUCENE-9404: simplify checksum calculation of ByteBuffersIndexOutput LUCENE-9403: tune BufferedChecksum.DEFAULT_BUFFERSIZE ...
MarcusSorealheis · Jun 20, 2020 · f599df5 · f599df5
2 parents 4fbeb9d + 591d844
commit f599df5
Show file tree

Hide file tree

Showing 2,027 changed files with 39,522 additions and 25,714 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ lucene/**/*.iml
 parent.iml
 *.ipr
 *.iws
+/*.iml
 /.project
 /.classpath
 /.settings

diff --git a/build.gradle b/build.gradle
@@ -21,14 +21,17 @@ import java.time.format.DateTimeFormatter
 plugins {
   id "base"
   id "com.palantir.consistent-versions" version "1.14.0"
-  id 'de.thetaphi.forbiddenapis' version '3.0' apply false
+  id 'de.thetaphi.forbiddenapis' version '3.0.1' apply false
   id "org.owasp.dependencycheck" version "5.3.0"
   id "de.undercouch.download" version "4.0.2" apply false
 }
 
 // Project version.
 version = "9.0.0-SNAPSHOT"
 
+// General metadata.
+description = 'Grandparent project for Apache Lucene Core and Apache Solr'
+
 // Propagate version and derived properties across projects.
 allprojects {
   version = rootProject.version
@@ -43,6 +46,16 @@ ext {
     }
     return m[0][1]
   }()
+  // "majorVersion" is an integer with just the major version. Compute it.
+  majorVersion = {
+    def m = (version =~ /^(\d+)\.\d+\.\d+(-(.+))?/)
+    if (!m) {
+      throw GradleException("Can't strip version to just major version: " + rootProject.version)
+    }
+    return m[0][1] as int
+  }
+  // snapshot build marker used in scripts.
+  snapshotBuild = version.contains("SNAPSHOT")
 
   // Build timestamp.
   def tstamp = ZonedDateTime.now()
@@ -58,6 +71,7 @@ ext {
       "javacc": "5.0",
       "jflex": "1.7.0",
       "jgit": "5.3.0.201903130848-r",
+      "flexmark": "0.61.24",
   ]
 }
 
@@ -77,7 +91,6 @@ apply from: file('gradle/ant-compat/folder-layout.gradle')
 // (java, tests)
 apply from: file('gradle/defaults.gradle')
 apply from: file('gradle/defaults-java.gradle')
-apply from: file('gradle/render-javadoc.gradle')
 apply from: file('gradle/testing/defaults-tests.gradle')
 apply from: file('gradle/testing/randomization.gradle')
 apply from: file('gradle/testing/fail-on-no-tests.gradle')
@@ -104,6 +117,7 @@ apply from: file('gradle/validation/ecj-lint.gradle')
 apply from: file('gradle/validation/gradlew-scripts-tweaked.gradle')
 apply from: file('gradle/validation/missing-docs-check.gradle')
 apply from: file('gradle/validation/validate-log-calls.gradle')
+apply from: file('gradle/validation/check-broken-links.gradle')
 
 // Source or data regeneration tasks
 apply from: file('gradle/generation/jflex.gradle')
@@ -134,3 +148,5 @@ apply from: file('gradle/ant-compat/forbidden-api-rules-in-sync.gradle')
 
 apply from: file('gradle/documentation/documentation.gradle')
 apply from: file('gradle/documentation/changes-to-html.gradle')
+apply from: file('gradle/documentation/markdown.gradle')
+apply from: file('gradle/render-javadoc.gradle')
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
@@ -67,6 +67,13 @@
     </maintainer>
 
     <!-- NOTE: please insert releases in numeric order, NOT chronologically. -->
+   <release>
+       <Version>
+         <name>lucene-8.5.2</name>
+         <created>2020-05-26</created>
+         <revision>8.5.2</revision>
+       </Version>
+   </release>
    <release>
        <Version>
          <name>lucene-8.5.1</name>
@@ -137,6 +144,13 @@
         <revision>8.0.0</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>lucene-7.7.3</name>
+        <created>2020-04-28</created>
+        <revision>7.7.3</revision>
+      </Version>
+    </release>
     <release>
       <Version>
         <name>lucene-7.7.2</name>

diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
@@ -67,6 +67,13 @@
     </maintainer>
 
     <!-- NOTE: please insert releases in numeric order, NOT chronologically. -->
+    <release>
+         <Version>
+           <name>solr-8.5.2</name>
+           <created>2020-05-26</created>
+           <revision>8.5.2</revision>
+         </Version>
+    </release>
     <release>
          <Version>
            <name>solr-8.5.1</name>
@@ -137,6 +144,13 @@
         <revision>8.0.0</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>solr-7.7.3</name>
+        <created>2020-04-28</created>
+        <revision>7.7.3</revision>
+      </Version>
+    </release>
     <release>
       <Version>
         <name>solr-7.7.2</name>

diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
@@ -159,7 +159,7 @@
         <plugin>
           <groupId>de.thetaphi</groupId>
           <artifactId>forbiddenapis</artifactId>
-          <version>2.7</version>
+          <version>3.0.1</version>
           <configuration>
             <!--
               This is the default setting, we don't support too new Java versions.

diff --git a/dev-tools/scripts/poll-mirrors.py b/dev-tools/scripts/poll-mirrors.py
@@ -44,8 +44,10 @@ def p(s):
 
 def mirror_contains_file(url):
   url = urlparse(url)
-
-  if url.scheme == 'http':
+
+  if url.scheme == 'https':
+    return https_file_exists(url)
+  elif url.scheme == 'http':
     return http_file_exists(url)
   elif url.scheme == 'ftp':
     return ftp_file_exists(url)
@@ -65,6 +67,18 @@ def http_file_exists(url):
 
   return exists
 
+def https_file_exists(url):
+  exists = False
+
+  try:
+    conn = http.HTTPSConnection(url.netloc)
+    conn.request('HEAD', url.path)
+    response = conn.getresponse()
+    exists = response.status == 200
+  except:
+    pass
+
+  return exists
 
 def ftp_file_exists(url):
   listing = []
@@ -112,7 +126,7 @@ def check_mirror(url):
   sys.exit(1)
 
 mirror_path = args.path if args.path is not None else 'lucene/java/{}/changes/Changes.html'.format(args.version)
-maven_url = None if args.version is None else 'http://repo1.maven.org/maven2/' \
+maven_url = None if args.version is None else 'https://repo1.maven.org/maven2/' \
     'org/apache/lucene/lucene-core/{0}/lucene-core-{0}.pom.asc'.format(args.version)
 maven_available = False