You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/08/25 17:20:04 UTC

[lucene-solr] branch jira/SOLR-13452_gradle_5 updated: SOLR-13452: Start excluding more of the tika parser deps, start organizing groovy classes a bit more, rename TestEnforcers to TestChecks.

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

markrmiller pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_5 by this push:
     new f0c678d  SOLR-13452: Start excluding more of the tika parser deps, start organizing groovy classes a bit more, rename TestEnforcers to TestChecks.
f0c678d is described below

commit f0c678dc6b936e7a113832384f3a55c52fe51a95
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Aug 25 12:18:09 2019 -0500

    SOLR-13452: Start excluding more of the tika parser deps, start organizing groovy classes a bit more, rename TestEnforcers to TestChecks.
---
 build.gradle                                       |  28 ++--
 .../java/{TestEnforcers.java => TestChecks.java}   |   4 +-
 .../org/apache/lucene/gradle/TestResultObj.groovy  |   3 +
 .../gradle/{ => checks}/CheckSourcePatterns.groovy |   2 +-
 .../gradle/{ => checks}/CheckWorkingCopy.groovy    |   2 +-
 .../LuceneSolrForbiddenApisPlugin.groovy           |   2 +-
 .../lucene/gradle/{ => checks}/RatSources.groovy   |   2 +-
 .../lucene/gradle/{ => deps}/FindInSrc.groovy      |   2 +-
 .../lucene/gradle/{ => deps}/JdepsReport.groovy    |   4 +-
 .../lucene/gradle/{ => deps}/ListDeps.groovy       |   2 +-
 .../lucene/gradle/{ => deps}/MissingDeps.groovy    |   2 +-
 .../lucene/gradle/{ => deps}/UnusedDeps.groovy     |   2 +-
 .../gradle/{ => dist}/PackageLuceneSolrDist.groovy |   5 +-
 .../lucene/gradle/{ => dist}/PartOfDist.groovy     |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 lucene/analysis/common/build.gradle                |   2 +-
 lucene/analysis/icu/build.gradle                   |   2 +-
 lucene/analysis/kuromoji/build.gradle              |   2 +-
 lucene/analysis/morfologik/build.gradle            |   2 +-
 lucene/analysis/nori/build.gradle                  |   2 +-
 lucene/analysis/opennlp/build.gradle               |   2 +-
 lucene/analysis/phonetic/build.gradle              |   2 +-
 lucene/analysis/smartcn/build.gradle               |   2 +-
 lucene/analysis/stempel/build.gradle               |   2 +-
 lucene/backward-codecs/build.gradle                |   2 +-
 lucene/benchmark/build.gradle                      |   2 +-
 lucene/build.gradle                                |   2 +-
 lucene/classification/build.gradle                 |   2 +-
 lucene/codecs/build.gradle                         |   2 +-
 lucene/core/build.gradle                           |   2 +-
 lucene/expressions/build.gradle                    |   2 +-
 lucene/facet/build.gradle                          |   2 +-
 lucene/grouping/build.gradle                       |   2 +-
 lucene/highlighter/build.gradle                    |   2 +-
 lucene/join/build.gradle                           |   2 +-
 lucene/luke/build.gradle                           |   2 +-
 lucene/memory/build.gradle                         |   2 +-
 lucene/misc/build.gradle                           |   2 +-
 lucene/monitor/build.gradle                        |   2 +-
 lucene/queries/build.gradle                        |   2 +-
 lucene/queryparser/build.gradle                    |   2 +-
 lucene/replicator/build.gradle                     |   2 +-
 lucene/sandbox/build.gradle                        |   2 +-
 lucene/spatial-extras/build.gradle                 |   2 +-
 lucene/spatial/build.gradle                        |   2 +-
 lucene/spatial3d/build.gradle                      |   2 +-
 lucene/suggest/build.gradle                        |   2 +-
 lucene/test-framework/build.gradle                 |   2 +-
 solr/build.gradle                                  |   2 +-
 solr/contrib/analysis-extras/build.gradle          |   2 +-
 solr/contrib/analytics/build.gradle                |   2 +-
 solr/contrib/clustering/build.gradle               |   2 +-
 solr/contrib/dataimporthandler-extras/build.gradle |   7 +-
 solr/contrib/dataimporthandler/build.gradle        |   2 +-
 solr/contrib/extraction/build.gradle               |   6 +-
 solr/contrib/langid/build.gradle                   |   2 +-
 solr/contrib/ltr/build.gradle                      |   2 +-
 solr/contrib/prometheus-exporter/build.gradle      |   2 +-
 solr/contrib/velocity/build.gradle                 |   2 +-
 solr/core/build.gradle                             |   4 +-
 solr/example/example-DIH/build.gradle              |   2 +-
 solr/server/build.gradle                           |   2 +-
 solr/solrj/build.gradle                            |   2 +-
 solr/test-framework/build.gradle                   |   2 +-
 versions.lock                                      | 163 ++++++++-------------
 versions.props                                     |   5 +-
 66 files changed, 154 insertions(+), 187 deletions(-)

diff --git a/build.gradle b/build.gradle
index acee1d5..5b8c926 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,16 @@
  * limitations under the License.
  */
 
-import org.apache.lucene.gradle.CheckWorkingCopy
-import org.apache.lucene.gradle.LuceneSolrForbiddenApisPlugin
+import org.apache.lucene.gradle.checks.CheckWorkingCopy
+import org.apache.lucene.gradle.checks.LuceneSolrForbiddenApisPlugin
+import org.apache.lucene.gradle.checks.RatSources
+import org.apache.lucene.gradle.checks.CheckSourcePatterns
+import org.apache.lucene.gradle.deps.MissingDeps
+import org.apache.lucene.gradle.deps.UnusedDeps
+import org.apache.lucene.gradle.deps.ListDeps
+import org.apache.lucene.gradle.deps.JdepsReport
+import org.apache.lucene.gradle.TopHints
+import org.apache.lucene.gradle.PristineClean
 import org.gradle.api.Project
 import org.apache.commons.io.FilenameUtils
 import com.google.common.base.Strings
@@ -73,7 +81,7 @@ configure(luceneSolrProjects) {
     rat project(':buildSrc')
   }
   
