From 22296f28a27c58b9f6a013e334c922835e814d83 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 3 Nov 2020 14:15:26 +0100 Subject: [PATCH] SOLR-14912: Unify solr-contrib-extraction with the artifact it produces (#2060) --- dev-tools/test-patch/lucene-solr-yetus-personality.sh | 2 +- gradle/ant-compat/artifact-naming.gradle | 5 ----- solr/CHANGES.txt | 3 +++ .../sample_techproducts_configs/conf/solrconfig.xml | 2 +- solr/solr-ref-guide/src/libs.adoc | 2 +- solr/solr-ref-guide/src/major-changes-in-solr-9.adoc | 3 +++ 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dev-tools/test-patch/lucene-solr-yetus-personality.sh b/dev-tools/test-patch/lucene-solr-yetus-personality.sh index 344a8dbf6d2..ee457f6a976 100644 --- a/dev-tools/test-patch/lucene-solr-yetus-personality.sh +++ b/dev-tools/test-patch/lucene-solr-yetus-personality.sh @@ -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 diff --git a/gradle/ant-compat/artifact-naming.gradle b/gradle/ant-compat/artifact-naming.gradle index df6a22f95c8..8a0c253537a 100644 --- a/gradle/ant-compat/artifact-naming.gradle +++ b/gradle/ant-compat/artifact-naming.gradle @@ -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" -} diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 641c3a0a1ee..c65f7a0e551 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -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 diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml index 4bfa0cb5e51..ed00a3a9899 100644 --- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml +++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml @@ -73,7 +73,7 @@ with their external dependencies. --> - + diff --git a/solr/solr-ref-guide/src/libs.adoc b/solr/solr-ref-guide/src/libs.adoc index 9c25ac037c3..07de240f67a 100644 --- a/solr/solr-ref-guide/src/libs.adoc +++ b/solr/solr-ref-guide/src/libs.adoc @@ -64,7 +64,7 @@ These examples show how to load contrib modules into Solr: [source,xml] ---- - + 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 e05cd75f20a..6c0958fc9ed 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 @@ -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)