Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15924: Remove lucene-libs from contrib module packaging (#527)

Houston Putman2dd4847d9b74
diff --git a/gradle/solr/packaging.gradle b/gradle/solr/packaging.gradle
index 1a88caa1c50..fb5af178e50 100644
--- a/gradle/solr/packaging.gradle
+++ b/gradle/solr/packaging.gradle
@@ -19,7 +19,6 @@
// For Solr, a 'resolve' task is much more complex. There are three folders:
// lib/
// test-lib/
-// lucene-libs/
//
// There doesn't seem to be one ideal set of rules on how these should be created, but
// I tried to imitate the current (master) logic present in ivy and ant files in this way:
@@ -27,10 +26,7 @@
// The "solr platform" set of dependencies is a union of all deps for (core, solrj, server).
//
// Then:
-// lib - these are module's "own" dependencies, excluding Lucene's that are not present in the
-// solr platform.
-// lucene-libs - these are lucene modules declared as module's dependencies and not
-// present in solr platform.
+// lib - these are module's "own" dependencies.
// test-lib/ - libs not present in solr platform.
//
// None of these are really needed with gradle... they should be collected just in the distribution
@@ -61,7 +57,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contrib
solrPlatformLibs project(":solr:server")
}
- // An aggregate that configures lib, lucene-libs and test-lib in a temporary location.
+ // An aggregate that configures lib and test-lib in a temporary location.
task assemblePackaging(type: Sync) {
from "README.md"
@@ -76,20 +72,9 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contrib
// libExt has logging libs, which we don't want. Lets users decide what they want.
return externalLibs - configurations.solrPlatformLibs - project(':solr:server').configurations.getByName('libExt')
}, {
- exclude "lucene-*"
into "lib"
})
- from ({
- def projectLibs = configurations.runtimeLibs.copyRecursive { dep ->
- (dep instanceof org.gradle.api.artifacts.ProjectDependency)
- }
- return projectLibs - configurations.solrPlatformLibs
- }, {
- include "lucene-*"
- into "lucene-libs"
- })
-
into deps
}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5b739c032ac..aa36def5d47 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -480,6 +480,8 @@ Other Changes
* SOLR-14858: Add the server WEB-INF/lib directory to the classpath for the solr-exporter script. Will allow the script
to work when the dist/solrj-lib jars are missing in the Docker image. (Houston Putman)
+* SOLR-15924: Remove lucene-libs from contrib module packaging. The lucene libraries will be included in lib/ with all other dependencies. (Houston Putman)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of 4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git a/solr/contrib/analysis-extras/README.md b/solr/contrib/analysis-extras/README.md
index 29f42191121..88950fc9710 100644
--- a/solr/contrib/analysis-extras/README.md
+++ b/solr/contrib/analysis-extras/README.md
@@ -12,15 +12,15 @@ lemmatization, phrase chunking, and named-entity recognition.
Each of the jars below relies upon including `/dist/solr-analysis-extras-X.Y.jar`
in the `solrconfig.xml`
-* ICU relies upon `lucene-libs/lucene-analyzers-icu-X.Y.jar`
+* ICU relies upon `lib/lucene-analyzers-icu-X.Y.jar`
and `lib/icu4j-X.Y.jar`
-* Smartcn relies upon `lucene-libs/lucene-analyzers-smartcn-X.Y.jar`
+* Smartcn relies upon `lib/lucene-analyzers-smartcn-X.Y.jar`
-* Stempel relies on `lucene-libs/lucene-analyzers-stempel-X.Y.jar`
+* Stempel relies on `lib/lucene-analyzers-stempel-X.Y.jar`
-* Morfologik relies on `lucene-libs/lucene-analyzers-morfologik-X.Y.jar`
+* Morfologik relies on `lib/lucene-analyzers-morfologik-X.Y.jar`
and `lib/morfologik-*.jar`
-* OpenNLP relies on `lucene-libs/lucene-analyzers-opennlp-X.Y.jar`
+* OpenNLP relies on `lib/lucene-analyzers-opennlp-X.Y.jar`
and `lib/opennlp-*.jar`
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
index 156ef921faf..1033fb02e7f 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
@@ -190,7 +190,7 @@ Administrators that need Solr exposed more broadly can change the SOLR_JETTY_HOS
This embedded zookeeper should not be used in production.
If you rely upon the previous behavior, then you can change the clientPortAddress in solr/server/solr/zoo.cfg
-=== Contrib Changes
+=== Contrib Module Changes
* SOLR-14067: `StatelessScriptUpdateProcessorFactory` moved to `contrib/scripting` package instead of shipping as part of Solr, due to security concerns.
Renamed to ScriptUpdateProcessorFactory for simpler name.
@@ -202,6 +202,9 @@ of shipping as part of Solr, due to security concerns.
* SOLR-14912: Cleaned up solr-extraction contrib to produce solr-extraction-* jar (instead of solr-cell-*). (Dawid Weiss)
+* SOLR-15924: Extra lucene libraries used in modules are no longer packaged in `lucene-libs/` under the contrib module directory in the binary release.
+ Instead, these libraries will be included with all other module dependencies in `lib/`.
+
== Deprecations & Removed Features
The following list of features have been permanently removed from Solr: