Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14912: Unify solr-contrib-extraction with the artifact it produces (#2060)

This commit is contained in:
Dawid Weiss 2020-11-03 14:15:26 +01:00 committed by GitHub
parent 32bf7bad4b
commit 22296f28a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/test-patch/lucene-solr-yetus-personality.sh
View File

@ -201,7 +201,7 @@ function testoutput_process_tests
elif [[ "${module}" =~ ^lucene/ ]]; then
JUNIT_TEST_OUTPUT_DIR="../build/${module#*/}"
elif [[ "${module}" =~ ^solr/contrib/extraction ]]; then
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-cell"
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-extraction"
elif [[ "${module}" =~ ^solr/contrib/(.*) ]]; then
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-${BASH_REMATCH[1]}"
elif [[ "${module}" =~ ^solr/(.*) ]]; then

5
gradle/ant-compat/artifact-naming.gradle
View File

@ -19,8 +19,3 @@
configure(subprojects.findAll { it.path.contains(':solr:contrib:') }) {
project.archivesBaseName = project.archivesBaseName.replace("-contrib-", "-")
}
// This project has a different artifact name (solr-contrib-cell). Don't know why.
configure(project(":solr:contrib:extraction")) {
archivesBaseName = "solr-cell"
}

3
solr/CHANGES.txt
View File

@ -145,6 +145,9 @@ Other Changes
* SOLR-14957: Add Prometheus Exporter to docker PATH. Fix classpath issues. (Houston Putman)
* SOLR-14912: Clean up solr-extraction contrib to produce solr-extraction-* jar
(instead of solr-cell-*). (Dawid Weiss)
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution

2
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
View File

@ -73,7 +73,7 @@
with their external dependencies.
-->
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-extraction-\d.*\.jar" />
<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />

2
solr/solr-ref-guide/src/libs.adoc
View File

@ -64,7 +64,7 @@ These examples show how to load contrib modules into Solr:
[source,xml]
----
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-extraction-\d.*\.jar" />
<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />

3
solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
View File

@ -32,6 +32,9 @@ A thorough review of the list in Major Changes in Earlier 8.x Versions as well a
_(raw; not yet edited)_
* SOLR-14912: Cleaned up solr-extraction contrib to produce solr-extraction-* jar
(instead of solr-cell-*). (Dawid Weiss)
* LUCENE-8738: Move to Java 11 as minimum Java version.
(Adrien Grand, Uwe Schindler)