Apache Solr open-source search software
SOLR-15917: Rename contrib -> modules (#550)
Houston Putmana4905f3c2056
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.ymlindex e82a3215210..73dd716190e 100644--- a/.github/workflows/docker-test.yml+++ b/.github/workflows/docker-test.yml@@ -7,7 +7,7 @@ on:paths:- '.github/workflows/docker-test.yml'- 'solr/bin/**'- - 'solr/contrib/prometheus-exporter/bin/**'+ - 'solr/modules/prometheus-exporter/bin/**'- 'solr/docker/**'- 'solr/packaging/**'diff --git a/NOTICE.txt b/NOTICE.txtindex b99b4387ac7..f7c0f0cde12 100644--- a/NOTICE.txt+++ b/NOTICE.txt@@ -399,7 +399,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.== Apache Tika Notices ===========================================================================-The following notices apply to contrib/extraction:+The following notices apply to modules/extraction:This product includes software developed by the following copyright owners:@@ -434,7 +434,7 @@ http://www.sourceforge.net/projects/jmatio== Language Detection Notices ===========================================================================-The following notices apply to contrib/langid:+The following notices apply to modules/langid:This product includes software developed by Cybozu Labs, Inc.(c)2010 All rights reserved by Cybozu Labs, Inc.@@ -667,4 +667,4 @@ an open source universal data plane API, which can be obtained at:The S3 Output Stream is based on ASL 2.0 reference implementations found at:https://github.com/confluentinc/kafka-connect-storage-cloud/blob/5.0.x/kafka-connect-s3/src/main/java/io/confluent/connect/s3/storage/S3OutputStream.javaThis files resides at:- contrib/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.java+ modules/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.javadiff --git a/dev-tools/scripts/README.md b/dev-tools/scripts/README.mdindex 76a1736a642..77d0da6543d 100644--- a/dev-tools/scripts/README.md+++ b/dev-tools/scripts/README.md@@ -157,12 +157,12 @@ and prints a regular expression that will match all of them### scaffoldNewModule.py-Scaffold a new contrib module and include it into the build. It will set up the folders+Scaffold a new module and include it into the build. It will set up the foldersand all for you, so the only thing you need to do is add classes, tests and test-data.usage: scaffoldNewModule.py [-h] name full_name description- Scaffold new contrib module into solr/contrib/<name>+ Scaffold new module into solr/modules/<name>positional arguments:name code-name/id, e.g. my-module@@ -172,7 +172,7 @@ and all for you, so the only thing you need to do is add classes, tests and testoptional arguments:-h, --help show this help message and exit- Example: ./addContrib.py foo "My Contrib" "Very Useful Contrib module here"+ Example: ./scaffoldNewModule.py foo "My Module" "Very Useful module here"### gitignore-gen.shdiff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.pyindex b95a578feee..cbdb6934b4c 100755--- a/dev-tools/scripts/addVersion.py+++ b/dev-tools/scripts/addVersion.py@@ -137,7 +137,7 @@ def parse_properties_file(filename):def get_solr_init_changes():return dedent('''- Docker and contrib modules have separate CHANGES.md files.+ Docker and modules have separate CHANGES.md files.''')diff --git a/dev-tools/scripts/scaffoldNewModule.py b/dev-tools/scripts/scaffoldNewModule.pyindex fb37b913f89..c9fb12c7538 100755--- a/dev-tools/scripts/scaffoldNewModule.py+++ b/dev-tools/scripts/scaffoldNewModule.py@@ -42,7 +42,7 @@ def update_build(file_path, search_re, replace_line):def read_config():- parser = argparse.ArgumentParser(description='Scaffold new contrib module into solr/contrib/<name>')+ parser = argparse.ArgumentParser(description='Scaffold new module into solr/modules/<name>')parser.add_argument("name", help='short-name, e.g. my-module')parser.add_argument("full_name", help='Readable name, e.g. "My Module"')parser.add_argument("description", help='Short description for docs, max one line')@@ -50,7 +50,7 @@ def read_config():return newconf-def get_readme_skel(conrib_name):+def get_readme_skel(module_name):return dedent('''\Apache Solr %s=====================================@@ -62,7 +62,7 @@ def get_readme_skel(conrib_name):Getting Started---------------TBD- ''' % conrib_name)+ ''' % module_name)def get_license_header():return dedent('''\@@ -139,14 +139,14 @@ def scaffold_folder(module_name, module_full_name, module_folder, module_descripos.makedirs(os.path.join(module_folder, 'src', 'test'))update_build(os.path.join('solr', 'packaging', 'build.gradle'),- r':solr:contrib:extraction',- ' ":solr:contrib:%s",\n' % module_name)+ r':solr:modules:extraction',+ ' ":solr:modules:%s",\n' % module_name)update_build(os.path.join('gradle', 'maven', 'defaults-maven.gradle'),- r':solr:contrib:extraction',- ' ":solr:contrib:%s",\n' % module_name)+ r':solr:modules:extraction',+ ' ":solr:modules:%s",\n' % module_name)update_build(os.path.join('settings.gradle'),- r'include "solr:contrib:extraction"',- 'include "solr:contrib:%s"\n' % module_name)+ r'include "solr:modules:extraction"',+ 'include "solr:modules:%s"\n' % module_name)print("Adding new files to git")run("git add %s" % module_folder)@@ -154,7 +154,7 @@ def main():conf = read_config()module_name = conf.name- module_folder = os.path.join('solr', 'contrib', module_name)+ module_folder = os.path.join('solr', 'modules', module_name)scaffold_folder(module_name, conf.full_name, module_folder, conf.description)diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.pyindex 1214abd6581..478cadd4d1a 100755--- a/dev-tools/scripts/smokeTestRelease.py+++ b/dev-tools/scripts/smokeTestRelease.py@@ -200,7 +200,7 @@ def checkAllJARs(topDir, gitRevision, version):for file in files:if file.lower().endswith('.jar'):if ((normRoot.endswith('/test-framework/lib') and file.startswith('jersey-'))- or (normRoot.endswith('/contrib/extraction/lib') and file.startswith('xml-apis-'))):+ or (normRoot.endswith('/modules/extraction/lib') and file.startswith('xml-apis-'))):print(' **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))continuefullPath = '%s/%s' % (root, file)@@ -581,7 +581,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):expected_src_root_folders = ['buildSrc', 'dev-docs', 'dev-tools', 'gradle', 'help', 'solr']expected_src_root_files = ['build.gradle', 'gradlew', 'gradlew.bat', 'settings.gradle', 'versions.lock', 'versions.props']expected_src_solr_files = ['build.gradle']- expected_src_solr_folders = ['benchmark', 'bin', 'bin-test', 'build', 'contrib', 'core', 'docker', 'documentation', 'example', 'licenses', 'packaging', 'server', 'solr-ref-guide', 'solrj', 'test-framework', 'webapp']+ expected_src_solr_folders = ['benchmark', 'bin', 'bin-test', 'build', 'modules', 'core', 'docker', 'documentation', 'example', 'licenses', 'packaging', 'server', 'solr-ref-guide', 'solrj', 'test-framework', 'webapp']is_in_list(in_root_folder, expected_src_root_folders)is_in_list(in_root_folder, expected_src_root_files)is_in_list(in_solr_folder, expected_src_solr_folders)@@ -589,7 +589,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):if len(in_solr_folder) > 0:raise RuntimeError('solr: unexpected files/dirs in artifact %s solr/ folder: %s' % (artifact, in_solr_folder))else:- is_in_list(in_root_folder, ['bin', 'contrib', 'dist', 'docs', 'example', 'licenses', 'server'])+ is_in_list(in_root_folder, ['bin', 'modules', 'dist', 'docs', 'example', 'licenses', 'server'])if len(in_root_folder) > 0:raise RuntimeError('solr: unexpected files/dirs in artifact %s: %s' % (artifact, in_root_folder))diff --git a/dev-tools/test-patch/lucene-solr-yetus-personality.sh b/dev-tools/test-patch/lucene-solr-yetus-personality.shindex b74346f0a51..15319943307 100644--- a/dev-tools/test-patch/lucene-solr-yetus-personality.sh+++ b/dev-tools/test-patch/lucene-solr-yetus-personality.sh@@ -117,7 +117,7 @@ function personality_modulesif [[ "${module}" =~ ^(lucene/(analysis/[^/]+|[^/]+)) ]]; thenlocal lucene_module=${BASH_REMATCH[0]}personality_enqueue_module "${lucene_module}" "${extra}"- elif [[ "${module}" =~ ^solr/(core|solrj|test-framework|solr-ref-guide|contrib/[^.]+) ]]; then # allow solr/ modules+ elif [[ "${module}" =~ ^solr/(core|solrj|test-framework|solr-ref-guide|modules/[^.]+) ]]; then # allow solr/ moduleslocal solr_module=${BASH_REMATCH[0]}# In solr-ref-guide module, do not execute "compile" or "unit" pluginsif [[ ! "${solr_module}" == solr/solr-ref-guide || ! ${testtype} =~ ^(compile|unit)$ ]]; then@@ -200,10 +200,10 @@ function testoutput_process_testsJUNIT_TEST_OUTPUT_DIR="../../build/${module#*/}"elif [[ "${module}" =~ ^lucene/ ]]; thenJUNIT_TEST_OUTPUT_DIR="../build/${module#*/}"- elif [[ "${module}" =~ ^solr/contrib/extraction ]]; then- 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/modules/extraction ]]; then+ JUNIT_TEST_OUTPUT_DIR="../../build/modules/solr-extraction"+ elif [[ "${module}" =~ ^solr/modules/(.*) ]]; then+ JUNIT_TEST_OUTPUT_DIR="../../build/modules/solr-${BASH_REMATCH[1]}"elif [[ "${module}" =~ ^solr/(.*) ]]; thenJUNIT_TEST_OUTPUT_DIR="../build/solr-${BASH_REMATCH[1]}"fidiff --git a/gradle/ant-compat/artifact-naming.gradle b/gradle/ant-compat/artifact-naming.gradleindex 8a0c253537a..cd6451724bb 100644--- a/gradle/ant-compat/artifact-naming.gradle+++ b/gradle/ant-compat/artifact-naming.gradle@@ -16,6 +16,6 @@*/// Stick to previous artifact names (not identical to path/ folders).-configure(subprojects.findAll { it.path.contains(':solr:contrib:') }) {- project.archivesBaseName = project.archivesBaseName.replace("-contrib-", "-")+configure(subprojects.findAll { it.path.contains(':solr:modules:') }) {+ project.archivesBaseName = project.archivesBaseName.replace("-modules-", "-")}diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradleindex 27cc73d9feb..2c942e16732 100644--- a/gradle/documentation/render-javadoc.gradle+++ b/gradle/documentation/render-javadoc.gradle@@ -108,7 +108,7 @@ configure(project(":solr").allprojects) {}}-configure(project(":solr:contrib:analysis-extras")) {+configure(project(":solr:modules:analysis-extras")) {project.tasks.withType(RenderJavadocTask) {// TODO: clean up split packagesjavadocMissingIgnore = [@@ -118,7 +118,7 @@ configure(project(":solr:contrib:analysis-extras")) {}}-configure(project(":solr:contrib:analytics")) {+configure(project(":solr:modules:analytics")) {project.tasks.withType(RenderJavadocTask) {// TODO: clean up split packagesjavadocMissingIgnore = [@@ -129,7 +129,7 @@ configure(project(":solr:contrib:analytics")) {}}-configure(project(":solr:contrib:langid")) {+configure(project(":solr:modules:langid")) {project.tasks.withType(RenderJavadocTask) {// TODO: clean up split packagesjavadocMissingIgnore = ["org.apache.solr.update.processor"]diff --git a/gradle/hacks/solr.findbugs.gradle b/gradle/hacks/solr.findbugs.gradleindex 11114b5854d..44da1e386e2 100644--- a/gradle/hacks/solr.findbugs.gradle+++ b/gradle/hacks/solr.findbugs.gradle@@ -22,12 +22,12 @@configure([project(":solr:core"),project(":solr:solrj"),project(":solr:test-framework"),- project(":solr:contrib:analytics"),- project(":solr:contrib:langid"),- project(":solr:contrib:ltr"),- project(":solr:contrib:s3-repository"),- project(":solr:contrib:scripting"),- project(":solr:contrib:prometheus-exporter")]) {+ project(":solr:modules:analytics"),+ project(":solr:modules:langid"),+ project(":solr:modules:ltr"),+ project(":solr:modules:s3-repository"),+ project(":solr:modules:scripting"),+ project(":solr:modules:prometheus-exporter")]) {plugins.withType(JavaPlugin) {dependencies {// Use versionless variants because these libraries are in versions.lock.diff --git a/gradle/maven/defaults-maven.gradle b/gradle/maven/defaults-maven.gradleindex 54fc5ad1292..61cea3adac7 100644--- a/gradle/maven/defaults-maven.gradle+++ b/gradle/maven/defaults-maven.gradle@@ -27,16 +27,16 @@ configure(rootProject) {":solr:core",":solr:server",":solr:solrj",- ":solr:contrib:analysis-extras",- ":solr:contrib:analytics",- ":solr:contrib:clustering",- ":solr:contrib:extraction",- ":solr:contrib:gcs-repository",- ":solr:contrib:langid",- ":solr:contrib:jaegertracer-configurator",- ":solr:contrib:prometheus-exporter",- ":solr:contrib:s3-repository",- ":solr:contrib:scripting",+ ":solr:modules:analysis-extras",+ ":solr:modules:analytics",+ ":solr:modules:clustering",+ ":solr:modules:extraction",+ ":solr:modules:gcs-repository",+ ":solr:modules:langid",+ ":solr:modules:jaegertracer-configurator",+ ":solr:modules:prometheus-exporter",+ ":solr:modules:s3-repository",+ ":solr:modules:scripting",":solr:test-framework",]diff --git a/gradle/solr/packaging.gradle b/gradle/solr/packaging.gradleindex 8402725ca03..f59324f2a60 100644--- a/gradle/solr/packaging.gradle+++ b/gradle/solr/packaging.gradle@@ -36,7 +36,7 @@// I don't know how to untie these two cleanly.//-configure(allprojects.findAll {project -> project.path.startsWith(":solr:contrib") }) {+configure(allprojects.findAll {project -> project.path.startsWith(":solr:modules") }) {plugins.withType(JavaPlugin) {ext {packagingDir = file("${buildDir}/packaging")@@ -111,7 +111,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr:contribdependsOn syncLib, syncTestLib}- // Contrib packaging currently depends on internal resolve.+ // Module packaging currently depends on internal resolve.artifacts {packaging packagingDir, {builtBy assemblePackagingdiff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradleindex c422ba8e3ec..9652c4e3715 100644--- a/gradle/validation/rat-sources.gradle+++ b/gradle/validation/rat-sources.gradle@@ -98,11 +98,11 @@ allprojects {include "dev-tools/solr-missing-doclet/src/**"break- case ":solr:contrib:clustering":+ case ":solr:modules:clustering":exclude "src/test-files/META-INF/services/*"break- case ":solr:contrib:langid":+ case ":solr:modules:langid":exclude "**/langdetect-profiles/*"breakdiff --git a/gradle/validation/spotless.gradle b/gradle/validation/spotless.gradleindex a0b10b0a2b1..d317824d35c 100644--- a/gradle/validation/spotless.gradle+++ b/gradle/validation/spotless.gradle@@ -44,15 +44,15 @@ configure(project(":solr").subprojects) { prj ->// Exclude certain files (generated ones, mostly).switch (project.path) {- case ":solr:contrib:analytics":- case ":solr:contrib:analysis-extras":- case ":solr:contrib:clustering":- case ":solr:contrib:extraction":- case ":solr:contrib:gcs-repository":- case ":solr:contrib:langid":- case ":solr:contrib:ltr":- case ":solr:contrib:prometheus-exporter":- case ":solr:contrib:scripting":+ case ":solr:modules:analytics":+ case ":solr:modules:analysis-extras":+ case ":solr:modules:clustering":+ case ":solr:modules:extraction":+ case ":solr:modules:gcs-repository":+ case ":solr:modules:langid":+ case ":solr:modules:ltr":+ case ":solr:modules:prometheus-exporter":+ case ":solr:modules:scripting":case ":solr:core":case ":solr:solrj":case ":solr:solr-ref-guide":diff --git a/settings.gradle b/settings.gradleindex 88eab3965b3..11213236b82 100644--- a/settings.gradle+++ b/settings.gradle@@ -29,17 +29,17 @@ includeBuild("dev-tools/solr-missing-doclet")include "solr:solrj"include "solr:core"include "solr:server"-include "solr:contrib:analysis-extras"-include "solr:contrib:analytics"-include "solr:contrib:clustering"-include "solr:contrib:extraction"-include "solr:contrib:langid"-include "solr:contrib:jaegertracer-configurator"-include "solr:contrib:prometheus-exporter"-include "solr:contrib:s3-repository"-include "solr:contrib:scripting"-include "solr:contrib:ltr"-include "solr:contrib:gcs-repository"+include "solr:modules:analysis-extras"+include "solr:modules:analytics"+include "solr:modules:clustering"+include "solr:modules:extraction"+include "solr:modules:langid"+include "solr:modules:jaegertracer-configurator"+include "solr:modules:prometheus-exporter"+include "solr:modules:s3-repository"+include "solr:modules:scripting"+include "solr:modules:ltr"+include "solr:modules:gcs-repository"include "solr:webapp"include "solr:benchmark"include "solr:test-framework"diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 01dd22cd298..8111e3241b8 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -6,7 +6,7 @@ https://github.com/apache/solr/blob/main/solr/solr-ref-guide/src/solr-upgrade-no================== 10.0.0 ==================-Docker and contrib modules have separate CHANGES.md files.+Docker and modules have separate CHANGES.md files.New Features---------------------@@ -30,7 +30,7 @@ Other Changes================== 9.1.0 ==================-Docker and contrib modules have separate CHANGES.md files.+Docker and modules have separate CHANGES.md files.New Features---------------------@@ -54,7 +54,7 @@ Other Changes================== 9.0.0 ==================-Docker and contrib modules have separate CHANGES.md files.+Docker and modules have separate CHANGES.md files.New Features---------------------@@ -119,9 +119,9 @@ Improvements* SOLR-14880: Support coreRootDirectory setting when create new cores from command line, in standalone mode (Alexandre Rafalovitch)-* SOLR-14926, SOLR-14926, SOLR-13506: Modernize and clean up search results clustering contrib. This issue upgrades- the clustering contrib to the new Carrot2 4.x line, dropping several CVE-prone dependencies along the way.- The parameters and configuration of the contrib extensions have changed. The documentation in Solr ref guide+* SOLR-14926, SOLR-14926, SOLR-13506: Modernize and clean up search results clustering module. This issue upgrades+ the clustering module to the new Carrot2 4.x line, dropping several CVE-prone dependencies along the way.+ The parameters and configuration of the module extensions have changed. The documentation in Solr ref guidehas been rewritten from scratch to be up to date. Clustering code has been rewritten from scratch to workproperly regardless of the mode (standalone, distributed). The API has been stripped of ancient, unused, interfacesand simplified. (Dawid Weiss)@@ -377,7 +377,7 @@ Other Changes* SOLR-14944: Remove the "spins" metrics - support for detection of spinning disks has beenremoved in LUCENE-9576. (ab)-* SOLR-14912: Clean up solr-extraction contrib to produce solr-extraction-* jar+* SOLR-14912: Clean up solr-extraction module to produce solr-extraction-* jar(instead of solr-cell-*). (Dawid Weiss)* SOLR-14035: Remove deprecated preferLocalShards=true support in favour of the shards.preference=replica.location:local alternative.@@ -402,7 +402,7 @@ Other Changes* SOLR-15113: Do not attempt to start Solr server when embedded ZK fails (Mike Drob)-* SOLR-14067: StatelessScriptUpdateProcessorFactory moved to it's own /contrib/scripting/ package instead+* SOLR-14067: StatelessScriptUpdateProcessorFactory moved to it's own /module/scripting/ package insteadof shipping as part of Solr due to security concerns. Renamed to ScriptUpdateProcessorFactory for simpler name. (Eric Pugh)* SOLR-15118: Switch /v2/collections APIs over to the now-preferred annotated-POJO implementation approach (Jason Gerlowski)@@ -411,7 +411,7 @@ Other Changes* SOLR-15002: Upgrade httpclient to 4.5.13 and httpcore to 4.4.13 (Andras Salamon via janhoy)-* SOLR-15121: Move XSLT (tr param) response writer and update request handler to scripting contrib. (Eric Pugh, David Smiley)+* SOLR-15121: Move XSLT (tr param) response writer and update request handler to scripting module. (Eric Pugh, David Smiley)* SOLR-15169: SolrPaths.assertPathAllowed normalization problem (Andras Salamon via janhoy)@@ -513,13 +513,15 @@ Other Changes* SOLR-14142: Jetty's RequestLog is enabled by default. If you don't want these logs, you can disablevia SOLR_REQUESTLOG_ENABLED=false. (rmuir, janhoy)-* SOLR-15924: Remove lucene-libs from contrib module packaging. The lucene libraries will be included in lib/ with all other dependencies. (Houston Putman)+* SOLR-15924: Remove lucene-libs from module packaging. The lucene libraries will be included in lib/ with all other dependencies. (Houston Putman)* SOLR-15934: CloseHook is now an interface with default method implementations instead of an abstract class. (Mike Drob)* SOLR-15916: Remove dist/ from the binary release. The solr-core and solrj jars will be included in the server WEB-INF/lib directory,and each individual module's jar will be included in its directory's lib/ folder. (Houston Putman)+* SOLR-15917: "Contrib Modules" have been renamed to "Modules" and have been moved from "contrib/" to "modules/". (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/README.md b/solr/README.mdindex 0fb2f6206e6..ff545da6ec5 100644--- a/solr/README.md+++ b/solr/README.md@@ -148,9 +148,9 @@ example/Contains example documents and an alternative Solr homedirectory containing various examples.-contrib/+modules/Contains modules to extend the functionality of Solr.- Libraries for these modules can be found under contrib/*/lib+ Libraries for these modules can be found under modules/*/libdocker/Contains a docker file to build a Docker image using the source binary distribution.diff --git a/solr/contrib/langid/src/java/overview.html b/solr/contrib/langid/src/java/overview.htmldeleted file mode 100644index 9bc5c9a1b0d..00000000000--- a/solr/contrib/langid/src/java/overview.html+++ /dev/null@@ -1,21 +0,0 @@-<!--- Licensed to the Apache Software Foundation (ASF) under one or more- contributor license agreements. See the NOTICE file distributed with- this work for additional information regarding copyright ownership.- The ASF licenses this file to You under the Apache License, Version 2.0- (the "License"); you may not use this file except in compliance with- the License. You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<html>-<body>-Apache Solr Search Server: Solr Language Identifier contrib-</body>-</html>diff --git a/solr/core/build.gradle b/solr/core/build.gradleindex a40b83df4fb..c96aa52efdd 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -166,7 +166,7 @@ dependencies {testImplementation "org.apache.lucene:lucene-analysis-icu"- testImplementation project(':solr:contrib:analysis-extras')+ testImplementation project(':solr:modules:analysis-extras')testImplementation project(':solr:test-framework')diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex a40feb779d8..d3604a2be56 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -2770,7 +2770,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {m.put("xlsx",(QueryResponseWriter) Class.forName("org.apache.solr.handler.extraction.XLSXResponseWriter").getConstructor().newInstance());} catch (Exception e) {- //don't worry; solrcell contrib not in class path+ //don't worry; extraction module not in class path}}diff --git a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.javaindex cb469babded..e7519880b05 100644--- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java@@ -29,7 +29,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;/**- * Plugin for lucene/contrib Surround query parser, bringing SpanQuery support+ * Plugin for lucene Surround query parser, bringing SpanQuery support* to Solr.* <p>* <queryParser name="surround"diff --git a/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/solrconfig.xml b/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/solrconfig.xmlindex 0de065014e6..315bfffbf6c 100644--- a/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/solrconfig.xml+++ b/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/solrconfig.xml@@ -37,7 +37,7 @@<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>- <lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib/" regex=".*\.jar" /><requestHandler name="/select" class="solr.SearchHandler"><lst name="defaults">diff --git a/solr/core/src/test/org/apache/solr/cloud/MockScriptUpdateProcessorFactory.java b/solr/core/src/test/org/apache/solr/cloud/MockScriptUpdateProcessorFactory.javaindex 2ba19587a1b..e8d78298fd4 100644--- a/solr/core/src/test/org/apache/solr/cloud/MockScriptUpdateProcessorFactory.java+++ b/solr/core/src/test/org/apache/solr/cloud/MockScriptUpdateProcessorFactory.java@@ -32,7 +32,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;/*** <p>* The scripting update processor capability is something that is only allowed by a trusted- * configSet. The actual code lives in the /contrib/scripting project, however the test+ * configSet. The actual code lives in the /modules/scripting project, however the test* for trusted configsets lives in TestConfigSetsAPI. This class is meant to simulate the* ScriptUpdateProcessorFactory for this test.* </p>diff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.templateindex df215f17697..77022beb4c4 100644--- a/solr/docker/templates/Dockerfile.body.template+++ b/solr/docker/templates/Dockerfile.body.template@@ -44,7 +44,7 @@ ENV SOLR_USER="solr" \SOLR_UID="8983" \SOLR_GROUP="solr" \SOLR_GID="8983" \- PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/contrib/prometheus-exporter/bin:$PATH" \+ PATH="/opt/solr/bin:/opt/solr/docker/scripts:/opt/solr/modules/prometheus-exporter/bin:$PATH" \SOLR_INCLUDE=/etc/default/solr.in.sh \SOLR_HOME=/var/solr/data \SOLR_PID_DIR=/var/solr \diff --git a/solr/example/README.md b/solr/example/README.mdindex 6a03dbf3c4b..f7a9b76135b 100644--- a/solr/example/README.md+++ b/solr/example/README.md@@ -77,11 +77,11 @@ Notes About These ExamplesVarious example SolrHome dirs contained in this directory may use "<lib>"statements in the solrconfig.xml file to reference plugin jars outside of-this directory for loading "contrib" plugins via relative paths.+this directory for loading modules via relative paths.If you make a copy of this example server and wish to use theExtractingRequestHandler (SolrCell), the clustering component,-or any other modules in "contrib", you will need to+or any other modules, you will need tocopy the required jars or update the paths to those jars in yoursolrconfig.xml.diff --git a/solr/contrib/analysis-extras/README.md b/solr/modules/analysis-extras/README.mdsimilarity index 92%rename from solr/contrib/analysis-extras/README.mdrename to solr/modules/analysis-extras/README.mdindex 298f3160145..77aa5ebe673 100644--- a/solr/contrib/analysis-extras/README.md+++ b/solr/modules/analysis-extras/README.md@@ -9,7 +9,7 @@ analyzers for Chinese and Polish, and integration withOpenNLP for multilingual tokenization, part-of-speech tagginglemmatization, phrase chunking, and named-entity recognition.-Each of the jars below relies upon including `/contrib/analysis-extras/lib/solr-analysis-extras-X.Y.Z.jar`+Each of the jars below relies upon including `/modules/analysis-extras/lib/solr-analysis-extras-X.Y.Z.jar`in the `solrconfig.xml`* ICU relies upon `lib/lucene-analyzers-icu-X.Y.jar`diff --git a/solr/contrib/analysis-extras/build.gradle b/solr/modules/analysis-extras/build.gradlesimilarity index 100%rename from solr/contrib/analysis-extras/build.gradlerename to solr/modules/analysis-extras/build.gradlediff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.javarename to solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.javadiff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html b/solr/modules/analysis-extras/src/java/org/apache/solr/schema/package.htmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.htmlrename to solr/modules/analysis-extras/src/java/org/apache/solr/schema/package.htmldiff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java b/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.javarename to solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.javadiff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/package.html b/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/package.htmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/package.htmlrename to solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/package.htmldiff --git a/solr/contrib/analytics/src/java/overview.html b/solr/modules/analysis-extras/src/java/overview.htmlsimilarity index 94%rename from solr/contrib/analytics/src/java/overview.htmlrename to solr/modules/analysis-extras/src/java/overview.htmlindex 68c3ff27259..eb108ed304c 100644--- a/solr/contrib/analytics/src/java/overview.html+++ b/solr/modules/analysis-extras/src/java/overview.html@@ -16,6 +16,6 @@--><html><body>-Apache Solr Search Server: Analytics Component+Apache Solr Search Server: Analysis Extras module</body></html>diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-ner.bin b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-ner.binsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-ner.binrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-ner.bindiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-sent.bin b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-sent.binsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-sent.binrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-sent.bindiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-tokenizer.bin b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-tokenizer.binsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-tokenizer.binrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/en-test-tokenizer.bindiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xmldiff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlsimilarity index 100%rename from solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlrename to solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmldiff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.java b/solr/modules/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.javarename to solr/modules/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.javadiff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.javarename to solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.javadiff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.javarename to solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.javadiff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java b/solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.javarename to solr/modules/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.javadiff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/update/processor/TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.java b/solr/modules/analysis-extras/src/test/org/apache/solr/update/processor/TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/analysis-extras/src/test/org/apache/solr/update/processor/TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.javarename to solr/modules/analysis-extras/src/test/org/apache/solr/update/processor/TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.javadiff --git a/solr/contrib/analytics/build.gradle b/solr/modules/analytics/build.gradlesimilarity index 100%rename from solr/contrib/analytics/build.gradlerename to solr/modules/analytics/build.gradlediff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsDriver.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsDriver.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsDriver.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsDriver.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsExpression.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsExpression.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsExpression.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsExpression.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsGroupingManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsGroupingManager.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsGroupingManager.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsGroupingManager.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestManager.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestManager.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestManager.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestParser.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestParser.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestParser.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/AnalyticsRequestParser.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/ExpressionFactory.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/TimeExceededStubException.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/TimeExceededStubException.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/TimeExceededStubException.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/TimeExceededStubException.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/AbstractSolrQueryFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AbstractSolrQueryFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/AbstractSolrQueryFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AbstractSolrQueryFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/QueryFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/QueryFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/QueryFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/QueryFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/RangeFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/RangeFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/RangeFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/RangeFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/StreamingFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/StreamingFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/StreamingFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/StreamingFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/ValueFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/ValueFacet.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/ValueFacet.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/ValueFacet.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/ConstantComparator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/ConstantComparator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/ConstantComparator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/ConstantComparator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/DelegatingComparator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/DelegatingComparator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/DelegatingComparator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/DelegatingComparator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/ExpressionComparator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/ExpressionComparator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/ExpressionComparator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/ExpressionComparator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetResultsComparator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetResultsComparator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetResultsComparator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetResultsComparator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetValueComparator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetValueComparator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetValueComparator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/FacetValueComparator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/compare/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/compare/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/facet/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/facet/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ExpressionCalculator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ExpressionCalculator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ExpressionCalculator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/ExpressionCalculator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/MergingReductionCollectionManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/MergingReductionCollectionManager.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/MergingReductionCollectionManager.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/MergingReductionCollectionManager.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ReductionFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/ReductionFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/AnalyticsField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/AnalyticsField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/AnalyticsField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/AnalyticsField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/BooleanField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/BooleanField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/BooleanField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/BooleanField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/BooleanMultiField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/BooleanMultiField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/BooleanMultiField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/BooleanMultiField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiPointField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiPointField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiPointField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiPointField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiTrieField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiTrieField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiTrieField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DateMultiTrieField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiPointField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiPointField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiPointField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiPointField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiTrieField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiTrieField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiTrieField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/DoubleMultiTrieField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiPointField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiPointField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiPointField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiPointField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiTrieField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiTrieField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiTrieField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/FloatMultiTrieField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiPointField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiPointField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiPointField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiPointField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiTrieField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiTrieField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiTrieField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/IntMultiTrieField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiPointField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiPointField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiPointField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiPointField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiTrieField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiTrieField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiTrieField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/LongMultiTrieField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/StringField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/StringField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/StringField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/StringField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/StringMultiField.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/StringMultiField.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/StringMultiField.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/StringMultiField.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/field/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/field/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/AbsoluteValueFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/AbsoluteValueFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/AbsoluteValueFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/AbsoluteValueFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/AddFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/AddFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/AddFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/AddFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/BottomFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/BottomFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/BottomFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/BottomFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ComparisonFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ComparisonFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ComparisonFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ComparisonFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ConcatFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ConcatFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ConcatFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ConcatFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DateMathFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DateMathFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DateMathFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DateMathFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DateParseFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DateParseFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DateParseFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DateParseFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DecimalNumericConversionFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DecimalNumericConversionFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DecimalNumericConversionFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DecimalNumericConversionFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DivideFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DivideFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/DivideFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/DivideFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/EqualFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/EqualFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/EqualFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/EqualFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ExistsFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ExistsFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ExistsFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ExistsFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/FillMissingFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/FillMissingFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/FillMissingFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/FillMissingFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/FilterFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/FilterFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/FilterFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/FilterFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/IfFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/IfFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/IfFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/IfFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LogFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LogFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LogFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LogFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LogicFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LogicFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LogicFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/LogicFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/MultFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/MultFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/MultFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/MultFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/NegateFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/NegateFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/NegateFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/NegateFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/PowerFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/PowerFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/PowerFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/PowerFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/RemoveFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/RemoveFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/RemoveFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/RemoveFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ReplaceFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ReplaceFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/ReplaceFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/ReplaceFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/StringCastFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/StringCastFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/StringCastFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/StringCastFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/SubtractFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/SubtractFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/SubtractFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/SubtractFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/TopFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/TopFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/TopFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/TopFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/mapping/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/CountFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/CountFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/CountFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/CountFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/DocCountFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/DocCountFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/DocCountFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/DocCountFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MaxFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MaxFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MaxFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MaxFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MeanFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MeanFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MeanFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MeanFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MedianFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MedianFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MedianFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MedianFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MinFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MinFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MinFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MinFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MissingFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MissingFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/MissingFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/MissingFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/OrdinalFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/OrdinalFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/OrdinalFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/OrdinalFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/PercentileFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/PercentileFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/PercentileFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/PercentileFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/SumFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/SumFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/SumFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/SumFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/UniqueFunction.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/UniqueFunction.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/UniqueFunction.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/UniqueFunction.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionData.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionData.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionData.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionData.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionDataCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionDataCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionDataCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/ReductionDataCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/data/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/function/reduction/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/plugin/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/plugin/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardResponseParser.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardResponseParser.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardResponseParser.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardResponseParser.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/BooleanReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/DoubleReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/FloatReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/IntReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/LongReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionCheckedDataReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionCheckedDataReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionCheckedDataReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionCheckedDataReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/ReductionDataReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringArrayReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringArrayReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringArrayReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringArrayReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringCheckedReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringCheckedReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringCheckedReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringCheckedReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringReservation.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringReservation.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringReservation.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/StringReservation.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/BooleanDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/DoubleDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/FloatDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/IntDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/LongDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/ReductionDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringCheckedDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringCheckedDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringCheckedDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringCheckedDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataArrayReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataArrayReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataArrayReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataArrayReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataReader.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataReader.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataReader.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/StringDataReader.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/read/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/BooleanDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/DoubleDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/FloatDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/IntDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/LongDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/ReductionDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringCheckedDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringCheckedDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringCheckedDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringCheckedDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataArrayWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataArrayWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataArrayWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataArrayWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataWriter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/StringDataWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/stream/reservation/write/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsResponseHeadings.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/AnalyticsResponseHeadings.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsResponseHeadings.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/AnalyticsResponseHeadings.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/FacetRangeGenerator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/FacetRangeGenerator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/FacetRangeGenerator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/FacetRangeGenerator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsParams.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsParams.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsParams.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsParams.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsRequestConverter.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsRequestConverter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsRequestConverter.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/OldAnalyticsRequestConverter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OrdinalCalculator.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/OrdinalCalculator.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/OrdinalCalculator.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/OrdinalCalculator.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/BooleanConsumer.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/BooleanConsumer.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/BooleanConsumer.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/BooleanConsumer.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/FloatConsumer.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/FloatConsumer.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/FloatConsumer.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/FloatConsumer.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/FloatSupplier.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/FloatSupplier.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/FloatSupplier.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/FloatSupplier.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/function/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/function/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/util/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/util/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/AnalyticsValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/BooleanValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/BooleanValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/BooleanValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/BooleanValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/BooleanValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/BooleanValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/BooleanValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/BooleanValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/ComparableValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/ComparableValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/ComparableValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/ComparableValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DateValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/DateValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DateValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/DateValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DateValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/DateValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DateValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/DateValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DoubleValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/DoubleValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DoubleValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/DoubleValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DoubleValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/DoubleValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/DoubleValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/DoubleValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/FloatValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/FloatValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/FloatValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/FloatValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/FloatValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/FloatValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/FloatValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/FloatValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/IntValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/IntValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/IntValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/IntValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/IntValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/IntValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/IntValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/IntValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/LongValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/LongValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/LongValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/LongValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/LongValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/LongValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/LongValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/LongValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/StringValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/StringValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/StringValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/StringValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/StringValueStream.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/StringValueStream.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/StringValueStream.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/StringValueStream.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantBooleanValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantBooleanValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantBooleanValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantBooleanValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDateValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDateValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDateValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDateValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDoubleValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDoubleValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDoubleValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantDoubleValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantFloatValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantFloatValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantFloatValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantFloatValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantIntValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantIntValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantIntValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantIntValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantLongValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantLongValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantLongValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantLongValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantStringValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantStringValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantStringValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantStringValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantValue.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantValue.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantValue.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/ConstantValue.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/constant/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/constant/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/value/package-info.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/value/package-info.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/analytics/value/package-info.javarename to solr/modules/analytics/src/java/org/apache/solr/analytics/value/package-info.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/AnalyticsHandler.java b/solr/modules/analytics/src/java/org/apache/solr/handler/AnalyticsHandler.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/handler/AnalyticsHandler.javarename to solr/modules/analytics/src/java/org/apache/solr/handler/AnalyticsHandler.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java b/solr/modules/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.javarename to solr/modules/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/package.html b/solr/modules/analytics/src/java/org/apache/solr/handler/component/package.htmlsimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/handler/component/package.htmlrename to solr/modules/analytics/src/java/org/apache/solr/handler/component/package.htmldiff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/package.html b/solr/modules/analytics/src/java/org/apache/solr/handler/package.htmlsimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/handler/package.htmlrename to solr/modules/analytics/src/java/org/apache/solr/handler/package.htmldiff --git a/solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.java b/solr/modules/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.javasimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.javarename to solr/modules/analytics/src/java/org/apache/solr/response/AnalyticsShardResponseWriter.javadiff --git a/solr/contrib/analytics/src/java/org/apache/solr/response/package.html b/solr/modules/analytics/src/java/org/apache/solr/response/package.htmlsimilarity index 100%rename from solr/contrib/analytics/src/java/org/apache/solr/response/package.htmlrename to solr/modules/analytics/src/java/org/apache/solr/response/package.htmldiff --git a/solr/contrib/clustering/src/java/overview.html b/solr/modules/analytics/src/java/overview.htmlsimilarity index 93%rename from solr/contrib/clustering/src/java/overview.htmlrename to solr/modules/analytics/src/java/overview.htmlindex 59940f65641..58a95d351a0 100644--- a/solr/contrib/clustering/src/java/overview.html+++ b/solr/modules/analytics/src/java/overview.html@@ -16,6 +16,6 @@--><html><body>-Apache Solr Search Server: text clustering contrib+Apache Solr Search Server: Analytics Component module</body></html>diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/expressions.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/expressions.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/expressions.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/expressions.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/facetSorting.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/facetSorting.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/facetSorting.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/facetSorting.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/facetWithDottedFields.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/facetWithDottedFields.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/facetWithDottedFields.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/facetWithDottedFields.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/fieldFacetExtras.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/fieldFacetExtras.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/fieldFacetExtras.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/fieldFacetExtras.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/fieldFacets.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/fieldFacets.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/fieldFacets.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/fieldFacets.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/functions.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/functions.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/functions.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/functions.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/noFacets.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/noFacets.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/noFacets.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/noFacets.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/queryFacets.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/queryFacets.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/queryFacets.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/queryFacets.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/analytics/legacy/rangeFacets.txt b/solr/modules/analytics/src/test-files/solr/analytics/legacy/rangeFacets.txtsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/analytics/legacy/rangeFacets.txtrename to solr/modules/analytics/src/test-files/solr/analytics/legacy/rangeFacets.txtdiff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml b/solr/modules/analytics/src/test-files/solr/collection1/conf/schema-analytics.xmlsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xmlrename to solr/modules/analytics/src/test-files/solr/collection1/conf/schema-analytics.xmldiff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml b/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xmlsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xmlrename to solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xmldiff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlrename to solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmldiff --git a/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xml b/solr/modules/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xmlsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xmlrename to solr/modules/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xmldiff --git a/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xml b/solr/modules/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xmlrename to solr/modules/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xmldiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/ExpressionFactoryTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/SolrAnalyticsFacetTestCase.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/SolrAnalyticsFacetTestCase.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/SolrAnalyticsFacetTestCase.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/facet/SolrAnalyticsFacetTestCase.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/AbstractAnalyticsFieldTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/AbstractAnalyticsFieldTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/AbstractAnalyticsFieldTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/AbstractAnalyticsFieldTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/BooleanFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/BooleanFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/BooleanFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/BooleanFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/StringFieldsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/StringFieldsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/StringFieldsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/field/StringFieldsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AbsoluteValueFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AddFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/AndFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/BottomFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/BottomFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/BottomFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/BottomFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/CeilingFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ConcatFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DateMathFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DateMathFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DateMathFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DateMathFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DateParseFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DateParseFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DateParseFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DateParseFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/DivideFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FillMissingFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FilterFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/FloorFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTEFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/GTFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/IfFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTEFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LTFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/LogFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/MultFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/NegateFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/OrFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/PowerFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RemoveFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/ReplaceFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/RoundFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/StringCastFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/SubtractFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/TopFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/TopFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/TopFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/function/mapping/TopFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetExtrasTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyQueryFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetCloudTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetCloudTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetCloudTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetCloudTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyRangeFacetTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/util/OldAnalyticsRequestConverterUnitTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/ConstantValueTest.javadiff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/value/FillableTestValue.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/FillableTestValue.javasimilarity index 100%rename from solr/contrib/analytics/src/test/org/apache/solr/analytics/value/FillableTestValue.javarename to solr/modules/analytics/src/test/org/apache/solr/analytics/value/FillableTestValue.javadiff --git a/solr/contrib/clustering/README.md b/solr/modules/clustering/README.mdsimilarity index 57%rename from solr/contrib/clustering/README.mdrename to solr/modules/clustering/README.mdindex f51149b5b7f..8b14c9c9289 100644--- a/solr/contrib/clustering/README.md+++ b/solr/modules/clustering/README.md@@ -1,4 +1,4 @@-The Clustering contrib plugin for Solr provides a generic mechanism for plugging in third party clustering implementations.+The Clustering module for Solr provides a generic mechanism for plugging in third party clustering implementations.It currently provides clustering support for search results using the Carrot2 project.See https://solr.apache.org/guide/result-clustering.html for how to get started.diff --git a/solr/contrib/clustering/build.gradle b/solr/modules/clustering/build.gradlesimilarity index 100%rename from solr/contrib/clustering/build.gradlerename to solr/modules/clustering/build.gradlediff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/Engine.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/Engine.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/Engine.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/Engine.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineContext.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineContext.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineContext.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineContext.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineEntry.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineEntry.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineEntry.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineEntry.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/FlatKeysAttrVisitor.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/FlatKeysAttrVisitor.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/FlatKeysAttrVisitor.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/FlatKeysAttrVisitor.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/InputDocument.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/InputDocument.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/InputDocument.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/InputDocument.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/PathResourceLookup.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/PathResourceLookup.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/PathResourceLookup.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/PathResourceLookup.javadiff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/package-info.javasimilarity index 100%rename from solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.javarename to solr/modules/clustering/src/java/org/apache/solr/handler/clustering/package-info.javadiff --git a/solr/contrib/analysis-extras/src/java/overview.html b/solr/modules/clustering/src/java/overview.htmlsimilarity index 94%rename from solr/contrib/analysis-extras/src/java/overview.htmlrename to solr/modules/clustering/src/java/overview.htmlindex f3d70ca5522..bfa75cdd277 100644--- a/solr/contrib/analysis-extras/src/java/overview.html+++ b/solr/modules/clustering/src/java/overview.html@@ -16,6 +16,6 @@--><html><body>-Apache Solr Search Server: Analysis Extras contrib+Apache Solr Search Server: text clustering module</body></html>diff --git a/solr/contrib/clustering/src/test-files/META-INF/services/org.carrot2.clustering.ClusteringAlgorithmProvider b/solr/modules/clustering/src/test-files/META-INF/services/org.carrot2.clustering.ClusteringAlgorithmProvidersimilarity index 100%rename from solr/contrib/clustering/src/test-files/META-INF/services/org.carrot2.clustering.ClusteringAlgorithmProviderrename to solr/modules/clustering/src/test-files/META-INF/services/org.carrot2.clustering.ClusteringAlgorithmProviderdiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/protwords.txt b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/protwords.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/protwords.txtrename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/protwords.txtdiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xmlrename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xmlrename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xmldiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/stopwords.txt b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/stopwords.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/stopwords.txtrename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/stopwords.txtdiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stoplabels.utf8 b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stoplabels.utf8similarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stoplabels.utf8rename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stoplabels.utf8diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stopwords.utf8 b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stopwords.utf8similarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stopwords.utf8rename to solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/testCustomLanguageResources/english.stopwords.utf8diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/core.properties b/solr/modules/clustering/src/test-files/clustering/solr/collection1/core.propertiessimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/collection1/core.propertiesrename to solr/modules/clustering/src/test-files/clustering/solr/collection1/core.propertiesdiff --git a/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml b/solr/modules/clustering/src/test-files/clustering/solr/solr.xmlsimilarity index 100%rename from solr/contrib/clustering/src/test-files/clustering/solr/solr.xmlrename to solr/modules/clustering/src/test-files/clustering/solr/solr.xmldiff --git a/solr/contrib/clustering/src/test-files/log4j2.xml b/solr/modules/clustering/src/test-files/log4j2.xmlsimilarity index 100%rename from solr/contrib/clustering/src/test-files/log4j2.xmlrename to solr/modules/clustering/src/test-files/log4j2.xmldiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testLingoAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testLingoAlgorithm.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testLingoAlgorithm.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testLingoAlgorithm.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testStcAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testStcAlgorithm.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testStcAlgorithm.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest-testStcAlgorithm.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testCustomLanguageResources.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testCustomLanguageResources.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testCustomLanguageResources.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testCustomLanguageResources.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testDefaultEngineOrder.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testDefaultEngineOrder.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testDefaultEngineOrder.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testDefaultEngineOrder.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testKmeansAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testKmeansAlgorithm.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testKmeansAlgorithm.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testKmeansAlgorithm.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testLingoAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testLingoAlgorithm.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testLingoAlgorithm.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testLingoAlgorithm.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamDefaultLanguage.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamDefaultLanguage.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamDefaultLanguage.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamDefaultLanguage.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamLanguageField.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamLanguageField.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamLanguageField.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamLanguageField.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamOtherTopics.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamOtherTopics.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamOtherTopics.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamOtherTopics.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-off.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-off.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-off.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-off.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-on.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-on.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-on.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testParamSubclusters-on.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributes.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributes.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributes.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributes.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributesViaSolrConfig.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributesViaSolrConfig.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributesViaSolrConfig.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testPassingAttributesViaSolrConfig.txtdiff --git a/solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txtsimilarity index 100%rename from solr/contrib/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txtrename to solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txtdiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithm.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithm.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithm.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithm.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithmProvider.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithmProvider.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithmProvider.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/EchoClusteringAlgorithmProvider.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithm.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithm.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithm.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithm.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithmProvider.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithmProvider.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithmProvider.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/MockClusteringAlgorithmProvider.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithm.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithm.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithm.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithm.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithmProvider.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithmProvider.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithmProvider.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ResourceCheckAlgorithmProvider.javadiff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/SampleData.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/SampleData.javasimilarity index 100%rename from solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/SampleData.javarename to solr/modules/clustering/src/test/org/apache/solr/handler/clustering/SampleData.javadiff --git a/solr/contrib/extraction/README.md b/solr/modules/extraction/README.mdsimilarity index 94%rename from solr/contrib/extraction/README.mdrename to solr/modules/extraction/README.mdindex c92078c5ffd..243430783e5 100644--- a/solr/contrib/extraction/README.md+++ b/solr/modules/extraction/README.md@@ -5,7 +5,7 @@ Introduction------------Apache Solr Extraction provides a means for extracting and indexing content contained in "rich" documents, such-as Microsoft Word, Adobe PDF, etc. (Each name is a trademark of their respective owners) This contrib module+as Microsoft Word, Adobe PDF, etc. (Each name is a trademark of their respective owners) This moduleuses Apache Tika to extract content and metadata from the files, which can then be indexed. For more information,see https://solr.apache.org/guide/indexing-with-tika.htmldiff --git a/solr/contrib/extraction/build.gradle b/solr/modules/extraction/build.gradlesimilarity index 97%rename from solr/contrib/extraction/build.gradlerename to solr/modules/extraction/build.gradleindex edff47fe953..bd401423433 100644--- a/solr/contrib/extraction/build.gradle+++ b/solr/modules/extraction/build.gradle@@ -22,8 +22,8 @@ description = 'Solr Integration with Tika for extracting content from binary fildependencies {implementation project(':solr:core')- // We export tika because other contribs depend on it (and its submodules)- // and we don't want to duplicate the dependency across different contribs.+ // We export tika because other modules depend on it (and its submodules)+ // and we don't want to duplicate the dependency across different modules.api ('org.apache.tika:tika-core') { transitive = false }api ('org.apache.tika:tika-parsers') { transitive = false }diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingMetadataConstants.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingMetadataConstants.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingMetadataConstants.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingMetadataConstants.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingParams.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingParams.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingParams.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingParams.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandlerFactory.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandlerFactory.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandlerFactory.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandlerFactory.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.javadiff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/package-info.javasimilarity index 100%rename from solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.javarename to solr/modules/extraction/src/java/org/apache/solr/handler/extraction/package-info.javadiff --git a/solr/contrib/extraction/src/java/overview.html b/solr/modules/extraction/src/java/overview.htmlsimilarity index 94%rename from solr/contrib/extraction/src/java/overview.htmlrename to solr/modules/extraction/src/java/overview.htmlindex 8aefb57db8d..fa23d8b3e9b 100644--- a/solr/contrib/extraction/src/java/overview.html+++ b/solr/modules/extraction/src/java/overview.html@@ -16,6 +16,6 @@--><html><body>-Apache Solr Search Server: Solr Cell contrib+Apache Solr Search Server: Solr Cell module</body></html>diff --git a/solr/contrib/extraction/src/resources/solr-default-tika-config.xml b/solr/modules/extraction/src/resources/solr-default-tika-config.xmlsimilarity index 100%rename from solr/contrib/extraction/src/resources/solr-default-tika-config.xmlrename to solr/modules/extraction/src/resources/solr-default-tika-config.xmldiff --git a/solr/contrib/extraction/src/test-files/extraction/arabic.pdf b/solr/modules/extraction/src/test-files/extraction/arabic.pdfsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/arabic.pdfrename to solr/modules/extraction/src/test-files/extraction/arabic.pdfdiff --git a/solr/contrib/extraction/src/test-files/extraction/encrypted-password-is-solrRules.pdf b/solr/modules/extraction/src/test-files/extraction/encrypted-password-is-solrRules.pdfsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/encrypted-password-is-solrRules.pdfrename to solr/modules/extraction/src/test-files/extraction/encrypted-password-is-solrRules.pdfdiff --git a/solr/contrib/extraction/src/test-files/extraction/example.html b/solr/modules/extraction/src/test-files/extraction/example.htmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/example.htmlrename to solr/modules/extraction/src/test-files/extraction/example.htmldiff --git a/solr/contrib/extraction/src/test-files/extraction/open-document.odt b/solr/modules/extraction/src/test-files/extraction/open-document.odtsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/open-document.odtrename to solr/modules/extraction/src/test-files/extraction/open-document.odtdiff --git a/solr/contrib/extraction/src/test-files/extraction/password-is-Word2010.docx b/solr/modules/extraction/src/test-files/extraction/password-is-Word2010.docxsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/password-is-Word2010.docxrename to solr/modules/extraction/src/test-files/extraction/password-is-Word2010.docxdiff --git a/solr/contrib/extraction/src/test-files/extraction/password-is-solrcell.docx b/solr/modules/extraction/src/test-files/extraction/password-is-solrcell.docxsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/password-is-solrcell.docxrename to solr/modules/extraction/src/test-files/extraction/password-is-solrcell.docxdiff --git a/solr/contrib/extraction/src/test-files/extraction/pdf-with-image.pdf b/solr/modules/extraction/src/test-files/extraction/pdf-with-image.pdfsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/pdf-with-image.pdfrename to solr/modules/extraction/src/test-files/extraction/pdf-with-image.pdfdiff --git a/solr/contrib/extraction/src/test-files/extraction/simple.html b/solr/modules/extraction/src/test-files/extraction/simple.htmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/simple.htmlrename to solr/modules/extraction/src/test-files/extraction/simple.htmldiff --git a/solr/contrib/extraction/src/test-files/extraction/solr-word.pdf b/solr/modules/extraction/src/test-files/extraction/solr-word.pdfsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr-word.pdfrename to solr/modules/extraction/src/test-files/extraction/solr-word.pdfdiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/parseContext.xml b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/parseContext.xmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/parseContext.xmlrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/parseContext.xmldiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.propertiessimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.propertiesrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.propertiesdiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/protwords.txt b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/protwords.txtsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/protwords.txtrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/protwords.txtdiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xmlrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xmlrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xmldiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/stopwords.txt b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/stopwords.txtsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/stopwords.txtrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/stopwords.txtdiff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/synonyms.txt b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/synonyms.txtsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/synonyms.txtrename to solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/synonyms.txtdiff --git a/solr/contrib/extraction/src/test-files/extraction/tiny.txt.gz b/solr/modules/extraction/src/test-files/extraction/tiny.txt.gzsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/tiny.txt.gzrename to solr/modules/extraction/src/test-files/extraction/tiny.txt.gzdiff --git a/solr/contrib/extraction/src/test-files/extraction/version_control.txt b/solr/modules/extraction/src/test-files/extraction/version_control.txtsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/version_control.txtrename to solr/modules/extraction/src/test-files/extraction/version_control.txtdiff --git a/solr/contrib/extraction/src/test-files/extraction/version_control.xml b/solr/modules/extraction/src/test-files/extraction/version_control.xmlsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/version_control.xmlrename to solr/modules/extraction/src/test-files/extraction/version_control.xmldiff --git a/solr/contrib/extraction/src/test-files/extraction/word2003.doc b/solr/modules/extraction/src/test-files/extraction/word2003.docsimilarity index 100%rename from solr/contrib/extraction/src/test-files/extraction/word2003.docrename to solr/modules/extraction/src/test-files/extraction/word2003.docdiff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.javasimilarity index 100%rename from solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.javarename to solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.javadiff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.javasimilarity index 100%rename from solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.javarename to solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.javadiff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.javasimilarity index 100%rename from solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.javarename to solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.javadiff --git a/solr/contrib/gcs-repository/README.md b/solr/modules/gcs-repository/README.mdsimilarity index 100%rename from solr/contrib/gcs-repository/README.mdrename to solr/modules/gcs-repository/README.mddiff --git a/solr/contrib/gcs-repository/build.gradle b/solr/modules/gcs-repository/build.gradlesimilarity index 100%rename from solr/contrib/gcs-repository/build.gradlerename to solr/modules/gcs-repository/build.gradlediff --git a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.javarename to solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.javadiff --git a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.javarename to solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.javadiff --git a/solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/package-info.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/package-info.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/package-info.javarename to solr/modules/gcs-repository/src/java/org/apache/solr/gcs/package-info.javadiff --git a/solr/contrib/gcs-repository/src/test-files/conf/schema.xml b/solr/modules/gcs-repository/src/test-files/conf/schema.xmlsimilarity index 100%rename from solr/contrib/gcs-repository/src/test-files/conf/schema.xmlrename to solr/modules/gcs-repository/src/test-files/conf/schema.xmldiff --git a/solr/contrib/gcs-repository/src/test-files/conf/solrconfig.xml b/solr/modules/gcs-repository/src/test-files/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/gcs-repository/src/test-files/conf/solrconfig.xmlrename to solr/modules/gcs-repository/src/test-files/conf/solrconfig.xmldiff --git a/solr/contrib/gcs-repository/src/test-files/log4j2.xml b/solr/modules/gcs-repository/src/test-files/log4j2.xmlsimilarity index 100%rename from solr/contrib/gcs-repository/src/test-files/log4j2.xmlrename to solr/modules/gcs-repository/src/test-files/log4j2.xmldiff --git a/solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.javarename to solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.javadiff --git a/solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSBackupRepositoryTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSBackupRepositoryTest.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSBackupRepositoryTest.javarename to solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSBackupRepositoryTest.javadiff --git a/solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.javarename to solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.javadiff --git a/solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.javasimilarity index 100%rename from solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.javarename to solr/modules/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.javadiff --git a/solr/contrib/jaegertracer-configurator/README.md b/solr/modules/jaegertracer-configurator/README.mdsimilarity index 100%rename from solr/contrib/jaegertracer-configurator/README.mdrename to solr/modules/jaegertracer-configurator/README.mddiff --git a/solr/contrib/jaegertracer-configurator/build.gradle b/solr/modules/jaegertracer-configurator/build.gradlesimilarity index 100%rename from solr/contrib/jaegertracer-configurator/build.gradlerename to solr/modules/jaegertracer-configurator/build.gradlediff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java b/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.javasimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.javarename to solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.javadiff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java b/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.javasimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.javarename to solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.javadiff --git a/solr/contrib/jaegertracer-configurator/src/java/overview.html b/solr/modules/jaegertracer-configurator/src/java/overview.htmlsimilarity index 84%rename from solr/contrib/jaegertracer-configurator/src/java/overview.htmlrename to solr/modules/jaegertracer-configurator/src/java/overview.htmlindex 846e1703752..4cd8d033cfb 100644--- a/solr/contrib/jaegertracer-configurator/src/java/overview.html+++ b/solr/modules/jaegertracer-configurator/src/java/overview.html@@ -16,10 +16,10 @@--><html><body>-Apache Solr Search Server: Solr Jaeger Tracer Configurator contrib+Apache Solr Search Server: Solr Jaeger Tracer Configurator module<p>-This package provides provides a way for you to expose Solr's tracing to Jaeger.+This module provides provides a way for you to expose Solr's tracing to Jaeger.</p></body>diff --git a/solr/contrib/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xmlrename to solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xmlrename to solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xmldiff --git a/solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xml b/solr/modules/jaegertracer-configurator/src/test-files/solr/solr.xmlsimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xmlrename to solr/modules/jaegertracer-configurator/src/test-files/solr/solr.xmldiff --git a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java b/solr/modules/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.javasimilarity index 100%rename from solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.javarename to solr/modules/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.javadiff --git a/solr/contrib/langid/README.md b/solr/modules/langid/README.mdsimilarity index 92%rename from solr/contrib/langid/README.mdrename to solr/modules/langid/README.mdindex ebb4b59d226..e35010dca62 100644--- a/solr/contrib/langid/README.md+++ b/solr/modules/langid/README.md@@ -18,6 +18,6 @@ for more information.Dependencies-------------The Tika detector depends on Tika Core (which is part of extraction contrib)+The Tika detector depends on Tika Core (which is part of the extraction module)The Langdetect detector depends on LangDetect libraryThe OpenNLP detector depends on OpenNLP tools and requires a previously trained user-supplied modeldiff --git a/solr/contrib/langid/build.gradle b/solr/modules/langid/build.gradlesimilarity index 92%rename from solr/contrib/langid/build.gradlerename to solr/modules/langid/build.gradleindex d1214fc89a4..1a8629c10f2 100644--- a/solr/contrib/langid/build.gradle+++ b/solr/modules/langid/build.gradle@@ -18,7 +18,7 @@apply plugin: 'java-library'-description = 'Language Identifier contrib for extracting language from a document being indexed'+description = 'Language Identifier module for extracting language from a document being indexed'dependencies {implementation project(':solr:core')diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/LangIdParams.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/LangIdParams.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessor.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessor.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessor.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessor.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactory.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/SolrInputDocumentReader.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/SolrInputDocumentReader.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/SolrInputDocumentReader.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/SolrInputDocumentReader.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java b/solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.javarename to solr/modules/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.javadiff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html b/solr/modules/langid/src/java/org/apache/solr/update/processor/package.htmlsimilarity index 100%rename from solr/contrib/langid/src/java/org/apache/solr/update/processor/package.htmlrename to solr/modules/langid/src/java/org/apache/solr/update/processor/package.htmldiff --git a/solr/modules/langid/src/java/overview.html b/solr/modules/langid/src/java/overview.htmlnew file mode 100644index 00000000000..234e6a014f1--- /dev/null+++ b/solr/modules/langid/src/java/overview.html@@ -0,0 +1,21 @@+<!--+ Licensed to the Apache Software Foundation (ASF) under one or more+ contributor license agreements. See the NOTICE file distributed with+ this work for additional information regarding copyright ownership.+ The ASF licenses this file to You under the Apache License, Version 2.0+ (the "License"); you may not use this file except in compliance with+ the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->+<html>+<body>+Apache Solr Search Server: Solr Language Identifier module+</body>+</html>diff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/af b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/afsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/afrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/afdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ar b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/arsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/arrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ardiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bg b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bgsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bgrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bgdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bn b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bnsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bnrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/bndiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/cs b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/cssimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/csrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/csdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/da b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/dasimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/darename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/dadiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/de b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/desimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/derename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/dediff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/el b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/elsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/elrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/eldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/en b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ensimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/enrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/endiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/es b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/essimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/esrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/esdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/et b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/etsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/etrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/etdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fa b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fasimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/farename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fadiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fi b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fisimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/firename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fidiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/fr b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/frsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/frrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/frdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/gu b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/gusimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/gurename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/gudiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/he b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hesimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/herename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hediff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hi b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hisimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hirename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hidiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hr b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hrsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hrrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hrdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hu b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/husimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hurename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/hudiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/id b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/idsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/idrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/iddiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/it b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/itsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/itrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/itdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ja b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/jasimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/jarename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/jadiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/kn b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/knsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/knrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/kndiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ko b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/kosimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/korename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/kodiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/lt b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ltsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ltrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ltdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/lv b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/lvsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/lvrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/lvdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mk b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mksimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mkrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mkdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ml b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mlsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mlrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mr b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mrsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mrrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/mrdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ne b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nesimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nerename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nediff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nl b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nlsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nlrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/no b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nosimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/norename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/nodiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/pa b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/pasimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/parename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/padiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/pl b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/plsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/plrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/pldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/pt b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ptsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ptrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ptdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ro b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rosimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rorename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rodiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ru b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rusimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rurename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/rudiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sk b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sksimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/skrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/skdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sl b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/slsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/slrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/so b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sosimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sorename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sodiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sq b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sqsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sqrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sqdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sv b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/svsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/svrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/svdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/sw b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/swsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/swrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/swdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ta b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tasimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tarename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tadiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/te b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tesimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/terename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tediff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/th b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/thsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/threname to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/thdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tl b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tlsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tlrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tldiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/tr b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/trsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/trrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/trdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/uk b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/uksimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ukrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ukdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ur b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/ursimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/urrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/urdiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/vi b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/visimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/virename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/vidiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-cn b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-cnsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-cnrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-cndiff --git a/solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-tw b/solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-twsimilarity index 100%rename from solr/contrib/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-twrename to solr/modules/langid/src/resources/org/apache/solr/update/processor/langdetect-profiles/zh-twdiff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/opennlp-langdetect.eng-swe-spa-rus-deu.bin b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/opennlp-langdetect.eng-swe-spa-rus-deu.binsimilarity index 100%rename from solr/contrib/langid/src/test-files/langid/solr/collection1/conf/opennlp-langdetect.eng-swe-spa-rus-deu.binrename to solr/modules/langid/src/test-files/langid/solr/collection1/conf/opennlp-langdetect.eng-swe-spa-rus-deu.bindiff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xmlrename to solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xmlsimilarity index 100%rename from solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xmlrename to solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xmldiff --git a/solr/contrib/langid/src/test-files/opennlp.langdetect.trainer.params.txt b/solr/modules/langid/src/test-files/opennlp.langdetect.trainer.params.txtsimilarity index 100%rename from solr/contrib/langid/src/test-files/opennlp.langdetect.trainer.params.txtrename to solr/modules/langid/src/test-files/opennlp.langdetect.trainer.params.txtdiff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.javasimilarity index 100%rename from solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.javarename to solr/modules/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.javadiff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.javasimilarity index 100%rename from solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.javarename to solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.javadiff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactoryTest.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactoryTest.javasimilarity index 100%rename from solr/contrib/langid/src/test/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactoryTest.javarename to solr/modules/langid/src/test/org/apache/solr/update/processor/OpenNLPLangDetectUpdateProcessorFactoryTest.javadiff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.javasimilarity index 100%rename from solr/contrib/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.javarename to solr/modules/langid/src/test/org/apache/solr/update/processor/SolrInputDocumentReaderTest.javadiff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.javasimilarity index 100%rename from solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.javarename to solr/modules/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.javadiff --git a/solr/contrib/ltr/README.md b/solr/modules/ltr/README.mdsimilarity index 100%rename from solr/contrib/ltr/README.mdrename to solr/modules/ltr/README.mddiff --git a/solr/contrib/ltr/build.gradle b/solr/modules/ltr/build.gradlesimilarity index 100%rename from solr/contrib/ltr/build.gradlerename to solr/modules/ltr/build.gradlediff --git a/solr/contrib/ltr/example/README.md b/solr/modules/ltr/example/README.mdsimilarity index 97%rename from solr/contrib/ltr/example/README.mdrename to solr/modules/ltr/example/README.mdindex 482da31b078..feadabf9df2 100644--- a/solr/contrib/ltr/example/README.md+++ b/solr/modules/ltr/example/README.md@@ -10,15 +10,15 @@ Please refer to the Solr Reference Guide's section on [Learning To Rank](https:/1. Download and install [liblinear](https://www.csie.ntu.edu.tw/~cjlin/liblinear/)-2. Change `contrib/ltr/example/config.json` "trainingLibraryLocation" to point to the train directory where you installed liblinear.+2. Change `modules/ltr/example/config.json` "trainingLibraryLocation" to point to the train directory where you installed liblinear.Alternatively, leave the `config.json` file unchanged and create a soft-link to your `liblinear` directory e.g.- `ln -s /Users/YourNameHere/Downloads/liblinear-2.1 ./contrib/ltr/example/liblinear`+ `ln -s /Users/YourNameHere/Downloads/liblinear-2.1 ./modules/ltr/example/liblinear`3. Extract features, train a reranking model, and deploy it to Solr.- `cd contrib/ltr/example`+ `cd modules/ltr/example``python train_and_upload_demo_model.py -c config.json`diff --git a/solr/contrib/ltr/example/config.json b/solr/modules/ltr/example/config.jsonsimilarity index 100%rename from solr/contrib/ltr/example/config.jsonrename to solr/modules/ltr/example/config.jsondiff --git a/solr/contrib/ltr/example/exampleFeatures.json b/solr/modules/ltr/example/exampleFeatures.jsonsimilarity index 100%rename from solr/contrib/ltr/example/exampleFeatures.jsonrename to solr/modules/ltr/example/exampleFeatures.jsondiff --git a/solr/contrib/ltr/example/libsvm_formatter.py b/solr/modules/ltr/example/libsvm_formatter.pysimilarity index 100%rename from solr/contrib/ltr/example/libsvm_formatter.pyrename to solr/modules/ltr/example/libsvm_formatter.pydiff --git a/solr/contrib/ltr/example/train_and_upload_demo_model.py b/solr/modules/ltr/example/train_and_upload_demo_model.pysimilarity index 100%rename from solr/contrib/ltr/example/train_and_upload_demo_model.pyrename to solr/modules/ltr/example/train_and_upload_demo_model.pydiff --git a/solr/contrib/ltr/example/user_queries.txt b/solr/modules/ltr/example/user_queries.txtsimilarity index 100%rename from solr/contrib/ltr/example/user_queries.txtrename to solr/modules/ltr/example/user_queries.txtdiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/CSVFeatureLogger.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/CSVFeatureLogger.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/CSVFeatureLogger.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/CSVFeatureLogger.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/DocInfo.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/DocInfo.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/DocInfo.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/DocInfo.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/FeatureLogger.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/FeatureLogger.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/FeatureLogger.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/FeatureLogger.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/LTRRescorer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/LTRThreadModule.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/SolrQueryRequestContextUtils.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/SolrQueryRequestContextUtils.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/SolrQueryRequestContextUtils.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/SolrQueryRequestContextUtils.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/Feature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/Feature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FeatureException.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FeatureException.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FeatureException.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FeatureException.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FieldLengthFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldLengthFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FieldLengthFeature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldLengthFeature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/FieldValueFeature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/OriginalScoreFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/OriginalScoreFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/OriginalScoreFeature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/OriginalScoreFeature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/ValueFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/ValueFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/ValueFeature.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/ValueFeature.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/feature/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/Interleaving.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/Interleaving.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/Interleaving.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/Interleaving.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/InterleavingResult.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/InterleavingResult.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/InterleavingResult.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/InterleavingResult.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingQuery.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingQuery.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingQuery.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingScoringQuery.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingScoringQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingScoringQuery.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingScoringQuery.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/OriginalRankingLTRScoringQuery.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/OriginalRankingLTRScoringQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/OriginalRankingLTRScoringQuery.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/OriginalRankingLTRScoringQuery.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/DefaultWrapperModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/DefaultWrapperModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/DefaultWrapperModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/DefaultWrapperModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LinearModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/LinearModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/ModelException.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/ModelException.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/ModelException.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/ModelException.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/WrapperModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/WrapperModel.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/WrapperModel.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/WrapperModel.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/model/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/model/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/IdentityNormalizer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/IdentityNormalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/IdentityNormalizer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/IdentityNormalizer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/MinMaxNormalizer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/Normalizer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/Normalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/Normalizer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/Normalizer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/NormalizerException.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/NormalizerException.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/NormalizerException.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/NormalizerException.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/StandardNormalizer.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/norm/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/norm/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/norm/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQuery.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/search/LTRQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQuery.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/search/LTRQuery.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/search/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/search/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/search/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/FeatureStore.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/FeatureStore.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/FeatureStore.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/FeatureStore.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/ModelStore.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/ModelStore.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/ModelStore.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/ModelStore.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/package-info.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedFeatureStore.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedFeatureStore.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedFeatureStore.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedFeatureStore.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/ManagedModelStore.javadiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/package-info.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/package-info.javasimilarity index 100%rename from solr/contrib/ltr/src/java/org/apache/solr/ltr/store/rest/package-info.javarename to solr/modules/ltr/src/java/org/apache/solr/ltr/store/rest/package-info.javadiff --git a/solr/contrib/ltr/src/java/overview.html b/solr/modules/ltr/src/java/overview.htmlsimilarity index 96%rename from solr/contrib/ltr/src/java/overview.htmlrename to solr/modules/ltr/src/java/overview.htmlindex 5e9b7b28b94..4f726170536 100644--- a/solr/contrib/ltr/src/java/overview.html+++ b/solr/modules/ltr/src/java/overview.html@@ -16,10 +16,10 @@--><html><body>-Apache Solr Search Server: Learning to Rank Contrib+Apache Solr Search Server: Learning to Rank module<p>-This module contains a logic <strong>to plug machine learned ranking modules into Solr</strong>.+This module contains logic <strong>to plug machine learned ranking modules into Solr</strong>.</p><p>In information retrieval systems, Learning to Rank is used to re-rank the top Xdiff --git a/solr/contrib/ltr/src/test-files/featureExamples/comp_features.json b/solr/modules/ltr/src/test-files/featureExamples/comp_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/comp_features.jsonrename to solr/modules/ltr/src/test-files/featureExamples/comp_features.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/external_features.json b/solr/modules/ltr/src/test-files/featureExamples/external_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/external_features.jsonrename to solr/modules/ltr/src/test-files/featureExamples/external_features.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/external_features_for_sparse_processing.json b/solr/modules/ltr/src/test-files/featureExamples/external_features_for_sparse_processing.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/external_features_for_sparse_processing.jsonrename to solr/modules/ltr/src/test-files/featureExamples/external_features_for_sparse_processing.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/features-linear-efi.json b/solr/modules/ltr/src/test-files/featureExamples/features-linear-efi.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/features-linear-efi.jsonrename to solr/modules/ltr/src/test-files/featureExamples/features-linear-efi.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/features-linear.json b/solr/modules/ltr/src/test-files/featureExamples/features-linear.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/features-linear.jsonrename to solr/modules/ltr/src/test-files/featureExamples/features-linear.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/features-store-test-model.json b/solr/modules/ltr/src/test-files/featureExamples/features-store-test-model.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/features-store-test-model.jsonrename to solr/modules/ltr/src/test-files/featureExamples/features-store-test-model.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/fq_features.json b/solr/modules/ltr/src/test-files/featureExamples/fq_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/fq_features.jsonrename to solr/modules/ltr/src/test-files/featureExamples/fq_features.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/multipleadditivetreesmodel_features.json b/solr/modules/ltr/src/test-files/featureExamples/multipleadditivetreesmodel_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/multipleadditivetreesmodel_features.jsonrename to solr/modules/ltr/src/test-files/featureExamples/multipleadditivetreesmodel_features.jsondiff --git a/solr/contrib/ltr/src/test-files/featureExamples/neuralnetworkmodel_features.json b/solr/modules/ltr/src/test-files/featureExamples/neuralnetworkmodel_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/featureExamples/neuralnetworkmodel_features.jsonrename to solr/modules/ltr/src/test-files/featureExamples/neuralnetworkmodel_features.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/external_model.json b/solr/modules/ltr/src/test-files/modelExamples/external_model.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/external_model.jsonrename to solr/modules/ltr/src/test-files/modelExamples/external_model.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/external_model2.json b/solr/modules/ltr/src/test-files/modelExamples/external_model2.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/external_model2.jsonrename to solr/modules/ltr/src/test-files/modelExamples/external_model2.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json b/solr/modules/ltr/src/test-files/modelExamples/fq-model.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/fq-model.jsonrename to solr/modules/ltr/src/test-files/modelExamples/fq-model.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/linear-model-efi.json b/solr/modules/ltr/src/test-files/modelExamples/linear-model-efi.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/linear-model-efi.jsonrename to solr/modules/ltr/src/test-files/modelExamples/linear-model-efi.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json b/solr/modules/ltr/src/test-files/modelExamples/linear-model.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/linear-model.jsonrename to solr/modules/ltr/src/test-files/modelExamples/linear-model.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/linear-model_notExistentFeature.json b/solr/modules/ltr/src/test-files/modelExamples/linear-model_notExistentFeature.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/linear-model_notExistentFeature.jsonrename to solr/modules/ltr/src/test-files/modelExamples/linear-model_notExistentFeature.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/linear-model_notExistentStore.json b/solr/modules/ltr/src/test-files/modelExamples/linear-model_notExistentStore.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/linear-model_notExistentStore.jsonrename to solr/modules/ltr/src/test-files/modelExamples/linear-model_notExistentStore.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_external_binary_features.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_external_binary_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_external_binary_features.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_external_binary_features.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_feature.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_feature.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_feature.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_feature.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_features.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_features.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_features.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_features.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_left.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_left.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_left.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_left.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_params.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_params.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_params.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_params.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_right.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_right.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_right.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_right.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_threshold.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_threshold.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_threshold.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_threshold.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_tree.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_tree.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_tree.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_tree.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_trees.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_trees.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_trees.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_trees.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_weight.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_weight.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_weight.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_no_weight.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_notExistentStore.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_notExistentStore.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_notExistentStore.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_notExistentStore.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_unknownFeature.json b/solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_unknownFeature.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_unknownFeature.jsonrename to solr/modules/ltr/src/test-files/modelExamples/multipleadditivetreesmodel_unknownFeature.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_bad_activation.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_bad_activation.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_bad_activation.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_bad_activation.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_custom.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_custom.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_custom.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_custom.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_explainable.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_explainable.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_explainable.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_explainable.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_bias.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_bias.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_bias.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_bias.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_input.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_input.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_input.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_input.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_layers.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_layers.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_layers.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_mismatch_layers.jsondiff --git a/solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.json b/solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.jsonsimilarity index 100%rename from solr/contrib/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.jsonrename to solr/modules/ltr/src/test-files/modelExamples/neuralnetworkmodel_too_many_rows.jsondiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xmlrename to solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xmlsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xmlrename to solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xmldiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xmlsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xmlrename to solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xmldiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xmlsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xmlrename to solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xmldiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/stopwords.txt b/solr/modules/ltr/src/test-files/solr/collection1/conf/stopwords.txtsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/stopwords.txtrename to solr/modules/ltr/src/test-files/solr/collection1/conf/stopwords.txtdiff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/synonyms.txt b/solr/modules/ltr/src/test-files/solr/collection1/conf/synonyms.txtsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/collection1/conf/synonyms.txtrename to solr/modules/ltr/src/test-files/solr/collection1/conf/synonyms.txtdiff --git a/solr/contrib/ltr/src/test-files/solr/solr.xml b/solr/modules/ltr/src/test-files/solr/solr.xmlsimilarity index 100%rename from solr/contrib/ltr/src/test-files/solr/solr.xmlrename to solr/modules/ltr/src/test-files/solr/solr.xmldiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/FeatureLoggerTestUtils.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/FeatureLoggerTestUtils.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/FeatureLoggerTestUtils.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/FeatureLoggerTestUtils.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleavingTest.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestLinearModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestWrapperModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestWrapperModel.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestWrapperModel.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestWrapperModel.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestMinMaxNormalizer.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/norm/TestStandardNormalizer.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManager.javadiff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.javasimilarity index 100%rename from solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.javarename to solr/modules/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.javadiff --git a/solr/contrib/prometheus-exporter/README.md b/solr/modules/prometheus-exporter/README.mdsimilarity index 100%rename from solr/contrib/prometheus-exporter/README.mdrename to solr/modules/prometheus-exporter/README.mddiff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter b/solr/modules/prometheus-exporter/bin/solr-exportersimilarity index 100%rename from solr/contrib/prometheus-exporter/bin/solr-exporterrename to solr/modules/prometheus-exporter/bin/solr-exporterdiff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd b/solr/modules/prometheus-exporter/bin/solr-exporter.cmdsimilarity index 100%rename from solr/contrib/prometheus-exporter/bin/solr-exporter.cmdrename to solr/modules/prometheus-exporter/bin/solr-exporter.cmddiff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/modules/prometheus-exporter/build.gradlesimilarity index 100%rename from solr/contrib/prometheus-exporter/build.gradlerename to solr/modules/prometheus-exporter/build.gradlediff --git a/solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json b/solr/modules/prometheus-exporter/conf/grafana-solr-dashboard.jsonsimilarity index 100%rename from solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.jsonrename to solr/modules/prometheus-exporter/conf/grafana-solr-dashboard.jsondiff --git a/solr/contrib/prometheus-exporter/conf/log4j2.xml b/solr/modules/prometheus-exporter/conf/log4j2.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/conf/log4j2.xmlrename to solr/modules/prometheus-exporter/conf/log4j2.xmldiff --git a/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml b/solr/modules/prometheus-exporter/conf/solr-exporter-config.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/conf/solr-exporter-config.xmlrename to solr/modules/prometheus-exporter/conf/solr-exporter-config.xmldiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/CollectionsCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/CollectionsCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/CollectionsCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/CollectionsCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/PingCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/PingCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/PingCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/PingCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SearchCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SearchCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SearchCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SearchCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/package-info.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/package-info.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/package-info.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/package-info.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/CachedPrometheusCollector.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/CachedPrometheusCollector.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/CachedPrometheusCollector.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/CachedPrometheusCollector.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQueryTemplate.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQueryTemplate.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQueryTemplate.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQueryTemplate.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/package-info.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/package-info.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/package-info.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/package-info.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.javadiff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/package-info.java b/solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/package-info.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/package-info.javarename to solr/modules/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/package-info.javadiff --git a/solr/contrib/prometheus-exporter/src/java/overview.html b/solr/modules/prometheus-exporter/src/java/overview.htmlsimilarity index 93%rename from solr/contrib/prometheus-exporter/src/java/overview.htmlrename to solr/modules/prometheus-exporter/src/java/overview.htmlindex df1c45a6390..b2d0980d8df 100644--- a/solr/contrib/prometheus-exporter/src/java/overview.html+++ b/solr/modules/prometheus-exporter/src/java/overview.html@@ -16,7 +16,7 @@--><html><body>-Apache Solr Search Server: Solr Prometheus Exporter contrib+Apache Solr Search Server: Solr Prometheus Exporter module<p>This package provides tools for monitoring Solr with Prometheus.diff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml b/solr/modules/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xmlrename to solr/modules/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml b/solr/modules/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xmlrename to solr/modules/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xml b/solr/modules/prometheus-exporter/src/test-files/conf/test-config-with-templates.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xmlrename to solr/modules/prometheus-exporter/src/test-files/conf/test-config-with-templates.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/gb18030-example.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/gb18030-example.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/gb18030-example.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/gb18030-example.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/hd.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/hd.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/hd.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/hd.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/ipod_other.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/ipod_other.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/ipod_other.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/ipod_other.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/ipod_video.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/ipod_video.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/ipod_video.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/ipod_video.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/manufacturers.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/manufacturers.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/manufacturers.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/manufacturers.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/mem.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/mem.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/mem.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/mem.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/money.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/money.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/money.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/money.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/monitor.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/monitor.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/monitor.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/monitor.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/monitor2.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/monitor2.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/monitor2.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/monitor2.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/mp500.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/mp500.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/mp500.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/mp500.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/sample.html b/solr/modules/prometheus-exporter/src/test-files/exampledocs/sample.htmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/sample.htmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/sample.htmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/sd500.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/sd500.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/sd500.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/sd500.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/solr.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/solr.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/solr.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/solr.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/utf8-example.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/utf8-example.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/utf8-example.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/utf8-example.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/exampledocs/vidcard.xml b/solr/modules/prometheus-exporter/src/test-files/exampledocs/vidcard.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/exampledocs/vidcard.xmlrename to solr/modules/prometheus-exporter/src/test-files/exampledocs/vidcard.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/query-metrics.json b/solr/modules/prometheus-exporter/src/test-files/query-metrics.jsonsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/query-metrics.jsonrename to solr/modules/prometheus-exporter/src/test-files/query-metrics.jsondiff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema b/solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schemasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schemarename to solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schemadiff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xmlrename to solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xmldiff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/stopwords.txt b/solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/stopwords.txtsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/stopwords.txtrename to solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/stopwords.txtdiff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/synonyms.txt b/solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/synonyms.txtsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/synonyms.txtrename to solr/modules/prometheus-exporter/src/test-files/solr/collection1/conf/synonyms.txtdiff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/solr.xml b/solr/modules/prometheus-exporter/src/test-files/solr/solr.xmlsimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test-files/solr/solr.xmlrename to solr/modules/prometheus-exporter/src/test-files/solr/solr.xmldiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/PrometheusExporterTestBase.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/PrometheusExporterTestBase.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/PrometheusExporterTestBase.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/PrometheusExporterTestBase.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.javadiff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java b/solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.javasimilarity index 100%rename from solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.javarename to solr/modules/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.javadiff --git a/solr/contrib/s3-repository/README.md b/solr/modules/s3-repository/README.mdsimilarity index 100%rename from solr/contrib/s3-repository/README.mdrename to solr/modules/s3-repository/README.mddiff --git a/solr/contrib/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradlesimilarity index 100%rename from solr/contrib/s3-repository/build.gradlerename to solr/modules/s3-repository/build.gradlediff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepositoryConfig.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepositoryConfig.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepositoryConfig.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3BackupRepositoryConfig.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3Exception.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3Exception.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3Exception.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3Exception.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3IndexInput.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3IndexInput.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3IndexInput.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3IndexInput.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3NotFoundException.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3NotFoundException.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3NotFoundException.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3NotFoundException.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3OutputStream.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.javadiff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/package-info.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/package-info.javasimilarity index 100%rename from solr/contrib/s3-repository/src/java/org/apache/solr/s3/package-info.javarename to solr/modules/s3-repository/src/java/org/apache/solr/s3/package-info.javadiff --git a/solr/contrib/s3-repository/src/test-files/conf/schema.xml b/solr/modules/s3-repository/src/test-files/conf/schema.xmlsimilarity index 100%rename from solr/contrib/s3-repository/src/test-files/conf/schema.xmlrename to solr/modules/s3-repository/src/test-files/conf/schema.xmldiff --git a/solr/contrib/s3-repository/src/test-files/conf/solrconfig.xml b/solr/modules/s3-repository/src/test-files/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/s3-repository/src/test-files/conf/solrconfig.xmlrename to solr/modules/s3-repository/src/test-files/conf/solrconfig.xmldiff --git a/solr/contrib/s3-repository/src/test-files/log4j2.xml b/solr/modules/s3-repository/src/test-files/log4j2.xmlsimilarity index 100%rename from solr/contrib/s3-repository/src/test-files/log4j2.xmlrename to solr/modules/s3-repository/src/test-files/log4j2.xmldiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3IndexInputTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IndexInputTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3IndexInputTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IndexInputTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.javadiff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.javasimilarity index 100%rename from solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.javarename to solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.javadiff --git a/solr/contrib/scripting/README.md b/solr/modules/scripting/README.mdsimilarity index 91%rename from solr/contrib/scripting/README.mdrename to solr/modules/scripting/README.mdindex 2ed9ed761fb..a9f0fbcf08a 100644--- a/solr/contrib/scripting/README.md+++ b/solr/modules/scripting/README.md@@ -3,7 +3,7 @@ Welcome to Apache Solr Scripting!# Introduction-The Scripting contrib module pulls together various scripting related functions.+The Scripting module pulls together various scripting related functions.Today, the ScriptUpdateProcessorFactory allows Java scripting engines to support scripts written in languages such as JavaScript, Ruby, Python, and Groovy to be used during Solr document update processing, allowing dramatic flexibility in expressing custom document processing before being indexed. It exposes hooks for commit, delete, etc, but add is the most common usage. It is implemented as an UpdateProcessor to be placed in an UpdateChain.diff --git a/solr/contrib/scripting/build.gradle b/solr/modules/scripting/build.gradlesimilarity index 100%rename from solr/contrib/scripting/build.gradlerename to solr/modules/scripting/build.gradlediff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/package-info.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/package-info.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/package-info.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/package-info.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptEngineCustomizer.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptEngineCustomizer.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptEngineCustomizer.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptEngineCustomizer.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/update/package-info.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/update/package-info.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/update/package-info.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/update/package-info.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/TransformerProvider.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTConstants.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTConstants.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTConstants.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTConstants.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTResponseWriter.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandler.javadiff --git a/solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/package-info.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/package-info.javasimilarity index 100%rename from solr/contrib/scripting/src/java/org/apache/solr/scripting/xslt/package-info.javarename to solr/modules/scripting/src/java/org/apache/solr/scripting/xslt/package-info.javadiff --git a/solr/contrib/scripting/src/java/overview.html b/solr/modules/scripting/src/java/overview.htmlsimilarity index 95%rename from solr/contrib/scripting/src/java/overview.htmlrename to solr/modules/scripting/src/java/overview.htmlindex 82eb0f8bebf..823fe062a01 100644--- a/solr/contrib/scripting/src/java/overview.html+++ b/solr/modules/scripting/src/java/overview.html@@ -16,7 +16,7 @@--><html><body>-Apache Solr Search Server: Scripting contrib+Apache Solr Search Server: Scripting module<p>This package provides an Update Processor that allows for Java scripting enginesdiff --git a/solr/contrib/scripting/src/test-files/mailing_lists.pdf b/solr/modules/scripting/src/test-files/mailing_lists.pdfsimilarity index 100%rename from solr/contrib/scripting/src/test-files/mailing_lists.pdfrename to solr/modules/scripting/src/test-files/mailing_lists.pdfdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/evil.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/evil.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/invalid.script.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/invalid.script.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/invalid.script.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/invalid.script.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/missleading.extension.updateprocessor.js.txt b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missleading.extension.updateprocessor.js.txtsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/missleading.extension.updateprocessor.js.txtrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missleading.extension.updateprocessor.js.txtdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/schema.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xmlsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xmlrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xmldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.jssimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.jsrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.jsdiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy-using-include.xsl b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy-using-include.xslsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy-using-include.xslrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy-using-include.xsldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy.xsl b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy.xslsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy.xslrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/dummy.xsldiff --git a/solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/xsl-update-handler-test.xsl b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/xsl-update-handler-test.xslsimilarity index 100%rename from solr/contrib/scripting/src/test-files/scripting/solr/collection1/conf/xslt/xsl-update-handler-test.xslrename to solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/xslt/xsl-update-handler-test.xsldiff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.javasimilarity index 100%rename from solr/contrib/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.javarename to solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptEngineTest.javadiff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.javasimilarity index 99%rename from solr/contrib/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.javarename to solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.javaindex 6f2b3c15bb2..81ff231be8d 100644--- a/solr/contrib/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java+++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java@@ -33,7 +33,7 @@ import org.junit.BeforeClass;/*** Tests {@link ScriptUpdateProcessorFactory}.*- * TODO: This test, to run from an IDE, requires a working directory of <path-to>/solr/contrib/scripting/src/test-files. Fix!+ * TODO: This test, to run from an IDE, requires a working directory of <path-to>/solr/modules/scripting/src/test-files. Fix!*/public class ScriptUpdateProcessorFactoryTest extends UpdateProcessorTestBase {diff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.javasimilarity index 100%rename from solr/contrib/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.javarename to solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.javadiff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.javasimilarity index 100%rename from solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.javarename to solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.javadiff --git a/solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.javasimilarity index 100%rename from solr/contrib/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.javarename to solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.javadiff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradleindex 33ffc0171d8..75b96f4184d 100644--- a/solr/packaging/build.gradle+++ b/solr/packaging/build.gradle@@ -31,7 +31,7 @@ ext {}configurations {- contrib+ modulesexampleserverdocs@@ -47,19 +47,19 @@ artifacts {}dependencies {- [":solr:contrib:analysis-extras",- ":solr:contrib:analytics",- ":solr:contrib:extraction",- ":solr:contrib:clustering",- ":solr:contrib:gcs-repository",- ":solr:contrib:jaegertracer-configurator",- ":solr:contrib:langid",- ":solr:contrib:ltr",- ":solr:contrib:prometheus-exporter",- ":solr:contrib:s3-repository",- ":solr:contrib:scripting"- ].each { contribName ->- contrib project(path: contribName, configuration: "packaging")+ [":solr:modules:analysis-extras",+ ":solr:modules:analytics",+ ":solr:modules:extraction",+ ":solr:modules:clustering",+ ":solr:modules:gcs-repository",+ ":solr:modules:jaegertracer-configurator",+ ":solr:modules:langid",+ ":solr:modules:ltr",+ ":solr:modules:prometheus-exporter",+ ":solr:modules:s3-repository",+ ":solr:modules:scripting"+ ].each { moduleName ->+ modules project(path: moduleName, configuration: "packaging")}example project(path: ":solr:example", configuration: "packaging")@@ -94,8 +94,8 @@ distributions {include "README.md"})- from(configurations.contrib, {- into "contrib"+ from(configurations.modules, {+ into "modules"})from(configurations.example, {diff --git a/solr/server/README.md b/solr/server/README.mdindex 3760227fa3a..0c26546614f 100644--- a/solr/server/README.md+++ b/solr/server/README.md@@ -95,11 +95,11 @@ container).Various example SolrHome dirs contained in this directory may use "<lib>"statements in the solrconfig.xml file to reference plugin jars outside of-this directory for loading "contrib" plugins via relative paths.+this directory for loading modules via relative paths.If you make a copy of this example server and wish to use theExtractingRequestHandler (SolrCell), the clustering component,-or any other modules in "contrib", you will need to+or any other modules, you will need tocopy the required jars or update the paths to those jars in yoursolrconfig.xml.diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex 24be78d7841..30d8b3ad36c 100644--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml@@ -69,10 +69,10 @@If a 'dir' option (with or without a regex) is used and nothingis found that matches, a warning will be logged.- The example below can be used to load a solr-contrib along+ The example below can be used to load a solr module alongwith their external dependencies.-->- <!-- <lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib" regex=".*\.jar" /> -->+ <!-- <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib" regex=".*\.jar" /> --><!-- an exact 'path' can be used instead of a 'dir' to specify aspecific jar file. This will cause a serious error to be loggeddiff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex 6876b508e2e..df34a2e4094 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml@@ -69,18 +69,18 @@If a 'dir' option (with or without a regex) is used and nothingis found that matches, a warning will be logged.- The examples below can be used to load some solr-contribs along+ The examples below can be used to load some solr modules alongwith their external dependencies.-->- <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/extraction/lib" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/clustering/lib/" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/langid/lib/" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib/" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/scripting/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/scripting/lib/" regex=".*\.jar" /><!-- an exact 'path' can be used instead of a 'dir' to specify aspecific jar file. This will cause a serious error to be logged@@ -453,7 +453,7 @@<!-- Feature Values Cache- Cache used by the Learning To Rank (LTR) contrib module.+ Cache used by the Learning To Rank (LTR) module.You will need to set the solr.ltr.enabled system propertywhen running solr to run with ltr enabled:@@ -1242,7 +1242,7 @@<!-- Language identificationThis example update request process chain identifies the language of the incoming- documents using the langid contrib. The detected language is+ documents using the langid module. The detected language iswritten to field language_s. No field name mapping is done.The fields used for detection are text, title, subject and description,making this example suitable for detecting languages form full-text@@ -1310,7 +1310,7 @@<!-- XSLT response writer transforms the XML output by any xslt file foundin Solr's conf/xslt directory. Changes to xslt files are checked- every xsltCacheLifetimeSeconds. This is part of the Scripting contrib module.+ every xsltCacheLifetimeSeconds. This is part of the Scripting module.See more about this response writer at https://solr.apache.org/guide/response-writers.html#xslt-response-writer-->diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xslindex 7fc6d773ba1..90c506d7146 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl@@ -21,7 +21,7 @@But you can also store a query response XML to disk and feed this XML tothe XSLTUpdateRequestHandler to index the content. Provided as example only.- This is part of the Scripting contrib module.+ This is part of the Scripting module.See more about this response writer at https://solr.apache.org/guide/response-writers.html#xslt-response-writerdiff --git a/solr/solr-ref-guide/src/analytics.adoc b/solr/solr-ref-guide/src/analytics.adocindex ee21d72729d..9c236244020 100644--- a/solr/solr-ref-guide/src/analytics.adoc+++ b/solr/solr-ref-guide/src/analytics.adoc@@ -25,16 +25,16 @@ The standard facets are supported within the analytics component with additions== Analytics Configuration-The Analytics component is in a contrib module, therefore it will need to be enabled in the `solrconfig.xml` for each collection where you would like to use it.+The Analytics component is in a module, therefore it will need to be enabled in the `solrconfig.xml` for each collection where you would like to use it.Since the Analytics framework is a _search component_, it must be declared as such and added to the search handler.For distributed analytics requests over cloud collections, the component uses the `AnalyticsHandler` strictly for inter-shard communication.The Analytics Handler should not be used by users to submit analytics requests.-To use the Analytics Component, the first step is to install this contrib module's plugins into Solr -- see the <<solr-plugins.adoc#installing-plugins,Solr Plugins>> section on how to do this.+To use the Analytics Component, the first step is to install this module's plugins into Solr -- see the <<solr-plugins.adoc#installing-plugins,Solr Plugins>> section on how to do this.Note: Method with `<lib/>` directive doesn't work.-Instead copy `${solr.install.dir}/contrib/analytics/lib/solr-analytics-x.x.x.jar` to `${solr.install.dir}/server/solr-webapp/webapp/WEB-INF/lib/`, as described in the <<libs.adoc#lib-directories,lib directories documentation>>.+Instead copy `${solr.install.dir}/modules/analytics/lib/solr-analytics-{solr-full-version}.jar` to `${solr.install.dir}/server/solr-webapp/webapp/WEB-INF/lib/`, as described in the <<libs.adoc#lib-directories,lib directories documentation>>.Next you need to register the request handler and search component.Add the following lines to `solrconfig.xml`, near the defintions for other request handlers:diff --git a/solr/solr-ref-guide/src/cluster-node-management.adoc b/solr/solr-ref-guide/src/cluster-node-management.adocindex e595ad139db..38b3383790a 100644--- a/solr/solr-ref-guide/src/cluster-node-management.adoc+++ b/solr/solr-ref-guide/src/cluster-node-management.adoc@@ -229,7 +229,7 @@ curl -X POST http://localhost:8983/api/cluster -H 'Content-Type: application/jso+The name of the property.Supported properties names are `location`, `maxCoresPerNode`, `urlScheme`, and `defaultShardPreferences`.-If the <<distributed-tracing.adoc#,Jaeger tracing contrib>> has been enabled, the property `samplePercentage` is also available.+If the <<distributed-tracing.adoc#,Jaeger tracing module>> has been enabled, the property `samplePercentage` is also available.+Other properties can be set (for example, if you need them for custom plugins) but they must begin with the prefix `ext.`.Unknown properties that don't begin with `ext.` will be rejected.diff --git a/solr/solr-ref-guide/src/distributed-tracing.adoc b/solr/solr-ref-guide/src/distributed-tracing.adocindex e6f19b3074d..dc7d2293f38 100644--- a/solr/solr-ref-guide/src/distributed-tracing.adoc+++ b/solr/solr-ref-guide/src/distributed-tracing.adoc@@ -48,7 +48,7 @@ https://docs.datadoghq.com/tracing/setup/java/[datadog-java-agent] uses Javaagen== Jaeger Tracer Configurator-The `contrib/jagertracer-configurator` provides a default implementation for setting up Jaeger Tracer.+The `modules/jagertracer-configurator` provides a default implementation for setting up Jaeger Tracer.Add the solr-jaegertracer JAR file and the other JARs provided with this module to your Solr installation, ideally to each node.GSON is a dependency that is only used by Jaeger's "remote" sampler,diff --git a/solr/solr-ref-guide/src/filters.adoc b/solr/solr-ref-guide/src/filters.adocindex 4e0e158932b..454900e71bf 100644--- a/solr/solr-ref-guide/src/filters.adoc+++ b/solr/solr-ref-guide/src/filters.adoc@@ -1051,7 +1051,7 @@ This filter is a custom Unicode normalization form that applies the foldings speThis filter is a better substitute for the combined behavior of the <<ASCII Folding Filter>>, <<Lower Case Filter>>, and <<ICU Normalizer 2 Filter>>.To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.ICUFoldingFilterFactory`@@ -1192,7 +1192,7 @@ See the http://icu-project.org/apiref/icu4j/com/ibm/icu/text/UnicodeSet.html[UniFor detailed information about these normalization forms, see http://unicode.org/reports/tr15/[Unicode Normalization Forms].To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.== ICU Transform Filter@@ -1245,7 +1245,7 @@ For a full list of ICU System Transforms, see http://demo.icu-project.org/icu-biFor detailed information about ICU Transforms, see http://userguide.icu-project.org/transforms/general.To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.== Keep Word Filterdiff --git a/solr/solr-ref-guide/src/indexing-with-tika.adoc b/solr/solr-ref-guide/src/indexing-with-tika.adocindex e6279453733..bbbd1dac2e5 100644--- a/solr/solr-ref-guide/src/indexing-with-tika.adoc+++ b/solr/solr-ref-guide/src/indexing-with-tika.adoc@@ -49,7 +49,7 @@ By default it maps to the same name but several parameters control how this is d* When Solr Cell finishes creating the internal `SolrInputDocument`, the rest of the Lucene/Solr indexing stack takes over.The next step after any update handler is the <<update-request-processors.adoc#,Update Request Processor>> chain.-Solr Cell is a contrib, which means it's not automatically included with Solr but must be configured.+Solr Cell is a module, which means it's not automatically included with Solr but must be configured.The example configsets have Solr Cell configured, but if you are not using those, you will want to pay attention to the section <<solrconfig.xml Configuration>> below.=== Solr Cell Performance Implications@@ -411,7 +411,7 @@ If it is not already configured, you will need to configure `solrconfig.xml` to[source,xml]----- <lib dir="${solr.install.dir:../../..}/contrib/extraction/lib" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../..}/modules/extraction/lib" regex=".*\.jar" />----You can then configure the `ExtractingRequestHandler` in `solrconfig.xml`.diff --git a/solr/solr-ref-guide/src/indexing-with-update-handlers.adoc b/solr/solr-ref-guide/src/indexing-with-update-handlers.adocindex 8cd3d6823d4..8a2b63b2710 100644--- a/solr/solr-ref-guide/src/indexing-with-update-handlers.adoc+++ b/solr/solr-ref-guide/src/indexing-with-update-handlers.adoc@@ -274,10 +274,10 @@ The status field will be non-zero in case of failure.=== Using XSLT to Transform XML Index Updates-The Scripting contrib module provides a separate XSLT Update Request Handler that allows you to index any arbitrary XML by using the `<tr>` parameter to apply an https://en.wikipedia.org/wiki/XSLT[XSL transformation].+The Scripting module provides a separate XSLT Update Request Handler that allows you to index any arbitrary XML by using the `<tr>` parameter to apply an https://en.wikipedia.org/wiki/XSLT[XSL transformation].You must have an XSLT stylesheet in the `conf/xslt` directory of your <<config-sets.adoc#,configset>> that can transform the incoming data to the expected `<add><doc/></add>` format, and use the `tr` parameter to specify the name of that stylesheet.-Learn more about adding the `contrib/scripting/lib/*` files into Solr's <<libs.adoc#lib-directories,Lib Directories>>.+Learn more about adding the `modules/scripting/lib/*` files into Solr's <<libs.adoc#lib-directories,Lib Directories>>.=== tr Parameterdiff --git a/solr/solr-ref-guide/src/installing-solr.adoc b/solr/solr-ref-guide/src/installing-solr.adocindex 2c582337e7d..b6c96af4d6b 100644--- a/solr/solr-ref-guide/src/installing-solr.adoc+++ b/solr/solr-ref-guide/src/installing-solr.adoc@@ -90,8 +90,8 @@ install_solr_services.sh:::This script is used on *nix systems to install Solr as a service.It is described in more detail in the section <<taking-solr-to-production.adoc#,Taking Solr to Production>>.-contrib/::-Solr's `contrib` directory includes add-on plugins for specialized features of Solr.+modules/::+Solr's `modules` directory includes 1st-party add-on plugins for specialized features of Solr.docs/::The `docs` directory includes a link to online Javadocs for Solr.diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adocindex df51e3466d7..415e7100a8c 100644--- a/solr/solr-ref-guide/src/language-analysis.adoc+++ b/solr/solr-ref-guide/src/language-analysis.adoc@@ -270,7 +270,7 @@ Rather than specifying an analyzer within `<fieldtype ... class="solr.TextField"`solr.ICUCollationField`, which is backed by http://site.icu-project.org[the ICU4J library], provides more flexible configuration, has more locales, is significantly faster, and requires less memory and less index space, since its keys are smaller than those produced by the JDK implementation that backs `solr.CollationField`.To use `solr.ICUCollationField`, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.`solr.ICUCollationField` and `solr.CollationField` fields can be created in two ways:@@ -702,7 +702,7 @@ First, the OpenNLP Tokenizer detects and marks the sentence boundaries requiredSecond, since the pre-trained OpenNLP models used by these filters were trained using the corresponding language-specific sentence-detection/tokenization models, the same tokenization using the same models must be used at runtime for optimal performance.To use the OpenNLP components, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.=== OpenNLP Tokenizer@@ -1327,7 +1327,7 @@ The stemmer language, `Catalan` in this case.The default configuration of the <<tokenizers.adoc#icu-tokenizer,ICU Tokenizer>> is suitable for Traditional Chinese text.It follows the Word Break rules from the Unicode Text Segmentation algorithm for non-Chinese text, and uses a dictionary to segment Chinese words.To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See the `solr/contrib/analysis-extras/README.md` for information on which jars you need to add.+See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.<<tokenizers.adoc#standard-tokenizer,Standard Tokenizer>> can also be used to tokenize Traditional Chinese text.Following the Word Break rules from the Unicode Text Segmentation algorithm, it produces one token per Chinese character.@@ -1441,12 +1441,12 @@ See the example under <<Traditional Chinese>>.For Simplified Chinese, Solr provides support for Chinese sentence and word segmentation with the <<HMM Chinese Tokenizer>>.This component includes a large dictionary and segments Chinese text into words with the Hidden Markov Model.To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See the `solr/contrib/analysis-extras/README.md` for information on which jars you need to add.+See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.The default configuration of the <<tokenizers.adoc#icu-tokenizer,ICU Tokenizer>> is also suitable for Simplified Chinese text.It follows the Word Break rules from the Unicode Text Segmentation algorithm for non-Chinese text, and uses a dictionary to segment Chinese words.To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See the `solr/contrib/analysis-extras/README.md` for information on which jars you need to add.+See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.Also useful for Chinese analysis:@@ -1501,10 +1501,10 @@ Also useful for Chinese analysis:=== HMM Chinese Tokenizer-For Simplified Chinese, Solr provides support for Chinese sentence and word segmentation with the `solr.HMMChineseTokenizerFactory` in the `analysis-extras` contrib module.+For Simplified Chinese, Solr provides support for Chinese sentence and word segmentation with the `solr.HMMChineseTokenizerFactory` in the `analysis-extras` module.This component includes a large dictionary and segments Chinese text into words with the Hidden Markov Model.To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.HMMChineseTokenizerFactory`@@ -2549,9 +2549,9 @@ This filter replaces term text with the Reading Attribute, the Hangul transcript[[hebrew-lao-myanmar-khmer]]=== Hebrew, Lao, Myanmar, Khmer-Lucene provides support, in addition to UAX#29 word break rules, for Hebrew's use of the double and single quote characters, and for segmenting Lao, Myanmar, and Khmer into syllables with the `solr.ICUTokenizerFactory` in the `analysis-extras` contrib module.+Lucene provides support, in addition to UAX#29 word break rules, for Hebrew's use of the double and single quote characters, and for segmenting Lao, Myanmar, and Khmer into syllables with the `solr.ICUTokenizerFactory` in the `analysis-extras` module.To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.See <<tokenizers.adoc#icu-tokenizer,the ICUTokenizer>> for more information.@@ -2823,10 +2823,10 @@ Solr includes support for normalizing Persian, and Lucene includes an example st=== Polish-Solr provides support for Polish stemming with the `solr.StempelPolishStemFilterFactory`, and `solr.MorphologikFilterFactory` for lemmatization, in the `contrib/analysis-extras` module.+Solr provides support for Polish stemming with the `solr.StempelPolishStemFilterFactory`, and `solr.MorphologikFilterFactory` for lemmatization, in the `analysis-extras` module.The `solr.StempelPolishStemFilterFactory` component includes an algorithmic stemmer with tables for Polish.To use either of these filters, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.StempelPolishStemFilterFactory` and `solr.MorfologikFilterFactory`@@ -3372,9 +3372,9 @@ Solr includes support for stemming Turkish with the `solr.SnowballPorterFilterFa=== Ukrainian-Solr provides support for Ukrainian lemmatization with the `solr.MorphologikFilterFactory`, in the `contrib/analysis-extras` module.+Solr provides support for Ukrainian lemmatization with the `solr.MorphologikFilterFactory`, in the `analysis-extras` module.To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See `solr/contrib/analysis-extras/README.md` for instructions on which jars you need to add.+See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.Lucene also includes an example Ukrainian stopword list, in the `lucene-analyzers-morfologik` jar.diff --git a/solr/solr-ref-guide/src/learning-to-rank.adoc b/solr/solr-ref-guide/src/learning-to-rank.adocindex 5f85ee7c92f..414bbe61b0f 100644--- a/solr/solr-ref-guide/src/learning-to-rank.adoc+++ b/solr/solr-ref-guide/src/learning-to-rank.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-With the *Learning To Rank* (or *LTR* for short) contrib module you can configure and run machine learned ranking models in Solr.+With the *Learning To Rank* (or *LTR* for short) module you can configure and run machine learned ranking models in Solr.The module also supports feature extraction inside Solr.The only thing you need to do outside Solr is train your own ranking model.@@ -63,52 +63,52 @@ A normalizer can be used to translate arbitrary feature values into normalized v==== Feature Engineering-The LTR contrib module includes several feature classes as well as support for custom features.+The LTR module includes several feature classes as well as support for custom features.Each feature class's javadocs contain an example to illustrate use of that class.The process of https://en.wikipedia.org/wiki/Feature_engineering[feature engineering] itself is then entirely up to your domain expertise and creativity.[cols=",,,",options="header",]|===|Feature |Class |Example parameters |<<External Feature Information>>-|field length |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/FieldLengthFeature.html[FieldLengthFeature] |`{"field":"title"}` |not (yet) supported-|field value |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/FieldValueFeature.html[FieldValueFeature] |`{"field":"hits"}` |not (yet) supported-|original score |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/OriginalScoreFeature.html[OriginalScoreFeature] |`{}` |not applicable-|solr query |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"q":"{!func}` `recip(ms(NOW,last_modified)` `,3.16e-11,1,1)"}` |supported-|solr filter query |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"fq":["{!terms f=category}book"]}` |supported-|solr query + filter query |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"q":"{!func}` `recip(ms(NOW,last_modified),` `3.16e-11,1,1)",` `"fq":["{!terms f=category}book"]}` |supported-|value |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/ValueFeature.html[ValueFeature] |`{"value":"$\{userFromMobile}","required":true}` |supported-|(custom) |(custom class extending {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/Feature.html[Feature]) | |+|field length |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/FieldLengthFeature.html[FieldLengthFeature] |`{"field":"title"}` |not (yet) supported+|field value |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/FieldValueFeature.html[FieldValueFeature] |`{"field":"hits"}` |not (yet) supported+|original score |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/OriginalScoreFeature.html[OriginalScoreFeature] |`{}` |not applicable+|solr query |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"q":"{!func}` `recip(ms(NOW,last_modified)` `,3.16e-11,1,1)"}` |supported+|solr filter query |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"fq":["{!terms f=category}book"]}` |supported+|solr query + filter query |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] |`{"q":"{!func}` `recip(ms(NOW,last_modified),` `3.16e-11,1,1)",` `"fq":["{!terms f=category}book"]}` |supported+|value |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/ValueFeature.html[ValueFeature] |`{"value":"$\{userFromMobile}","required":true}` |supported+|(custom) |(custom class extending {solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/Feature.html[Feature]) | ||===[cols=",,",options="header",]|===|Normalizer |Class |Example parameters-|Identity |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/norm/IdentityNormalizer.html[IdentityNormalizer] |`{}`-|MinMax |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/norm/MinMaxNormalizer.html[MinMaxNormalizer] |`{"min":"0", "max":"50" }`-|Standard |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/norm/StandardNormalizer.html[StandardNormalizer] |`{"avg":"42","std":"6"}`-|(custom) |(custom class extending {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/norm/Normalizer.html[Normalizer]) |+|Identity |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/norm/IdentityNormalizer.html[IdentityNormalizer] |`{}`+|MinMax |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/norm/MinMaxNormalizer.html[MinMaxNormalizer] |`{"min":"0", "max":"50" }`+|Standard |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/norm/StandardNormalizer.html[StandardNormalizer] |`{"avg":"42","std":"6"}`+|(custom) |(custom class extending {solr-javadocs}/modules/ltr/org/apache/solr/ltr/norm/Normalizer.html[Normalizer]) ||======= Feature Extraction-The ltr contrib module includes a <<document-transformers.adoc#,[features>> transformer] to support the calculation and return of feature values for https://en.wikipedia.org/wiki/Feature_extraction[feature extraction] purposes including and especially when you do not yet have an actual reranking model.+The ltr module includes a <<document-transformers.adoc#,[features>> transformer] to support the calculation and return of feature values for https://en.wikipedia.org/wiki/Feature_extraction[feature extraction] purposes including and especially when you do not yet have an actual reranking model.==== Feature Selection and Model TrainingFeature selection and model training take place offline and outside Solr.-The ltr contrib module supports two generalized forms of models as well as custom models.+The ltr module supports two generalized forms of models as well as custom models.Each model class's javadocs contain an example to illustrate configuration of that class.In the form of JSON files your trained model or models (e.g., different models for different customer geographies) can then be directly uploaded into Solr using provided REST APIs.[cols=",,",options="header",]|===|General form |Class |Specific examples-|Linear |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/LinearModel.html[LinearModel] |RankSVM, Pranking-|Multiple Additive Trees |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.html[MultipleAdditiveTreesModel] |LambdaMART, Gradient Boosted Regression Trees (GBRT)-|Neural Network |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/NeuralNetworkModel.html[NeuralNetworkModel] |RankNet-|(wrapper) |{solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/DefaultWrapperModel.html[DefaultWrapperModel] |(not applicable)-|(custom) |(custom class extending {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/AdapterModel.html[AdapterModel]) |(not applicable)-|(custom) |(custom class extending {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/LTRScoringModel.html[LTRScoringModel]) |(not applicable)+|Linear |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/LinearModel.html[LinearModel] |RankSVM, Pranking+|Multiple Additive Trees |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.html[MultipleAdditiveTreesModel] |LambdaMART, Gradient Boosted Regression Trees (GBRT)+|Neural Network |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/NeuralNetworkModel.html[NeuralNetworkModel] |RankNet+|(wrapper) |{solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/DefaultWrapperModel.html[DefaultWrapperModel] |(not applicable)+|(custom) |(custom class extending {solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/AdapterModel.html[AdapterModel]) |(not applicable)+|(custom) |(custom class extending {solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/LTRScoringModel.html[LTRScoringModel]) |(not applicable)|===== Quick Start with LTR@@ -350,7 +350,7 @@ Currently the only (and default) algorithm supported is 'TeamDraft'.=== External Feature Information-The {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/ValueFeature.html[ValueFeature] and {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] classes support the use of external feature information, `efi` for short.+The {solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/ValueFeature.html[ValueFeature] and {solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/SolrFeature.html[SolrFeature] classes support the use of external feature information, `efi` for short.==== Uploading Features@@ -472,25 +472,25 @@ Read more about model evolution in the <<LTR Lifecycle>> section of this page.=== Training Example-Example training data and a demo `train_and_upload_demo_model.py` script can be found in the `solr/contrib/ltr/example` folder in the https://gitbox.apache.org/repos/asf?p=lucene-solr.git;a=tree;f=solr/contrib/ltr/example[Apache lucene-solr Git repository] (mirrored on https://github.com/apache/lucene-solr/tree/releases/lucene-solr/{solr-docs-version}.0/solr/contrib/ltr/example[github.com]).+Example training data and a demo `train_and_upload_demo_model.py` script can be found in the `solr/modules/ltr/example` folder in the https://gitbox.apache.org/repos/asf?p=lucene-solr.git;a=tree;f=solr/modules/ltr/example[Apache lucene-solr Git repository] (mirrored on https://github.com/apache/lucene-solr/tree/releases/lucene-solr/{solr-docs-version}.0/solr/modules/ltr/example[github.com]).This example folder is not shipped in the Solr binary release.== Installation of LTR-The ltr contrib module requires the `contrib/ltr/lib/solr-ltr-*.jar` JARs.+The ltr module requires the `modules/ltr/lib/solr-ltr-*.jar` JARs.== LTR Configuration-Learning-To-Rank is a contrib module and therefore its plugins must be configured in `solrconfig.xml`.+Learning-To-Rank is a module and therefore its plugins must be configured in `solrconfig.xml`.=== Minimum Requirements-* Include the required contrib JARs.+* Include the required module JARs.Note that by default paths are relative to the Solr core so they may need adjustments to your configuration, or an explicit specification of the `$solr.install.dir`.+[source,xml]-----<lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib/" regex=".*\.jar" />+<lib dir="${solr.install.dir:../../../..}/modules/ltr/lib/" regex=".*\.jar" />----* Declaration of the `ltr` query parser.@@ -533,13 +533,13 @@ Note that by default paths are relative to the Solr core so they may need adjust==== LTRThreadModuleA thread module can be configured for the query parser and/or the transformer to parallelize the creation of feature weights.-For details, please refer to the {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/LTRThreadModule.html[LTRThreadModule] javadocs.+For details, please refer to the {solr-javadocs}/modules/ltr/org/apache/solr/ltr/LTRThreadModule.html[LTRThreadModule] javadocs.==== Feature Vector CustomizationThe features transformer returns dense CSV values such as `featureA=0.1,featureB=0.2,featureC=0.3,featureD=0.0`.-For sparse CSV output such as `featureA:0.1 featureB:0.2 featureC:0.3` you can customize the {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.html[feature logger transformer] declaration in `solrconfig.xml` as follows:+For sparse CSV output such as `featureA:0.1 featureB:0.2 featureC:0.3` you can customize the {solr-javadocs}/modules/ltr/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.html[feature logger transformer] declaration in `solrconfig.xml` as follows:[source,xml]----@@ -554,16 +554,16 @@ For sparse CSV output such as `featureA:0.1 featureB:0.2 featureC:0.3` you can c==== Implementation and ContributionsHow does Solr Learning-To-Rank work under the hood?::-Please refer to the `ltr` {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/package-summary.html[javadocs] for an implementation overview.+Please refer to the `ltr` {solr-javadocs}/modules/ltr/org/apache/solr/ltr/package-summary.html[javadocs] for an implementation overview.How could I write additional models and/or features?::Contributions for further models, features, normalizers and interleaving algorithms are welcome.Related links:+-* {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/model/LTRScoringModel.html[LTRScoringModel javadocs]-* {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/feature/Feature.html[Feature javadocs]-* {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/norm/Normalizer.html[Normalizer javadocs]-* {solr-javadocs}/contrib/ltr/org/apache/solr/ltr/interleaving/Interleaving.html[Interleaving javadocs]+* {solr-javadocs}/modules/ltr/org/apache/solr/ltr/model/LTRScoringModel.html[LTRScoringModel javadocs]+* {solr-javadocs}/modules/ltr/org/apache/solr/ltr/feature/Feature.html[Feature javadocs]+* {solr-javadocs}/modules/ltr/org/apache/solr/ltr/norm/Normalizer.html[Normalizer javadocs]+* {solr-javadocs}/modules/ltr/org/apache/solr/ltr/interleaving/Interleaving.html[Interleaving javadocs]* https://cwiki.apache.org/confluence/display/solr/HowToContribute* https://cwiki.apache.org/confluence/display/LUCENE/HowToContributediff --git a/solr/solr-ref-guide/src/libs.adoc b/solr/solr-ref-guide/src/libs.adocindex 1dc75682e88..5e95253a138 100644--- a/solr/solr-ref-guide/src/libs.adoc+++ b/solr/solr-ref-guide/src/libs.adoc@@ -61,15 +61,15 @@ A `<lib/>` directive must have one (not both) of these two attributes:All directories are resolved as relative to the Solr core's `instanceDir`.-These examples show how to load contrib modules into Solr:+These examples show how to load modules into Solr:[source,xml]----- <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/extraction/lib" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/clustering/lib/" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/langid/lib/" regex=".*\.jar" />- <lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib/" regex=".*\.jar" />+ <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib/" regex=".*\.jar" />----diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-7.adocindex 9d4dfe305b5..adc62f56b57 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc+++ b/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc@@ -180,7 +180,7 @@ The following summary of changes in earlier 6.x releases highlights significantNote again that this is not a complete list of all changes that may impact your installation, so a thorough review of CHANGES.txt is highly recommended if upgrading from any version earlier than 6.6.-* The Solr contribs map-reduce, morphlines-core and morphlines-cell have been removed.+* The Solr modules `map-reduce`, `morphlines-core` and `morphlines-cell` have been removed.* JSON Facet API now uses hyper-log-log for numBuckets cardinality calculation and calculates cardinality before filtering buckets by any `mincount` greater than 1.* If you use historical dates, specifically on or before the year 1582, you should reindex for better date handling.* If you use the JSON Facet API (json.facet) with `method=stream`, you must now set `sort='index asc'` to get the streaming behavior; otherwise it won't stream. Reminder: `method` is a hint that doesn't change defaults of other parameters.diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-8.adocindex e343e5e3892..16df48a35df 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc+++ b/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc@@ -194,15 +194,15 @@ Typically, simply update the pattern by changing an uppercase 'Z' to lowercase '+For the current recommended set of patterns in schemaless mode, see the section <<schemaless-mode.adoc#,Schemaless Mode>>, or simply examine the `_default` configset (found in `server/solr/configsets`).+-Also note that the default set of date patterns (formats) have expanded from previous releases to subsume those patterns previously handled by the "extract" contrib (Solr Cell / Tika).+Also note that the default set of date patterns (formats) have expanded from previous releases to subsume those patterns previously handled by the "extraction" module (Solr Cell / Tika).*Solr Cell*-* The extraction contrib (<<indexing-with-tika.adoc#,Solr Cell>>) no longer does any date parsing, and thus no longer supports the `date.formats` parameter. To ensure date strings are properly parsed, use the `ParseDateFieldUpdateProcessorFactory` in your update chain. This update request processor is found by default with the "parse-date" update processor when running Solr in "<<schemaless-mode.adoc#set-the-default-updaterequestprocessorchain,schemaless mode>>".+* The extraction module (<<indexing-with-tika.adoc#,Solr Cell>>) no longer does any date parsing, and thus no longer supports the `date.formats` parameter. To ensure date strings are properly parsed, use the `ParseDateFieldUpdateProcessorFactory` in your update chain. This update request processor is found by default with the "parse-date" update processor when running Solr in "<<schemaless-mode.adoc#set-the-default-updaterequestprocessorchain,schemaless mode>>".-*Langid Contrib*+*Langid Module*-* The `LanguageIdentifierUpdateProcessor` base class in the langid contrib (found in `contrib/langid`) changed some method signatures. If you have a custom language identifier implementation you will need to adapt your code. See the Jira issue https://issues.apache.org/jira/browse/SOLR-11774[SOLR-11774] for details of the changes.+* The `LanguageIdentifierUpdateProcessor` base class in the langid module (found in `modules/langid`) changed some method signatures. If you have a custom language identifier implementation you will need to adapt your code. See the Jira issue https://issues.apache.org/jira/browse/SOLR-11774[SOLR-11774] for details of the changes.=== Query Changes in 8.0@@ -371,7 +371,7 @@ The `TieredMergePolicy` will also reclaim resources from segments that exceed `m*UIMA Removed*-* The UIMA contrib has been removed from Solr and is no longer available.+* The UIMA module has been removed from Solr and is no longer available.*Logging*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 6e8af649696..8978f21d2b0 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@@ -66,7 +66,7 @@ If re-indexing is too onerous, use this mechanism in Solr 8.The `dist/` directory in the Solr binary release has been removed as of Solr 9.0.* The `solr-core` and `solr-solrj` jars can be found under `server/solr-webapp/webapp/WEB-INF/lib/`.-* The Solr module jars can be found in `contrib/<module-name>/lib`, packaged individually for each module.+* The Solr module jars can be found in `modules/<module-name>/lib`, packaged individually for each module.* The `solrj-deps` (SolrJ Dependencies) are no longer separated out from the other Server jars.Please refer to the SolrJ Maven artifact to see the exact dependencies you need to include from `server/solr-webapp/webapp/WEB-INF/lib/` and `server/lib/ext/` if you are loading in SolrJ manually.If you plan on using SolrJ as a JDBC driver, please refer to the <<sql-query.adoc#generic-clients,JDBC documentation>>.@@ -211,24 +211,27 @@ Administrators that need Solr exposed more broadly can change the SOLR_JETTY_HOSThis 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 Module Changes+=== Module Changes++* **SOLR-15917: "Contrib modules" have been renamed to "Modules", and have been moved from the `contrib/` to `modules/`.**+Use of these modules remains the same, except for the changes listed below.* SOLR-15916: `dist/` is no longer provided in the binary release.-All module jars are now provided under `contrib/<name>/lib`, including the module jar and all dependency jars.+All module jars are now provided under `modules/<name>/lib`, including the module jar and all dependency jars.Please update your `<lib>` entries in your `solrconfig.xml` to use this new location.More information can be found in the <<libs.adoc#lib-directives-in-solrconfig,Libs documentation>>.-* SOLR-14067: `StatelessScriptUpdateProcessorFactory` moved to `contrib/scripting` package instead of shipping as part of Solr, due to security concerns.+* SOLR-14067: `StatelessScriptUpdateProcessorFactory` moved to `modules/scripting` package instead of shipping as part of Solr, due to security concerns.Renamed to ScriptUpdateProcessorFactory for simpler name.-* SOLR-15121: `XSLTResponseWriter` moved to `contrib/scripting` package instead+* SOLR-15121: `XSLTResponseWriter` moved to `modules/scripting` package insteadof shipping as part of Solr, due to security concerns.-* SOLR-14926: `contrib/clustering` back and rewritten+* SOLR-14926: `modules/clustering` back and rewritten-* SOLR-14912: Cleaned up solr-extraction contrib to produce solr-extraction-* jar (instead of solr-cell-*). (Dawid Weiss)+* SOLR-14912: Cleaned up solr-extraction module 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.+* SOLR-15924: Extra lucene libraries used in modules are no longer packaged in `lucene-libs/` under module directories in the binary release.Instead, these libraries will be included with all other module dependencies in `lib/`.== Deprecations & Removed Featuresdiff --git a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc b/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adocindex bf6dbb3c1a9..57dd5d23ba7 100644--- a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc+++ b/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc@@ -25,7 +25,7 @@ This graphic provides a more detailed view:.solr-exporter Diagramimage::images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.png[image,width=600]-The Prometheus exporter is included in Solr as a contrib, and is located in `contrib/prometheus-exporter` in your Solr instance.+The Prometheus exporter is included in Solr as a module, and is located in `modules/prometheus-exporter` in your Solr instance.There are three aspects to running `solr-exporter`:@@ -37,7 +37,7 @@ See the section below <<Starting the Exporter>>.See the section below <<Prometheus Configuration>>== Starting the Exporter-You can start `solr-exporter` by running `./bin/solr-exporter` (Linux) or `.\bin\solr-exporter.cmd` (Windows) from the `contrib/prometheus-exporter` directory.+You can start `solr-exporter` by running `./bin/solr-exporter` (Linux) or `.\bin\solr-exporter.cmd` (Windows) from the `modules/prometheus-exporter` directory.See the commands below depending on your operating system and Solr operating mode:@@ -50,14 +50,14 @@ See the commands below depending on your operating system and Solr operating mod.User-managed / Single-node[source,bash]-----$ cd contrib/prometheus-exporter+$ cd modules/prometheus-exporter$ ./bin/solr-exporter -p 9854 -b http://localhost:8983/solr -f ./conf/solr-exporter-config.xml -n 8----.SolrCloud[source,bash]-----$ cd contrib/prometheus-exporter+$ cd modules/prometheus-exporter$ ./bin/solr-exporter -p 9854 -z localhost:2181/solr -f ./conf/solr-exporter-config.xml -n 16----====@@ -69,14 +69,14 @@ $ ./bin/solr-exporter -p 9854 -z localhost:2181/solr -f ./conf/solr-exporter-con.User-managed / Single-node[source,text]-----> cd contrib\prometheus-exporter+> cd modules\prometheus-exporter> .\bin\solr-exporter.cmd -p 9854 -b http://localhost:8983/solr -f .\conf\solr-exporter-config.xml -n 8----.SolrCloud[source,text]-----> cd contrib\prometheus-exporter+> cd modules\prometheus-exporter> .\bin\solr-exporter -p 9854 -z localhost:2181/solr -f .\conf\solr-exporter-config.xml -n 16----====@@ -133,7 +133,7 @@ If neither the `-b` parameter nor the `-z` parameter are defined, the `-b` param+[%autowidth,frame=none]|===-|Optional |Default: `contrib/prometheus-exporter/conf/solr-exporter-config.xml`+|Optional |Default: `modules/prometheus-exporter/conf/solr-exporter-config.xml`|===+The path to the configuration file that defines the Solr metrics to read.@@ -244,7 +244,7 @@ Then you can start the Exporter as follows (Linux).[source,bash]-----$ cd contrib/prometheus-exporter+$ cd modules/prometheus-exporter$ export JAVA_OPTS="-Djavax.net.ssl.trustStore=truststore.p12 -Djavax.net.ssl.trustStorePassword=truststorePassword -Dsolr.httpclient.builder.factory=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory -Dsolr.httpclient.config=basicauth.properties"$ export ZK_CREDS_AND_ACLS="-DzkCredentialsProvider=org.apache.solr.common.cloud.VMParamsSingleSetCredentialsDigestZkCredentialsProvider -DzkDigestUsername=readonly-user -DzkDigestPassword=zkUserPassword"$ export CLASSPATH_PREFIX="../../server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.11.jar"@@ -259,7 +259,7 @@ Of course, you can use a different source.The configuration for the `solr-exporter` defines the data to get from Solr.This includes the metrics, but can also include queries to the PingRequestHandler, the Collections API, and a query to any query request handler.-A default example configuration is in `contrib/prometheus-exporter/conf/solr-exporter-config.xml`.+A default example configuration is in `modules/prometheus-exporter/conf/solr-exporter-config.xml`.Below is a slightly shortened version of it:[source,xml]@@ -559,7 +559,7 @@ To use Grafana for visualization, it must be downloaded and deployed separately.More information can be found on the Grafana https://grafana.com/docs/grafana/latest/[Documentation] site.Grafana consumes data from many sources, including the Prometheus server that you previously set up.-A Grafana sample dashboard is provided in the following JSON file: `contrib/prometheus-exporter/conf/grafana-solr-dashboard.json`.+A Grafana sample dashboard is provided in the following JSON file: `modules/prometheus-exporter/conf/grafana-solr-dashboard.json`.You can place this with your other Grafana dashboard configurations and modify it as necessary depending on any customization you've done for the `solr-exporter` configuration.TIP: You can directly import the Solr dashboard https://grafana.com/grafana/dashboards/12456[via grafana.com] by using the Import function with the dashboard id `12456`.diff --git a/solr/solr-ref-guide/src/response-writers.adoc b/solr/solr-ref-guide/src/response-writers.adocindex 067774a798a..b0fd99655b3 100644--- a/solr/solr-ref-guide/src/response-writers.adoc+++ b/solr/solr-ref-guide/src/response-writers.adoc@@ -193,8 +193,8 @@ The default behavior is not to indent.The XSLT Response Writer applies an XML stylesheet to output.It can be used for tasks such as formatting results for an RSS feed.-This response writer is part of the <<script-update-processor.adoc#,scripting contrib>>.-Since it is a contrib, it requires configuration before it can be used.+This response writer is part of the <<script-update-processor.adoc#,scripting module>>.+Since it is a module, it requires configuration before it can be used.The XSLT Response Writer accepts one parameter:@@ -404,14 +404,14 @@ The Smile format is a JSON-compatible binary format, described in detail here: hUse this to get the response as a spreadsheet in the .xlsx (Microsoft Excel) format.It accepts parameters in the form `colwidth.<field-name>` and `colname.<field-name>` which helps you customize the column widths and column names.-This response writer has been added as part of the extraction library, and will only work if the extraction contrib is present in the server classpath.+This response writer has been added as part of the extraction library, and will only work if the extraction module is present in the server classpath.Defining the classpath with the `lib` directive is not sufficient.Instead, you will need to copy the necessary .jars to the Solr webapp's `lib` directory manually.You can run these commands from your `$SOLR_INSTALL` directory:[source,bash]-----cp contrib/extraction/lib/*.jar server/solr-webapp/webapp/WEB-INF/lib/+cp modules/extraction/lib/*.jar server/solr-webapp/webapp/WEB-INF/lib/----Once the libraries are in place, you can add `wt=xlsx` to your request, and results will be returned as an XLSX sheet.diff --git a/solr/solr-ref-guide/src/result-clustering.adoc b/solr/solr-ref-guide/src/result-clustering.adocindex 32b0c74ebc3..102ba18baa5 100644--- a/solr/solr-ref-guide/src/result-clustering.adoc+++ b/solr/solr-ref-guide/src/result-clustering.adoc@@ -213,13 +213,13 @@ The score of the other topics group is zero.== Installation-The clustering contrib extension requires all JARs under `contrib/clustering/lib`.+The clustering module extension requires all JARs under `modules/clustering/lib`.-You can include the required contrib JARs in `solrconfig.xml` as shown below (by default paths are relative to the Solr core so they may need adjustments to your configuration, or an explicit specification of the `$solr.install.dir`):+You can include the required modules JARs in `solrconfig.xml` as shown below (by default paths are relative to the Solr core so they may need adjustments to your configuration, or an explicit specification of the `$solr.install.dir`):[source,xml]-----<lib dir="${solr.install.dir:../../..}/contrib/clustering/lib/" regex=".*\.jar" />+<lib dir="${solr.install.dir:../../..}/modules/clustering/lib/" regex=".*\.jar" />----== Configurationdiff --git a/solr/solr-ref-guide/src/script-update-processor.adoc b/solr/solr-ref-guide/src/script-update-processor.adocindex 911be9eb902..d8d457c2b05 100644--- a/solr/solr-ref-guide/src/script-update-processor.adoc+++ b/solr/solr-ref-guide/src/script-update-processor.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-The {solr-javadocs}/contrib/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory] allows Java scripting engines to be used during Solr document update processing, allowing dramatic flexibility in expressing custom document processing logic before being indexed.+The {solr-javadocs}/modules/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory] allows Java scripting engines to be used during Solr document update processing, allowing dramatic flexibility in expressing custom document processing logic before being indexed.It has hooks to the commit, delete, rollback, etc indexing actions, however add is the most common usage.It is implemented as an UpdateProcessor to be placed in an UpdateChain.@@ -30,12 +30,12 @@ However, you are introducing some potential security vulnerabilities.== Installing the ScriptingUpdateProcessor and Scripting Engines-The scripting update processor lives in the contrib module `/contrib/scripting`, and you need to explicitly add it to your Solr setup.+The scripting update processor lives in the module `/modules/scripting`, and you need to explicitly add it to your Solr setup.Java 11 and previous versions come with a JavaScript engine called Nashorn, but Java 12 will require you to add your own JavaScript engine.Other supported scripting engines like JRuby, Jython, Groovy, all require you to add JAR files.-Learn more about adding the `contrib/scripting/lib/solr-scripting-*.jar` file, and any other needed JAR files (depending on your scripting engine) into Solr's <<libs.adoc#lib-directories,Lib Directories>>.+Learn more about adding the `modules/scripting/lib/solr-scripting-*.jar` file, and any other needed JAR files (depending on your scripting engine) into Solr's <<libs.adoc#lib-directories,Lib Directories>>.== Configurationdiff --git a/solr/solr-ref-guide/src/solr-plugins.adoc b/solr/solr-ref-guide/src/solr-plugins.adocindex 3ec40f522b8..210106e70ed 100644--- a/solr/solr-ref-guide/src/solr-plugins.adoc+++ b/solr/solr-ref-guide/src/solr-plugins.adoc@@ -46,7 +46,7 @@ Examples of these are <<authentication-and-authorization-plugins.adoc#,authentic== Installing Plugins ==Most plugins are built-in to Solr and there is nothing to install.-The subject here is how to make other plugins available to Solr, including those in contrib modules.+The subject here is how to make other plugins available to Solr, including those in modules.Plugins are packaged into a Java jar file and may have other dependent jar files to function.The next sections describe some options:diff --git a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc b/solr/solr-ref-guide/src/solr-upgrade-notes.adocindex 8cacae5b45b..2843ba7a4e8 100644--- a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc+++ b/solr/solr-ref-guide/src/solr-upgrade-notes.adoc@@ -180,7 +180,7 @@ See <<collection-management.adoc#listbackup,List Backups>> for more details.See <<collection-management.adoc#deletebackup,Delete Backups>> for more details.A new option for backup repository is also available in 8.9, which is to use Google Cloud Storage (GCS).-This is a contrib (located in `contrib/gcs-repository`).+This is a module (located in `modules/gcs-repository`).See <<backup-restore.adoc#gcsbackuprepository,GCSBackupRepository>> for configuration details.The Solr community is working to add support for S3 buckets in the near future.@@ -231,10 +231,10 @@ You might have it for other purposes though (e.g., for `uniqueBlock(...)`).** This feature no longer requires the `\_nest_path_` field, although you probably ought tocontinue to define it as it's useful for other things.-*Removed Contribs*+*Removed Modules*-* The search results clustering contrib (Carrot2) has been removed from 8.x Solr due to lack of Java 1.8 compatibility in the dependency that provides online clustering of search results.-The contrib will be re-introduced in Solr 9.0.+* The search results clustering module (Carrot2) has been removed from 8.x Solr due to lack of Java 1.8 compatibility in the dependency that provides online clustering of search results.+The module will be re-introduced in Solr 9.0.*Learning to Rank*@@ -250,7 +250,7 @@ For examples using this feature, see the section <<learning-to-rank.adoc#running*Prometheus Exporter*-* The `./bin` scripts included with the Prometheus Exporter contrib now allow use of custom java options with environment variables.+* The `./bin` scripts included with the Prometheus Exporter module now allow use of custom java options with environment variables.See the section <<monitoring-with-prometheus-and-grafana.adoc#environment-variable-options,Environment Variable Options>> for more details.* The default Grafana dashboards now include panels for query performance monitoring.The default Prometheus Exporter configuration includes metrics like queries-per-second (QPS) and 95th percentiles (P95) to populate the new panels.@@ -620,7 +620,7 @@ The `sample_techproducts_configs` and the examples found in `./example` are unch* Configsets that have been uploaded with an unsecured Configset API (i.e., when authentication is not enabled) are considered "Untrusted Configsets".+In order to bolster Solr's out-of-the-box security, these untrusted configsets-are no longer allowed to use the `<lib .../>` directive to implement contribs+are no longer allowed to use the `<lib .../>` directive to implement modulesor custom Jars.+When upgrading to 8.4, if you are using untrusted configsets that contain `<lib ../>`diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/src/tokenizers.adocindex 12e571fca18..853ed398f1a 100644--- a/solr/solr-ref-guide/src/tokenizers.adoc+++ b/solr/solr-ref-guide/src/tokenizers.adoc@@ -550,7 +550,7 @@ The default configuration for `solr.ICUTokenizerFactory` provides UAX#29 word br====To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).-See the `solr/contrib/analysis-extras/README.md` for information on which jars you need to add.+See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.====diff --git a/solr/solr-ref-guide/src/update-request-processors.adoc b/solr/solr-ref-guide/src/update-request-processors.adocindex 3cd5e3344e5..1db2ffe3990 100644--- a/solr/solr-ref-guide/src/update-request-processors.adoc+++ b/solr/solr-ref-guide/src/update-request-processors.adoc@@ -337,7 +337,7 @@ It can help to prevent unexpected problems on indexing as well as on recovering{solr-javadocs}/core/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.html[SignatureUpdateProcessorFactory]:: Uses a defined set of fields to generate a hash "signature" for the document.Useful for only indexing one copy of "similar" documents.-{solr-javadocs}/contrib/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory]:: An processor that enables the use of update processors implemented as scripts.+{solr-javadocs}/modules/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory]:: An processor that enables the use of update processors implemented as scripts.Learn more at the <<script-update-processor.adoc#,script update processor>> page.{solr-javadocs}/core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.html[TemplateUpdateProcessorFactory]:: Allows adding new fields to documents based on a template pattern.@@ -401,18 +401,18 @@ When using any of these factories, please consult the {solr-javadocs}/core/org/a=== Update Processor Factories That Can Be Loaded as Plugins-These processors are included in Solr releases as "contribs", and require additional jars loaded at runtime.-See the README files associated with each contrib for details:+These processors are included in Solr releases as "module", and require additional jars loaded at runtime.+See the README files associated with each module for details:-The {solr-javadocs}/contrib/langid/index.html[`langid`] contrib provides::+The {solr-javadocs}/modules/langid/index.html[`langid`] module provides::-{solr-javadocs}/contrib/langid/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.html[LangDetectLanguageIdentifierUpdateProcessorFactory]::: Identifies the language of a set of input fields using http://code.google.com/p/language-detection.+{solr-javadocs}/modules/langid/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.html[LangDetectLanguageIdentifierUpdateProcessorFactory]::: Identifies the language of a set of input fields using http://code.google.com/p/language-detection.-{solr-javadocs}/contrib/langid/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.html[TikaLanguageIdentifierUpdateProcessorFactory]::: Identifies the language of a set of input fields using Tika's LanguageIdentifier.+{solr-javadocs}/modules/langid/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.html[TikaLanguageIdentifierUpdateProcessorFactory]::: Identifies the language of a set of input fields using Tika's LanguageIdentifier.-The {solr-javadocs}/contrib/analysis-extras/index.html[`analysis-extras`] contrib provides::+The {solr-javadocs}/modules/analysis-extras/index.html[`analysis-extras`] module provides::-{solr-javadocs}/contrib/analysis-extras/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.html[OpenNLPExtractNamedEntitiesUpdateProcessorFactory]::: Update document(s) to be indexed with named entities extracted using an OpenNLP NER model.+{solr-javadocs}/modules/analysis-extras/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.html[OpenNLPExtractNamedEntitiesUpdateProcessorFactory]::: Update document(s) to be indexed with named entities extracted using an OpenNLP NER model.Note that in order to use model files larger than 1MB on SolrCloud, you must either <<zookeeper-ensemble#increasing-the-file-size-limit,configure both ZooKeeper server and clients>> or <<libs.adoc#lib-directives-in-solrconfig,store the model files on the filesystem>> on each node hosting a collection replica.=== Update Processor Factories You Should _Not_ Modify or Remove