-  task ratSources(type: org.apache.lucene.gradle.RatSources) {
+  task ratSources(type: RatSources) {
       group = 'Verification'
       description = "Checks source files for proper license headers."
       excludes = [
@@ -115,7 +123,7 @@ configure(luceneSolrSubProjects) {
     
   plugins.withType(JavaPlugin) {
 
-    task checkSourcePatterns(type: org.apache.lucene.gradle.CheckSourcePatterns) {
+    task checkSourcePatterns(type: CheckSourcePatterns) {
       group = 'Verification'
       description = "Checks source files for project violations."
       baseDir = projectDir
@@ -192,12 +200,12 @@ configure(rootProject) {
   tasks.create('checkWorkingCopy', CheckWorkingCopy, false)
   
   
-  task testTimes(type: org.apache.lucene.gradle.TopHints) {
+  task testTimes(type: TopHints) {
     group = 'Tests'
     description = "Show the slowest tests (averages)."
   }
   
-  task pristineClean(type: org.apache.lucene.gradle.PristineClean) {}
+  task pristineClean(type: PristineClean) {}
   
   ext.testsResults = [] // test result summaries
   
@@ -256,11 +264,11 @@ configure(allprojects) {
   
   plugins.withType(JavaPlugin) {
     
-    task jdepsReport(type: org.apache.lucene.gradle.JdepsReport) {
+    task jdepsReport(type: JdepsReport) {
       target = jdepsReportDir
     }
     
-    task listDependencies(type: org.apache.lucene.gradle.ListDeps) {
+    task listDependencies(type: ListDeps) {
       group = 'Help'
       description = "List sorted dependencies and counts for a module."
     }
@@ -268,7 +276,7 @@ configure(allprojects) {
     task unusedDependencies {
       group = 'Help'
       description = "Lists dependencies that may be unused for a module."
-      task unusedDeps(type: org.apache.lucene.gradle.UnusedDeps) {
+      task unusedDeps(type: UnusedDeps) {
         inputDirectory jdepsReportDir
       }
       unusedDeps.dependsOn jdepsReport
@@ -280,7 +288,7 @@ configure(allprojects) {
     task missingDependencies {
       group = 'Help'
       description = "Lists classes from this module with missing runtime dependencies (we ignore scanning some root deps (ie hadoop) and some violations (ie annotations)."
-      task missingDeps(type: org.apache.lucene.gradle.MissingDeps) {
+      task missingDeps(type: MissingDeps) {
         inputDirectory jdepsReportDir
       }
       missingDeps.dependsOn jdepsReport
diff --git a/buildSrc/src/buildTest/java/TestEnforcers.java b/buildSrc/src/buildTest/java/TestChecks.java
similarity index 97%
rename from buildSrc/src/buildTest/java/TestEnforcers.java
rename to buildSrc/src/buildTest/java/TestChecks.java
index dcbd5ed..4bcdbb1 100644
--- a/buildSrc/src/buildTest/java/TestEnforcers.java
+++ b/buildSrc/src/buildTest/java/TestChecks.java
@@ -18,9 +18,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class TestEnforcers extends BaseTestClass {
+public class TestChecks extends BaseTestClass {
   
-  public TestEnforcers() {
+  public TestChecks() {
 
   }
   
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/TestResultObj.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/TestResultObj.groovy
index a41b9c7..89cdd5e 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/TestResultObj.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/TestResultObj.groovy
@@ -16,6 +16,9 @@ package org.apache.lucene.gradle
  * limitations under the License.
  */
 
+/**
+ * Holds test run results for a pretty print console report.
+ */
 class TestResultObj {
   
   private String summary
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckSourcePatterns.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckSourcePatterns.groovy
index ec5a182..7a2e97f 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckSourcePatterns.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.checks
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckWorkingCopy.groovy
similarity index 98%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckWorkingCopy.groovy
index e475350..2020489 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/CheckWorkingCopy.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.checks
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/LuceneSolrForbiddenApisPlugin.groovy
similarity index 98%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/LuceneSolrForbiddenApisPlugin.groovy
index 4aae479..ffa717d 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/LuceneSolrForbiddenApisPlugin.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.checks
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/RatSources.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/RatSources.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/RatSources.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/RatSources.groovy
index 3247086..1c5cccc 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/RatSources.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/checks/RatSources.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.checks
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/FindInSrc.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/FindInSrc.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/FindInSrc.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/FindInSrc.groovy
index 361f20e..9376c33 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/FindInSrc.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/FindInSrc.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.deps
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/JdepsReport.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/JdepsReport.groovy
similarity index 98%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/JdepsReport.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/JdepsReport.groovy
index 9721bd3..2a45ea1 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/JdepsReport.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/JdepsReport.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.deps
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -44,6 +44,8 @@ import java.nio.file.Files
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
+import org.apache.lucene.gradle.dist.PartOfDist
+
 class JdepsReport extends DefaultTask {
   
   protected configuration = "runtimeClasspath"
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/ListDeps.groovy
similarity index 98%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/ListDeps.groovy
index b330eac..e18032d 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/ListDeps.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.deps
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/MissingDeps.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/MissingDeps.groovy
index ae73aa4..fe55a66 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/MissingDeps.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.deps
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/UnusedDeps.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/UnusedDeps.groovy
index 56da786..8d1e35c 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/deps/UnusedDeps.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.deps
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PackageLuceneSolrDist.groovy
similarity index 98%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PackageLuceneSolrDist.groovy
index 9d7f1f3..ff08fcb 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PackageLuceneSolrDist.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.dist
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,7 @@ package org.apache.lucene.gradle
 
 import javax.inject.Inject
 
-import org.apache.lucene.gradle.PartOfDist
-
+import org.apache.lucene.gradle.dist.PartOfDist
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PartOfDist.groovy
similarity index 96%
rename from buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy
rename to buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PartOfDist.groovy
index 935296f..596d489 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/dist/PartOfDist.groovy
@@ -1,4 +1,4 @@
-package org.apache.lucene.gradle
+package org.apache.lucene.gradle.dist
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1be1431..f7373ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lucene/analysis/common/build.gradle b/lucene/analysis/common/build.gradle
index cbf4e55..b810d67 100644
--- a/lucene/analysis/common/build.gradle
+++ b/lucene/analysis/common/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-common'
 
diff --git a/lucene/analysis/icu/build.gradle b/lucene/analysis/icu/build.gradle
index ef28ffc..4ec5fa3 100644
--- a/lucene/analysis/icu/build.gradle
+++ b/lucene/analysis/icu/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-icu'
 
diff --git a/lucene/analysis/kuromoji/build.gradle b/lucene/analysis/kuromoji/build.gradle
index 407b911..b3a2f6d 100644
--- a/lucene/analysis/kuromoji/build.gradle
+++ b/lucene/analysis/kuromoji/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-kuromoji'
 
diff --git a/lucene/analysis/morfologik/build.gradle b/lucene/analysis/morfologik/build.gradle
index c557d59..044441a 100644
--- a/lucene/analysis/morfologik/build.gradle
+++ b/lucene/analysis/morfologik/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-morfologik'
 
diff --git a/lucene/analysis/nori/build.gradle b/lucene/analysis/nori/build.gradle
index 55fbd6d..d253c5f 100644
--- a/lucene/analysis/nori/build.gradle
+++ b/lucene/analysis/nori/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-nori'
 
diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradle
index 2928434..a43cb38 100644
--- a/lucene/analysis/opennlp/build.gradle
+++ b/lucene/analysis/opennlp/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-opennlp'
 
diff --git a/lucene/analysis/phonetic/build.gradle b/lucene/analysis/phonetic/build.gradle
index 0eaade6..1759ebd 100644
--- a/lucene/analysis/phonetic/build.gradle
+++ b/lucene/analysis/phonetic/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-phonetic'
 
diff --git a/lucene/analysis/smartcn/build.gradle b/lucene/analysis/smartcn/build.gradle
index 6d93b4e..7746a6e 100644
--- a/lucene/analysis/smartcn/build.gradle
+++ b/lucene/analysis/smartcn/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-smartcn'
 
diff --git a/lucene/analysis/stempel/build.gradle b/lucene/analysis/stempel/build.gradle
index 57092f3..e2e77dd 100644
--- a/lucene/analysis/stempel/build.gradle
+++ b/lucene/analysis/stempel/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-analyzers-stempel'
 
diff --git a/lucene/backward-codecs/build.gradle b/lucene/backward-codecs/build.gradle
index 43e80a1..292dc6f 100644
--- a/lucene/backward-codecs/build.gradle
+++ b/lucene/backward-codecs/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 task jarTest (type: Jar) {
   from sourceSets.test.output
diff --git a/lucene/benchmark/build.gradle b/lucene/benchmark/build.gradle
index 6243918..c61e108 100644
--- a/lucene/benchmark/build.gradle
+++ b/lucene/benchmark/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 def workingDir = file("work")
 
diff --git a/lucene/build.gradle b/lucene/build.gradle
index 886f030..0859631 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -28,7 +28,7 @@ tasks.create('checkLicenses', LicenseCheckTask, file('licenses'))
 
 tasks.create('jarChecksums', JarChecksum, file('.'), file('licenses'))
 
-task packageDist(type: org.apache.lucene.gradle.PackageLuceneSolrDist) {
+task packageDist(type: org.apache.lucene.gradle.dist.PackageLuceneSolrDist) {
   group = 'Dist'
   description = 'Generates the Lucene and Solr distribution.'
 }
diff --git a/lucene/classification/build.gradle b/lucene/classification/build.gradle
index 82e3ca2..47e54e6 100644
--- a/lucene/classification/build.gradle
+++ b/lucene/classification/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/codecs/build.gradle b/lucene/codecs/build.gradle
index a29c64f..e8e2229 100644
--- a/lucene/codecs/build.gradle
+++ b/lucene/codecs/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/core/build.gradle b/lucene/core/build.gradle
index 528382f..fa9e477 100644
--- a/lucene/core/build.gradle
+++ b/lucene/core/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-core'
 
diff --git a/lucene/expressions/build.gradle b/lucene/expressions/build.gradle
index 628d7df..003809e 100644
--- a/lucene/expressions/build.gradle
+++ b/lucene/expressions/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/facet/build.gradle b/lucene/facet/build.gradle
index 606a1a4..2aa2cff 100644
--- a/lucene/facet/build.gradle
+++ b/lucene/facet/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/grouping/build.gradle b/lucene/grouping/build.gradle
index 8ad4828..9b78011 100644
--- a/lucene/grouping/build.gradle
+++ b/lucene/grouping/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/highlighter/build.gradle b/lucene/highlighter/build.gradle
index 20ab1a4..53f32c5 100644
--- a/lucene/highlighter/build.gradle
+++ b/lucene/highlighter/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/join/build.gradle b/lucene/join/build.gradle
index 063773e..369e860 100644
--- a/lucene/join/build.gradle
+++ b/lucene/join/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/luke/build.gradle b/lucene/luke/build.gradle
index 2b76181..53af595 100644
--- a/lucene/luke/build.gradle
+++ b/lucene/luke/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':lucene:lucene-core')
diff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradle
index 634e970..b0c72a9 100644
--- a/lucene/memory/build.gradle
+++ b/lucene/memory/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':lucene:lucene-core')
diff --git a/lucene/misc/build.gradle b/lucene/misc/build.gradle
index 386dbf6..3f54cfd 100644
--- a/lucene/misc/build.gradle
+++ b/lucene/misc/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/monitor/build.gradle b/lucene/monitor/build.gradle
index 5488eeb..067e110 100644
--- a/lucene/monitor/build.gradle
+++ b/lucene/monitor/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':lucene:lucene-core')
diff --git a/lucene/queries/build.gradle b/lucene/queries/build.gradle
index 37f70c3..eb41991 100644
--- a/lucene/queries/build.gradle
+++ b/lucene/queries/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':lucene:lucene-core')
diff --git a/lucene/queryparser/build.gradle b/lucene/queryparser/build.gradle
index 359222b..965f0f8 100644
--- a/lucene/queryparser/build.gradle
+++ b/lucene/queryparser/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 task jarTest (type: Jar) {
   from sourceSets.test.output
diff --git a/lucene/replicator/build.gradle b/lucene/replicator/build.gradle
index 133bcce..263fdbe 100644
--- a/lucene/replicator/build.gradle
+++ b/lucene/replicator/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   api project(':lucene:lucene-core')
diff --git a/lucene/sandbox/build.gradle b/lucene/sandbox/build.gradle
index fe9608e..1297c72 100644
--- a/lucene/sandbox/build.gradle
+++ b/lucene/sandbox/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/spatial-extras/build.gradle b/lucene/spatial-extras/build.gradle
index 61f4c8e..10fe70a 100644
--- a/lucene/spatial-extras/build.gradle
+++ b/lucene/spatial-extras/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/spatial/build.gradle b/lucene/spatial/build.gradle
index 063773e..369e860 100644
--- a/lucene/spatial/build.gradle
+++ b/lucene/spatial/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/lucene/spatial3d/build.gradle b/lucene/spatial3d/build.gradle
index 8741508..7000739 100644
--- a/lucene/spatial3d/build.gradle
+++ b/lucene/spatial3d/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 task jarTest (type: Jar) {
   from sourceSets.test.output
diff --git a/lucene/suggest/build.gradle b/lucene/suggest/build.gradle
index 47df86a..aca4389 100644
--- a/lucene/suggest/build.gradle
+++ b/lucene/suggest/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':lucene:lucene-core')
diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle
index db3ffc4..89694bd 100644
--- a/lucene/test-framework/build.gradle
+++ b/lucene/test-framework/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'lucene-test-framework'
 
diff --git a/solr/build.gradle b/solr/build.gradle
index 183fb0c..02a69cc 100644
--- a/solr/build.gradle
+++ b/solr/build.gradle
@@ -38,7 +38,7 @@ task getStartJar(type: Copy) {
   }
 }
 
-task packageDist(type: org.apache.lucene.gradle.PackageLuceneSolrDist) {
+task packageDist(type: org.apache.lucene.gradle.dist.PackageLuceneSolrDist) {
   group = 'Dist'
   description = 'Generates the Lucene and Solr distribution.'
   
diff --git a/solr/contrib/analysis-extras/build.gradle b/solr/contrib/analysis-extras/build.gradle
index f9c2a93..5c8dc15 100644
--- a/solr/contrib/analysis-extras/build.gradle
+++ b/solr/contrib/analysis-extras/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/solr/contrib/analytics/build.gradle b/solr/contrib/analytics/build.gradle
index 798d821..d2444a5 100644
--- a/solr/contrib/analytics/build.gradle
+++ b/solr/contrib/analytics/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':solr:solr-core')
diff --git a/solr/contrib/clustering/build.gradle b/solr/contrib/clustering/build.gradle
index 885c227..c89e698 100644
--- a/solr/contrib/clustering/build.gradle
+++ b/solr/contrib/clustering/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/solr/contrib/dataimporthandler-extras/build.gradle b/solr/contrib/dataimporthandler-extras/build.gradle
index efec887..d660bf8 100644
--- a/solr/contrib/dataimporthandler-extras/build.gradle
+++ b/solr/contrib/dataimporthandler-extras/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':solr:solr-core')
@@ -32,8 +32,9 @@ dependencies {
   implementation ('com.sun.mail:gimap')
   implementation ('commons-io:commons-io')
   
-  implementation ('org.apache.tika:tika-core')
-  implementation 'org.apache.tika:tika-parsers'
+  // transitive = false because we are pretty particular on what tika parser deps we distribute
+  implementation ('org.apache.tika:tika-core') { transitive = false }
+  implementation ('org.apache.tika:tika-parsers') { transitive = false }
   
   testImplementation project(path: ':solr:contrib:solr-contrib-dataimporthandler', configuration: 'testOutput')
   testImplementation project(':lucene:lucene-test-framework')
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index a9a4903..710ff82 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 task jarTest (type: Jar) {
   from sourceSets.test.output
diff --git a/solr/contrib/extraction/build.gradle b/solr/contrib/extraction/build.gradle
index ecc658b..d1baffd 100644
--- a/solr/contrib/extraction/build.gradle
+++ b/solr/contrib/extraction/build.gradle
@@ -17,8 +17,9 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
+// we use a lot of transitive = false because we are pretty particular on what tika parser deps we distribute
 dependencies {
   
   implementation project(':lucene:lucene-core')
@@ -65,8 +66,9 @@ dependencies {
   implementation ('org.tallison:jmatio') { transitive = false }
   implementation ('com.epam:parso') { transitive = false }
   implementation ('org.brotli:dec') { transitive = false }
-  implementation ('com.ibm.icu:icu4j')
   implementation ('xerces:xercesImpl') { transitive = false }
+  
+  implementation ('com.ibm.icu:icu4j')
   implementation ('commons-io:commons-io')
   implementation ('commons-codec:commons-codec')
   implementation ('com.google.guava:guava')
diff --git a/solr/contrib/langid/build.gradle b/solr/contrib/langid/build.gradle
index d963852..4ece818 100644
--- a/solr/contrib/langid/build.gradle
+++ b/solr/contrib/langid/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation project(':solr:solr-core')
diff --git a/solr/contrib/ltr/build.gradle b/solr/contrib/ltr/build.gradle
index 527ceea..1080f13 100644
--- a/solr/contrib/ltr/build.gradle
+++ b/solr/contrib/ltr/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradle
index 5511a10..7a18e65 100644
--- a/solr/contrib/prometheus-exporter/build.gradle
+++ b/solr/contrib/prometheus-exporter/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/solr/contrib/velocity/build.gradle b/solr/contrib/velocity/build.gradle
index ff017bf..b33ea53 100644
--- a/solr/contrib/velocity/build.gradle
+++ b/solr/contrib/velocity/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 3761039..dafed46 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
- import org.apache.lucene.gradle.UnusedDeps
+ import org.apache.lucene.gradle.deps.UnusedDeps
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'solr-core'
 
diff --git a/solr/example/example-DIH/build.gradle b/solr/example/example-DIH/build.gradle
index 0346a5a..27a82e7 100644
--- a/solr/example/example-DIH/build.gradle
+++ b/solr/example/example-DIH/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
   implementation 'org.hsqldb:hsqldb'
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index ccda213..c0fbbf9 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 jar.enabled = false
 
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 83c3cd1..2f24e32 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -17,7 +17,7 @@
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 dependencies {
 
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 4a628c5..db3aa88 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -17,7 +17,7 @@
  
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: org.apache.lucene.gradle.PartOfDist
+apply plugin: org.apache.lucene.gradle.dist.PartOfDist
 
 archivesBaseName = 'solr-test-framework'
 
diff --git a/versions.lock b/versions.lock
index 30e0286..456c0ca 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,49 +1,42 @@
 # Run ./gradlew --write-locks to regenerate this file
 asm:asm:3.3.1 (1 constraints: db056f47)
-c3p0:c3p0:0.9.1.1 (1 constraints: eb0c6e1a)
 cglib:cglib:2.2.2 (1 constraints: 8d0f6f86)
-com.adobe.xmp:xmpcore:5.1.3 (2 constraints: cf13ce64)
-com.beust:jcommander:1.35 (1 constraints: f805cf47)
+com.adobe.xmp:xmpcore:5.1.3 (1 constraints: 0b050a36)
 com.carrotsearch:hppc:0.8.1 (2 constraints: af0fd8a6)
 com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.2 (1 constraints: 0d050c36)
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
-com.drewnoakes:metadata-extractor:2.11.0 (2 constraints: c011970f)
-com.epam:parso:2.0.9 (2 constraints: 6e11a9f2)
-com.fasterxml.jackson.core:jackson-annotations:2.9.8 (8 constraints: d07504d7)
-com.fasterxml.jackson.core:jackson-core:2.9.8 (12 constraints: 90cb8608)
-com.fasterxml.jackson.core:jackson-databind:2.9.8 (14 constraints: 6fd9c0df)
+com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b)
+com.epam:parso:2.0.9 (1 constraints: 0d05fe35)
+com.fasterxml.jackson.core:jackson-annotations:2.9.8 (7 constraints: 69697983)
+com.fasterxml.jackson.core:jackson-core:2.9.8 (11 constraints: 29bf784f)
+com.fasterxml.jackson.core:jackson-databind:2.9.8 (13 constraints: 08cd551a)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.8 (1 constraints: 15051836)
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 (1 constraints: 15051836)
-com.fasterxml.woodstox:woodstox-core:5.2.0 (2 constraints: c1171084)
+com.fasterxml.woodstox:woodstox-core:5.2.0 (1 constraints: 8c0d472f)
 com.github.ben-manes.caffeine:caffeine:2.4.0 (1 constraints: 08050136)
 com.github.cliftonlabs:json-simple:3.0.2 (1 constraints: 82145f7d)
-com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
-com.github.junrar:junrar:2.0.0 (1 constraints: 590ce601)
-com.github.openjson:openjson:1.0.10 (1 constraints: 890c6b0e)
 com.github.stephenc.jcip:jcip-annotations:1.0-1 (1 constraints: 930cbb09)
-com.github.virtuald:curvesapi:1.04 (2 constraints: 730fc68c)
-com.google.code.gson:gson:2.8.5 (2 constraints: f1197726)
-com.google.guava:guava:25.1-jre (18 constraints: 291e586c)
-com.google.protobuf:protobuf-java:3.7.1 (17 constraints: 7e168483)
+com.github.virtuald:curvesapi:1.04 (1 constraints: d904f330)
+com.google.code.gson:gson:2.2.4 (1 constraints: 8c0d3f2f)
+com.google.guava:guava:25.1-jre (17 constraints: 3318001e)
+com.google.protobuf:protobuf-java:3.7.1 (15 constraints: c8090998)
 com.google.re2j:re2j:1.2 (2 constraints: ce1117f1)
 com.googlecode.javaewah:JavaEWAH:1.1.6 (1 constraints: 480e7e50)
-com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: 5a0ce501)
-com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (2 constraints: 601190f1)
-com.googlecode.mp4parser:isoparser:1.1.22 (2 constraints: c411d90f)
-com.healthmarketscience.jackcess:jackcess:2.1.12 (2 constraints: c411e10f)
-com.healthmarketscience.jackcess:jackcess-encrypt:2.1.4 (2 constraints: 661111f2)
+com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 0605f335)
+com.googlecode.mp4parser:isoparser:1.1.22 (1 constraints: 38052d3b)
+com.healthmarketscience.jackcess:jackcess:2.1.12 (1 constraints: 3805313b)
+com.healthmarketscience.jackcess:jackcess-encrypt:2.1.4 (1 constraints: 0905fc35)
 com.ibm.icu:icu4j:62.1 (1 constraints: dd040c31)
 com.jayway.jsonpath:json-path:2.4.0 (1 constraints: 08050136)
 com.jcraft:jsch:0.1.54 (2 constraints: 361cbfea)
 com.lmax:disruptor:3.4.0 (1 constraints: 09050636)
 com.nimbusds:nimbus-jose-jwt:4.41.1 (2 constraints: 6a1a5b39)
-com.pff:java-libpst:0.8.1 (2 constraints: 6a116bf2)
+com.pff:java-libpst:0.8.1 (1 constraints: 0b050436)
 com.rabbitmq:amqp-client:4.4.1 (1 constraints: c4108cb6)
-com.rometools:rome:1.5.1 (2 constraints: 661119f2)
-com.rometools:rome-utils:1.5.1 (2 constraints: e50d2f4b)
+com.rometools:rome:1.5.1 (1 constraints: 09050036)
+com.rometools:rome-utils:1.5.1 (1 constraints: 09050036)
 com.squareup.okhttp:okhttp:2.7.5 (1 constraints: 5a0fe17e)
 com.squareup.okio:okio:1.6.0 (1 constraints: 1e0c1ff2)
-com.sun.istack:istack-commons-runtime:3.0.5 (1 constraints: 620c0806)
 com.sun.jersey:jersey-core:1.19.4 (9 constraints: cb92fe00)
 com.sun.jersey:jersey-json:1.19.4 (6 constraints: c96575cb)
 com.sun.jersey:jersey-server:1.19.4 (4 constraints: 7b36cc5e)
@@ -51,26 +44,19 @@ com.sun.jersey:jersey-servlet:1.19.4 (3 constraints: 302258ea)
 com.sun.mail:gimap:1.5.1 (1 constraints: 09050036)
 com.sun.mail:javax.mail:1.5.1 (2 constraints: 830d2844)
 com.sun.xml.bind:jaxb-impl:2.2.3-1 (1 constraints: 330c2404)
-com.sun.xml.fastinfoset:FastInfoset:1.2.13 (1 constraints: ec0d9743)
 com.tdunning:t-digest:3.1 (1 constraints: a804212c)
 com.thoughtworks.paranamer:paranamer:2.3 (1 constraints: ef08468a)
 commons-beanutils:commons-beanutils:1.9.3 (4 constraints: ba363323)
 commons-cli:commons-cli:1.2 (7 constraints: 9558c9e9)
-commons-codec:commons-codec:1.11 (9 constraints: b4729b8b)
+commons-codec:commons-codec:1.11 (7 constraints: 4e5e5a18)
 commons-collections:commons-collections:3.2.2 (5 constraints: 5e492db5)
 commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
-commons-io:commons-io:2.6 (11 constraints: d69cf8f3)
-commons-lang:commons-lang:2.6 (3 constraints: df29f552)
+commons-io:commons-io:2.5 (10 constraints: d690523c)
+commons-lang:commons-lang:2.6 (1 constraints: 750cf400)
 commons-net:commons-net:3.6 (2 constraints: 341d98eb)
-de.l3s.boilerpipe:boilerpipe:1.1.0 (2 constraints: 5c1146f1)
+de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
 de.thetaphi:forbiddenapis:2.6 (1 constraints: ac04232c)
 dnsjava:dnsjava:2.1.7 (2 constraints: f21ddc52)
-edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
-edu.ucar:grib:4.5.5 (1 constraints: 650c0402)
-edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
-edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
-edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
-edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
 io.dropwizard.metrics:metrics-core:4.0.5 (6 constraints: 4f57c221)
 io.dropwizard.metrics:metrics-graphite:4.0.5 (1 constraints: 0b050436)
 io.dropwizard.metrics:metrics-jetty9:4.0.5 (1 constraints: 0b050436)
@@ -85,22 +71,15 @@ io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
 io.prometheus:simpleclient_common:0.2.0 (2 constraints: e8159ecb)
 io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
 io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: 0305f035)
-javax.activation:activation:1.1.1 (4 constraints: 692381b3)
-javax.annotation:javax.annotation-api:1.3 (1 constraints: f50e785e)
-javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
+javax.activation:activation:1.1.1 (3 constraints: 1017445c)
 javax.servlet:javax.servlet-api:3.1.0 (11 constraints: aab77804)
 javax.servlet.jsp:jsp-api:2.1 (1 constraints: 290d5a14)
-javax.ws.rs:javax.ws.rs-api:2.1 (1 constraints: f40e795e)
 javax.ws.rs:jsr311-api:1.1.1 (2 constraints: b0213787)
-javax.xml.bind:jaxb-api:2.3.0 (8 constraints: c7909dd6)
-joda-time:joda-time:2.2 (2 constraints: 5d0d232c)
+javax.xml.bind:jaxb-api:2.2.11 (7 constraints: 698471ac)
 junit:junit:4.12 (2 constraints: 3e1e6104)
 net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
-net.java.dev.jna:jna:4.3.0 (1 constraints: 5e0cf901)
-net.jcip:jcip-annotations:1.0 (5 constraints: 6824b237)
 net.minidev:accessors-smart:1.2 (1 constraints: e60926a4)
 net.minidev:json-smart:2.3 (3 constraints: 04272e32)
-net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d)
 net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 0b050436)
 net.sourceforge.nekohtml:nekohtml:1.9.17 (1 constraints: 4405503b)
 net.thisptr:jackson-jq:0.0.8 (1 constraints: 0a05f335)
@@ -109,33 +88,26 @@ org.apache.avro:avro:1.7.7 (7 constraints: 1884170b)
 org.apache.calcite:calcite-core:1.18.0 (1 constraints: 3c05413b)
 org.apache.calcite:calcite-linq4j:1.18.0 (1 constraints: 3c05413b)
 org.apache.calcite.avatica:avatica-core:1.13.0 (1 constraints: 3705323b)
-org.apache.commons:commons-collections4:4.2 (2 constraints: b90cdc15)
-org.apache.commons:commons-compress:1.18 (7 constraints: 674ed851)
+org.apache.commons:commons-collections4:4.2 (1 constraints: aa04252c)
+org.apache.commons:commons-compress:1.18 (5 constraints: 9637cf5d)
 org.apache.commons:commons-configuration2:2.1.1 (2 constraints: 8d12092e)
-org.apache.commons:commons-csv:1.5 (2 constraints: 8f21f77f)
 org.apache.commons:commons-digester3:3.2 (2 constraints: 25274d81)
-org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
+org.apache.commons:commons-exec:1.3 (1 constraints: a8041d2c)
 org.apache.commons:commons-lang3:3.8.1 (8 constraints: c47450ef)
 org.apache.commons:commons-math3:3.6.1 (2 constraints: 9412122f)
 org.apache.commons:commons-text:1.6 (2 constraints: d511b6f1)
 org.apache.curator:curator-client:2.13.0 (5 constraints: a4496710)
 org.apache.curator:curator-framework:2.13.0 (4 constraints: cd317cc0)
 org.apache.curator:curator-recipes:2.13.0 (3 constraints: 7f233592)
-org.apache.cxf:cxf-core:3.2.6 (3 constraints: 802c5bbf)
-org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.6 (1 constraints: 360d1e28)
-org.apache.cxf:cxf-rt-rs-client:3.2.6 (1 constraints: 620cf701)
-org.apache.cxf:cxf-rt-transports-http:3.2.6 (2 constraints: 8f1c2e0b)
 org.apache.derby:derby:10.9.1.0 (1 constraints: 9b054946)
 org.apache.hadoop:hadoop-annotations:3.2.0 (18 constraints: 9544bb02)
 org.apache.hadoop:hadoop-auth:3.2.0 (4 constraints: 5d32c9d6)
 org.apache.hadoop:hadoop-common:3.2.0 (3 constraints: 1425a110)
 org.apache.hadoop:hadoop-hdfs-client:3.2.0 (4 constraints: 163abfa9)
 org.apache.htrace:htrace-core4:4.1.0-incubating (3 constraints: 262c6727)
-org.apache.httpcomponents:httpclient:4.5.6 (7 constraints: 7353f09a)
-org.apache.httpcomponents:httpcore:4.4.10 (4 constraints: ce250e79)
-org.apache.httpcomponents:httpmime:4.5.6 (3 constraints: 8e1b90af)
-org.apache.james:apache-mime4j-core:0.8.2 (2 constraints: 941abf66)
-org.apache.james:apache-mime4j-dom:0.8.2 (1 constraints: 610cf601)
+org.apache.httpcomponents:httpclient:4.5.6 (5 constraints: f63c9ca7)
+org.apache.httpcomponents:httpcore:4.4.10 (2 constraints: 9015d5cd)
+org.apache.httpcomponents:httpmime:4.5.6 (1 constraints: 11051436)
 org.apache.kerby:kerb-admin:1.0.1 (2 constraints: 8712012e)
 org.apache.kerby:kerb-client:1.0.1 (2 constraints: 8712012e)
 org.apache.kerby:kerb-common:1.0.1 (3 constraints: a81d2e73)
@@ -155,50 +127,40 @@ org.apache.logging.log4j:log4j-1.2-api:2.11.2 (1 constraints: 3805343b)
 org.apache.logging.log4j:log4j-api:2.11.2 (4 constraints: c83394ae)
 org.apache.logging.log4j:log4j-core:2.11.2 (3 constraints: 102588ba)
 org.apache.logging.log4j:log4j-slf4j-impl:2.11.2 (1 constraints: 3805343b)
-org.apache.opennlp:opennlp-tools:1.9.1 (2 constraints: 6d11c4f2)
-org.apache.pdfbox:fontbox:2.0.15 (2 constraints: 4f1040c5)
-org.apache.pdfbox:jbig2-imageio:3.0.2 (2 constraints: 6211c7f1)
-org.apache.pdfbox:jempbox:1.8.16 (2 constraints: d8119111)
-org.apache.pdfbox:pdfbox:2.0.15 (2 constraints: c5112810)
-org.apache.pdfbox:pdfbox-tools:2.0.15 (2 constraints: c5112810)
-org.apache.poi:poi:4.0.0 (4 constraints: dc28d830)
-org.apache.poi:poi-ooxml:4.0.0 (2 constraints: 6011a8f1)
-org.apache.poi:poi-ooxml-schemas:4.0.0 (2 constraints: cd0f45a7)
-org.apache.poi:poi-scratchpad:4.0.0 (2 constraints: 6011a8f1)
+org.apache.opennlp:opennlp-tools:1.9.1 (1 constraints: 0d050c36)
+org.apache.pdfbox:fontbox:2.0.15 (1 constraints: 3a05303b)
+org.apache.pdfbox:jempbox:1.8.16 (1 constraints: 42054b3b)
+org.apache.pdfbox:pdfbox:2.0.15 (1 constraints: 3a05303b)
+org.apache.pdfbox:pdfbox-tools:2.0.15 (1 constraints: 3a05303b)
+org.apache.poi:poi:4.0.0 (1 constraints: 0605ff35)
+org.apache.poi:poi-ooxml:4.0.0 (1 constraints: 0605ff35)
+org.apache.poi:poi-ooxml-schemas:4.0.0 (1 constraints: 0605ff35)
+org.apache.poi:poi-scratchpad:4.0.0 (1 constraints: 0605ff35)
 org.apache.rat:apache-rat:0.11 (1 constraints: d604ee30)
 org.apache.rat:apache-rat-core:0.11 (2 constraints: e417c98c)
 org.apache.rat:apache-rat-tasks:0.11 (1 constraints: c90af0ca)
-org.apache.sis.core:sis-feature:0.8 (1 constraints: 650e0f44)
-org.apache.sis.core:sis-metadata:0.8 (5 constraints: 0244e88f)
-org.apache.sis.core:sis-referencing:0.8 (3 constraints: 572965e4)
-org.apache.sis.core:sis-utility:0.8 (4 constraints: 1f354e60)
-org.apache.sis.storage:sis-netcdf:0.8 (1 constraints: 010c57e9)
-org.apache.sis.storage:sis-storage:0.8 (1 constraints: e40de732)
-org.apache.tika:tika-core:1.19.1 (2 constraints: d011ed10)
+org.apache.tika:tika-core:1.19.1 (1 constraints: 3e05453b)
 org.apache.tika:tika-parsers:1.19.1 (1 constraints: 3e05453b)
-org.apache.uima:uimafit-core:2.2.0 (1 constraints: 5b0cec01)
-org.apache.uima:uimaj-core:2.9.0 (1 constraints: 620c0102)
 org.apache.velocity:velocity-engine-core:2.1 (4 constraints: 3d40ca9b)
 org.apache.velocity.tools:velocity-tools-generic:3.0 (2 constraints: a6174b33)
 org.apache.velocity.tools:velocity-tools-view:3.0 (2 constraints: 2019919a)
 org.apache.velocity.tools:velocity-tools-view-jsp:3.0 (1 constraints: a704202c)
-org.apache.ws.xmlschema:xmlschema-core:2.2.3 (1 constraints: 370a5abc)
-org.apache.xmlbeans:xmlbeans:3.0.1 (2 constraints: de126c41)
+org.apache.xmlbeans:xmlbeans:3.0.1 (1 constraints: 0605fb35)
 org.apache.zookeeper:zookeeper:3.5.5 (7 constraints: 6767b402)
 org.apache.zookeeper:zookeeper-jute:3.5.5 (2 constraints: 9b127823)
 org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)
 org.bitbucket.b_c:jose4j:0.6.5 (1 constraints: 0d050236)
-org.bouncycastle:bcmail-jdk15on:1.60 (2 constraints: 0a113ad5)
-org.bouncycastle:bcpkix-jdk15on:1.60 (2 constraints: 18127d15)
-org.bouncycastle:bcprov-jdk15on:1.60 (4 constraints: 9d2bfb5a)
-org.brotli:dec:0.1.2 (2 constraints: 5e1165f1)
+org.bouncycastle:bcmail-jdk15on:1.60 (1 constraints: db04fb30)
+org.bouncycastle:bcpkix-jdk15on:1.60 (1 constraints: db04fb30)
+org.bouncycastle:bcprov-jdk15on:1.60 (1 constraints: db04fb30)
+org.brotli:dec:0.1.2 (1 constraints: 0505f035)
 org.carrot2:carrot2-mini:3.16.0 (1 constraints: 3c05473b)
 org.carrot2:morfologik-fsa:2.1.5 (2 constraints: e0120c36)
 org.carrot2:morfologik-polish:2.1.5 (1 constraints: 0a05fd35)
 org.carrot2:morfologik-stemming:2.1.5 (2 constraints: 0b12640c)
 org.carrot2.attributes:attributes-binder:1.3.3 (2 constraints: ab0f86a6)
 org.carrot2.shaded:carrot2-guava:18.0 (3 constraints: 8f202231)
-org.ccil.cowan.tagsoup:tagsoup:1.2.1 (2 constraints: 601198f1)
+org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 0605f735)
 org.codehaus.jackson:jackson-core-asl:1.9.13 (5 constraints: ea428e3d)
 org.codehaus.jackson:jackson-jaxrs:1.9.2 (1 constraints: da0befeb)
 org.codehaus.jackson:jackson-mapper-asl:1.9.13 (4 constraints: fa31b6d4)
@@ -208,7 +170,6 @@ org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
 org.codehaus.jettison:jettison:1.1 (4 constraints: a84e24a9)
 org.codehaus.woodstox:stax2-api:4.1 (4 constraints: 7c331332)
 org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
-org.codelibs:jhighlight:1.0.3 (1 constraints: 5b0ce401)
 org.eclipse.jetty:jetty-alpn-client:9.4.19.v20190610 (3 constraints: d12c8400)
 org.eclipse.jetty:jetty-alpn-java-client:9.4.19.v20190610 (1 constraints: 8007517d)
 org.eclipse.jetty:jetty-alpn-java-server:9.4.19.v20190610 (1 constraints: 8007517d)
@@ -234,35 +195,26 @@ org.eclipse.jetty.http2:http2-hpack:9.4.19.v20190610 (2 constraints: 50198f5c)
 org.eclipse.jetty.http2:http2-http-client-transport:9.4.19.v20190610 (1 constraints: 8007517d)
 org.eclipse.jetty.http2:http2-server:9.4.19.v20190610 (1 constraints: 8007517d)
 org.eclipse.jgit:org.eclipse.jgit:4.6.0.201612231935-r (1 constraints: 3c085c99)
-org.gagravarr:vorbis-java-core:0.8 (2 constraints: ac10e6b8)
-org.gagravarr:vorbis-java-tika:0.8 (2 constraints: ac10e6b8)
-org.glassfish.jaxb:jaxb-core:2.3.0.1 (2 constraints: d31a8983)
-org.glassfish.jaxb:jaxb-runtime:2.3.0.1 (1 constraints: bb0c341b)
-org.glassfish.jaxb:txw2:2.3.0.1 (1 constraints: be0c521f)
+org.gagravarr:vorbis-java-core:0.8 (1 constraints: ac041f2c)
+org.gagravarr:vorbis-java-tika:0.8 (1 constraints: ac041f2c)
 org.hamcrest:hamcrest-core:1.3 (2 constraints: 730ad9bf)
 org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
-org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
-org.jdom:jdom2:2.0.6 (2 constraints: 681134f2)
+org.jdom:jdom2:2.0.6 (1 constraints: 0a05fb35)
 org.jruby.jcodings:jcodings:1.0.13 (1 constraints: 3709c99d)
 org.jruby.joni:joni:2.1.11 (1 constraints: 7b0ae5c4)
-org.jsoup:jsoup:1.11.3 (2 constraints: c411dd0f)
-org.jvnet.staxex:stax-ex:1.7.8 (1 constraints: c50dc135)
 org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c)
-org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)
-org.ow2.asm:asm:6.2 (5 constraints: 772fb0b6)
-org.ow2.asm:asm-analysis:6.2 (1 constraints: e309d6a5)
-org.ow2.asm:asm-commons:6.2 (1 constraints: aa04272c)
-org.ow2.asm:asm-tree:6.2 (2 constraints: 2d14228c)
-org.quartz-scheduler:quartz:2.2.0 (1 constraints: 2106eb4d)
+org.ow2.asm:asm:5.1 (3 constraints: 9319981f)
+org.ow2.asm:asm-commons:5.1 (1 constraints: aa04272c)
+org.ow2.asm:asm-tree:5.1 (1 constraints: e109d2a5)
 org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
 org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
 org.simpleframework:simple-xml:2.7.1 (3 constraints: bd20563c)
-org.slf4j:jcl-over-slf4j:1.7.26 (3 constraints: 0018d6b7)
-org.slf4j:jul-to-slf4j:1.7.26 (2 constraints: d5113e11)
+org.slf4j:jcl-over-slf4j:1.7.26 (1 constraints: 4005473b)
+org.slf4j:jul-to-slf4j:1.7.26 (1 constraints: 4005473b)
 org.slf4j:log4j-over-slf4j:1.7.26 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.26 (46 constraints: ac7b836b)
-org.tallison:jmatio:1.5 (2 constraints: a810a0b8)
-org.tukaani:xz:1.8 (2 constraints: ae100fb9)
+org.slf4j:slf4j-api:1.7.26 (36 constraints: f51e3e81)
+org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
+org.tukaani:xz:1.8 (1 constraints: ad04222c)
 org.xerial.snappy:snappy-java:1.0.5 (1 constraints: 4e09a79c)
 org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
@@ -287,6 +239,7 @@ io.netty:netty:3.10.5.Final (7 constraints: 02932566)
 javax.inject:javax.inject:1 (2 constraints: b018a173)
 net.bytebuddy:byte-buddy:1.9.3 (2 constraints: 2510faaf)
 net.bytebuddy:byte-buddy-agent:1.9.3 (1 constraints: 170b0fd3)
+org.apache.commons:commons-csv:1.0 (1 constraints: 9115b4a3)
 org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 (1 constraints: 6314cf7b)
 org.apache.hadoop:hadoop-hdfs:3.2.0 (3 constraints: 1e2795fb)
 org.apache.hadoop:hadoop-mapreduce-client-app:3.2.0 (2 constraints: 18222bd9)
diff --git a/versions.props b/versions.props
index 93291b4..daa8d00 100644
--- a/versions.props
+++ b/versions.props
@@ -37,9 +37,9 @@ de.l3s.boilerpipe:boilerpipe=1.1.0
 info.ganglia.gmetric4j:gmetric4j=1.0.7
 io.dropwizard.metrics:*=4.0.5
 io.netty:netty-all=4.0.52.Final
+io.opentracing:*=0.33.0
 io.prometheus:*=0.2.0
 io.sgr:s2-geometry-library-java=1.0.0
-io.opentracing:*=0.33.0
 javax.activation:activation=1.1.1
 javax.servlet:javax.servlet-api=3.1.0
 junit:junit=4.12
@@ -70,9 +70,9 @@ org.apache.james:*=0.8.2
 org.apache.kerby:*=1.0.1
 org.apache.logging.log4j:*=2.11.2
 org.apache.opennlp:opennlp-tools=1.9.1
+org.apache.pdfbox:*=2.0.15
 org.apache.pdfbox:jbig2-imageio=3.0.2
 org.apache.pdfbox:jempbox=1.8.16
-org.apache.pdfbox:*=2.0.15
 org.apache.poi:*=4.0.0
 org.apache.tika:*=1.19.1
 org.apache.velocity.tools:*=3.0
@@ -102,7 +102,6 @@ org.jsoup:jsoup=1.11.3
 org.locationtech.jts:jts-core=1.15.0
 org.locationtech.spatial4j:*=0.7
 org.mockito:mockito-core=2.23.4
-org.noggit:noggit=0.8
 org.objenesis:objenesis=2.6
 org.ow2.asm:*=5.1
 org.restlet.jee:*=2.3.0