Skip to content

Commit 22296f2

Browse files
authored
SOLR-14912: Unify solr-contrib-extraction with the artifact it produces (apache#2060)
1 parent 32bf7ba commit 22296f2

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function testoutput_process_tests
201201
elif [[ "${module}" =~ ^lucene/ ]]; then
202202
JUNIT_TEST_OUTPUT_DIR="../build/${module#*/}"
203203
elif [[ "${module}" =~ ^solr/contrib/extraction ]]; then
204-
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-cell"
204+
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-extraction"
205205
elif [[ "${module}" =~ ^solr/contrib/(.*) ]]; then
206206
JUNIT_TEST_OUTPUT_DIR="../../build/contrib/solr-${BASH_REMATCH[1]}"
207207
elif [[ "${module}" =~ ^solr/(.*) ]]; then

gradle/ant-compat/artifact-naming.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,3 @@
1919
configure(subprojects.findAll { it.path.contains(':solr:contrib:') }) {
2020
project.archivesBaseName = project.archivesBaseName.replace("-contrib-", "-")
2121
}
22-
23-
// This project has a different artifact name (solr-contrib-cell). Don't know why.
24-
configure(project(":solr:contrib:extraction")) {
25-
archivesBaseName = "solr-cell"
26-
}

solr/CHANGES.txt

+3
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ Other Changes
145145

146146
* SOLR-14957: Add Prometheus Exporter to docker PATH. Fix classpath issues. (Houston Putman)
147147

148+
* SOLR-14912: Clean up solr-extraction contrib to produce solr-extraction-* jar
149+
(instead of solr-cell-*). (Dawid Weiss)
150+
148151
Bug Fixes
149152
---------------------
150153
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution

solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
with their external dependencies.
7474
-->
7575
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
76-
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
76+
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-extraction-\d.*\.jar" />
7777

7878
<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
7979
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />

solr/solr-ref-guide/src/libs.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These examples show how to load contrib modules into Solr:
6464
[source,xml]
6565
----
6666
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
67-
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
67+
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-extraction-\d.*\.jar" />
6868
6969
<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
7070
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />

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

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ A thorough review of the list in Major Changes in Earlier 8.x Versions as well a
3232

3333
_(raw; not yet edited)_
3434

35+
* SOLR-14912: Cleaned up solr-extraction contrib to produce solr-extraction-* jar
36+
(instead of solr-cell-*). (Dawid Weiss)
37+
3538
* LUCENE-8738: Move to Java 11 as minimum Java version.
3639
(Adrien Grand, Uwe Schindler)
3740

0 commit comments

Comments
 (0)