Apache Solr open-source search software
SOLR-15470 Remove test-framework from binary distro (#174)
Jan Høydahlcded17c4d26e
diff --git a/gradle/solr/packaging.gradle b/gradle/solr/packaging.gradleindex 39b4bc68ebc..87c995a426d 100644--- a/gradle/solr/packaging.gradle+++ b/gradle/solr/packaging.gradle@@ -31,7 +31,7 @@// solr platform.// lucene-libs - these are lucene modules declared as module's dependencies and not// present in solr platform.-// test-lib/ - libs not present in solr platform and not included in solr:test-framework.+// test-lib/ - libs not present in solr platform.//// None of these are really needed with gradle... they should be collected just in the distribution// package, not at each project's level.@@ -49,7 +49,6 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contribconfigurations {solrPlatformLibs- solrTestPlatformLibsruntimeLibs {extendsFrom runtimeElements}@@ -60,8 +59,6 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contribsolrPlatformLibs project(":solr:core")solrPlatformLibs project(":solr:solrj")solrPlatformLibs project(":solr:server")-- solrTestPlatformLibs project(":solr:test-framework")}// An aggregate that configures lib, lucene-libs and test-lib in a temporary location.@@ -115,7 +112,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contrib!(dep instanceof org.gradle.api.artifacts.ProjectDependency)}- return testRuntimeLibs - configurations.runtimeLibs - configurations.solrTestPlatformLibs+ return testRuntimeLibs - configurations.runtimeLibs})into file("${projectDir}/test-lib")diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex c5d36ba7635..ff4dffdc20e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -317,6 +317,8 @@ Other Changes* SOLR-15385: Address many rawtypes warnings, resulting in several modified signatures in the public API. (Mike Drob, David Smiley)+* SOLR-15470: The binary distribution no longer contains test-framework jars (janhoy)+* SOLR-15471: Rename lang id whitelist parameter to allowlist (Mike Drob)Bug Fixesdiff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.templateindex 5b559904f19..9f52e600cd0 100644--- a/solr/docker/templates/Dockerfile.body.template+++ b/solr/docker/templates/Dockerfile.body.template@@ -15,7 +15,7 @@# TODO; arguably these permissions should have been set correctly previously in the TARRUN set -ex; \(cd /opt; ln -s solr-*/ solr); \- rm -Rf /opt/solr/docs /opt/solr/docker/Dockerfile* /opt/solr/dist/{solr-solrj-*.jar,solrj-lib,solr-test-framework-*.jar,test-framework}; \+ rm -Rf /opt/solr/docs /opt/solr/docker/Dockerfile* /opt/solr/dist/{solr-solrj-*.jar,solrj-lib}; \find /opt/solr/ -type d -print0 | xargs -0 chmod 0755; \find /opt/solr/ -type f -print0 | xargs -0 chmod 0644; \chmod -R 0755 /opt/solr/docker/scripts /opt/solr/bin /opt/solr/contrib/prometheus-exporter/bin/solr-exporter /opt/solr/server/scripts/cloud-scriptsdiff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradleindex f426d1b7912..e932e2b1f3c 100644--- a/solr/packaging/build.gradle+++ b/solr/packaging/build.gradle@@ -72,7 +72,6 @@ dependencies {distSolr project(":solr:core")distSolr project(":solr:server")distSolr project(":solr:solrj")- distSolr project(":solr:test-framework")example project(path: ":solr:example", configuration: "packaging")server project(path: ":solr:server", configuration: "packaging")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.adocindex 3a08339a030..53632f7ba86 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@@ -1,3 +1,4 @@+= Major Changes in Solr 9// Licensed to the Apache Software Foundation (ASF) under one// or more contributor license agreements. See the NOTICE file@@ -156,6 +157,8 @@ _(raw; not yet edited)_* SOLR-15409: Zookeeper client libraries upgraded to 3.7.0, which may not be compatible with your existing server installations+* SOLR-15470: The binary distribution no longer contains test-framework jars.+* SOLR-15471: The language identification "whitelist" configuration is now an "allowlist" to better convey the meaning of the property=== Upgrade Prerequisites in Solr 9diff --git a/solr/test-framework/README.md b/solr/test-framework/README.mdindex 3de1ab13d7c..914d2d4d8f2 100644--- a/solr/test-framework/README.md+++ b/solr/test-framework/README.md@@ -1,6 +1,4 @@-The Solr test-framework products base classes and utility classes for-writting JUnit tests excercising Solr functionality.+The Solr test-framework provides base classes and utility classes for+writing JUnit tests exercising Solr functionality.-This test framework relies on the lucene components found in in the-./lucene-libs/ directory, as well as the third-party libraries found-in the ./lib directory.+This test framework relies on lucene's test-library and other jars.