diff --git a/benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json b/benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json index 7d089d7d6226..a1312e20e205 100644 --- a/benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json +++ b/benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json @@ -298,16 +298,6 @@ "extended_plugins" : [ ], "has_native_controller" : false }, - { - "name" : "ingest-attachment", - "version" : "7.10.0", - "elasticsearch_version" : "7.10.0", - "java_version" : "1.8", - "description" : "Ingest processor that uses Apache Tika to extract contents", - "classname" : "org.elasticsearch.ingest.attachment.IngestAttachmentPlugin", - "extended_plugins" : [ ], - "has_native_controller" : false - }, { "name" : "mapper-murmur3", "version" : "7.10.0", diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 66e2a2fc4fb1..431bec37431e 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -24,7 +24,7 @@ netty = 4.1.77.Final commons_lang3 = 3.9 # when updating this version, you need to ensure compatibility with: -# - plugins/ingest-attachment (transitive dependency, check the upstream POM) +# - modules/ingest-attachment (transitive dependency, check the upstream POM) # - distribution/tools/plugin-cli # - x-pack/plugin/security bouncycastle=1.64 diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java index b93b41e0dfa6..5f7b46e2a749 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java @@ -159,7 +159,12 @@ public class InstallPluginAction implements Closeable { * maintained so that existing user workflows that install these plugins do not need to be updated * immediately. */ - public static final Set PLUGINS_CONVERTED_TO_MODULES = Set.of("repository-azure", "repository-gcs", "repository-s3"); + public static final Set PLUGINS_CONVERTED_TO_MODULES = Set.of( + "repository-azure", + "repository-gcs", + "repository-s3", + "ingest-attachment" + ); static final Set BIN_DIR_PERMS; static final Set BIN_FILES_PERMS; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java index e0cbe1730020..38d57cceb06b 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java @@ -1503,7 +1503,7 @@ public class InstallPluginActionTests extends ESTestCase { * instead simply print a message to the terminal. */ public void testInstallMigratedPlugins() throws Exception { - for (String id : List.of("repository-azure", "repository-gcs", "repository-s3")) { + for (String id : List.of("repository-azure", "repository-gcs", "repository-s3", "ingest-attachment")) { installPlugin(id); assertThat(terminal.getErrorOutput(), containsString("[" + id + "] is no longer a plugin")); } diff --git a/docs/build.gradle b/docs/build.gradle index d70cc9cf78a4..3a76451c2d9c 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -25,9 +25,9 @@ ext.docsFileTree = fileTree(projectDir) { // Broken code snippet tests exclude 'reference/graph/explore.asciidoc' if (BuildParams.inFipsJvm) { - // We don't install/support this plugin in FIPS 140 - exclude 'plugins/ingest-attachment.asciidoc' - // We can't conditionally control output, this would be missing the ingest-attachment plugin + // We don't support this component in FIPS 140 + exclude 'reference/ingest/processors/attachment.asciidoc' + // We can't conditionally control output, this would be missing the ingest-attachment component exclude 'reference/cat/plugins.asciidoc' } } @@ -105,7 +105,7 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach { return } // Do not install ingest-attachment in a FIPS 140 JVM as this is not supported - if (subproj.path.startsWith(':plugins:ingest-attachment') && BuildParams.inFipsJvm) { + if (subproj.path.startsWith(':modules:ingest-attachment') && BuildParams.inFipsJvm) { return } plugin subproj.path diff --git a/docs/changelog/87989.yaml b/docs/changelog/87989.yaml new file mode 100644 index 000000000000..7796dabb66ce --- /dev/null +++ b/docs/changelog/87989.yaml @@ -0,0 +1,5 @@ +pr: 87989 +summary: Move the ingest attachment processor to the default distribution +area: Ingest +type: enhancement +issues: [] diff --git a/docs/plugins/index.asciidoc b/docs/plugins/index.asciidoc index 705bb3c76f30..530324d51cd3 100644 --- a/docs/plugins/index.asciidoc +++ b/docs/plugins/index.asciidoc @@ -44,8 +44,6 @@ include::analysis.asciidoc[] include::discovery.asciidoc[] -include::ingest.asciidoc[] - include::mapper.asciidoc[] include::repository.asciidoc[] diff --git a/docs/plugins/ingest.asciidoc b/docs/plugins/ingest.asciidoc deleted file mode 100644 index b9717485f676..000000000000 --- a/docs/plugins/ingest.asciidoc +++ /dev/null @@ -1,16 +0,0 @@ -[[ingest]] -== Ingest Plugins - -The ingest plugins extend Elasticsearch by providing additional ingest node capabilities. - -[discrete] -=== Core Ingest Plugins - -The core ingest plugins are: - -<>:: - -The ingest attachment plugin lets Elasticsearch extract file attachments in common formats (such as PPT, XLS, and PDF) by -using the Apache text extraction library https://tika.apache.org/[Tika]. - -include::ingest-attachment.asciidoc[] diff --git a/docs/plugins/redirects.asciidoc b/docs/plugins/redirects.asciidoc index 96b432e421c6..a97828a2e955 100644 --- a/docs/plugins/redirects.asciidoc +++ b/docs/plugins/redirects.asciidoc @@ -145,3 +145,17 @@ include::redirects.asciidoc[tag=gcs-repo-migration] === Google Cloud Storage repository plugin include::redirects.asciidoc[tag=gcs-repo-migration] + +[role="exclude",id="ingest-attachment"] +=== Ingest Attachment plugin + +// tag::ingest-attachment-migration[] +The Ingest Attachment plugin is now included in {es}. +See the {ref}/attachment.html[Ingest Attachment] processor. +// end::ingest-attachment-migration[] + +[role="exclude",id="ingest"] +=== Ingest plugins + +All ingest functionality has been moved into the default distribution. +For more information refer to the {ref}/processors.html[existing processors]. diff --git a/docs/reference/cat/plugins.asciidoc b/docs/reference/cat/plugins.asciidoc index e03e1b4bf496..9a83887c484a 100644 --- a/docs/reference/cat/plugins.asciidoc +++ b/docs/reference/cat/plugins.asciidoc @@ -7,8 +7,8 @@ [IMPORTANT] ==== -cat APIs are only intended for human consumption using the command line or {kib} -console. They are _not_ intended for use by applications. For application +cat APIs are only intended for human consumption using the command line or {kib} +console. They are _not_ intended for use by applications. For application consumption, use the <>. ==== @@ -67,7 +67,6 @@ U7321H6 analysis-ukrainian {version_qualified} The Ukrainian Analysis plugi U7321H6 discovery-azure-classic {version_qualified} The Azure Classic Discovery plugin allows to use Azure Classic API for the unicast discovery mechanism U7321H6 discovery-ec2 {version_qualified} The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism. U7321H6 discovery-gce {version_qualified} The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism. -U7321H6 ingest-attachment {version_qualified} Ingest processor that uses Apache Tika to extract contents U7321H6 mapper-annotated-text {version_qualified} The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index. U7321H6 mapper-murmur3 {version_qualified} The Mapper Murmur3 plugin allows to compute hashes of a field's values at index-time and to store them in the index. U7321H6 mapper-size {version_qualified} The Mapper Size plugin allows document to record their uncompressed size at index time. diff --git a/docs/reference/ingest/processors.asciidoc b/docs/reference/ingest/processors.asciidoc index 70e312317164..958dd0ec9d77 100644 --- a/docs/reference/ingest/processors.asciidoc +++ b/docs/reference/ingest/processors.asciidoc @@ -29,10 +29,11 @@ installed. [source,yaml] ---- -plugin.mandatory: ingest-attachment +plugin.mandatory: my-ingest-plugin ---- include::processors/append.asciidoc[] +include::processors/attachment.asciidoc[] include::processors/bytes.asciidoc[] include::processors/circle.asciidoc[] include::processors/community-id.asciidoc[] diff --git a/docs/plugins/ingest-attachment.asciidoc b/docs/reference/ingest/processors/attachment.asciidoc similarity index 94% rename from docs/plugins/ingest-attachment.asciidoc rename to docs/reference/ingest/processors/attachment.asciidoc index 606596100c29..13ad497fafa5 100644 --- a/docs/plugins/ingest-attachment.asciidoc +++ b/docs/reference/ingest/processors/attachment.asciidoc @@ -1,23 +1,21 @@ -[[ingest-attachment]] -=== Ingest Attachment Processor Plugin +[[attachment]] +=== Attachment processor +++++ +Attachment +++++ -The ingest attachment plugin lets Elasticsearch extract file attachments in common formats (such as PPT, XLS, and PDF) by +The attachment processor lets Elasticsearch extract file attachments in common formats (such as PPT, XLS, and PDF) by using the Apache text extraction library https://tika.apache.org/[Tika]. -You can use the ingest attachment plugin as a replacement for the mapper attachment plugin. - The source field must be a base64 encoded binary. If you do not want to incur the overhead of converting back and forth between base64, you can use the CBOR format instead of JSON and specify the field as a bytes array instead of a string representation. The processor will skip the base64 decoding then. -:plugin_name: ingest-attachment -include::install_remove.asciidoc[] +[[using-attachment]] +==== Using the attachment processor in a pipeline -[[using-ingest-attachment]] -==== Using the Attachment Processor in a Pipeline - -[[ingest-attachment-options]] +[[attachment-options]] .Attachment options [options="header"] |====== @@ -33,7 +31,7 @@ include::install_remove.asciidoc[] |====== [discrete] -[[ingest-attachment-json-ex]] +[[attachment-json-ex]] ==== Example If attaching files to JSON documents, you must first encode the file as a base64 @@ -98,7 +96,7 @@ The document's `attachment` object contains extracted properties for the file: NOTE: Keeping the binary as a field within the document might consume a lot of resources. It is highly recommended to remove that field from the document. Set `remove_binary` to `true` to automatically remove the field. -[[ingest-attachment-fields]] +[[attachment-fields]] ==== Exported fields The fields which might be extracted from a document are: @@ -154,7 +152,7 @@ NOTE: Extracting contents from binary data is a resource intensive operation and consumes a lot of resources. It is highly recommended to run pipelines using this processor in a dedicated ingest node. -[[ingest-attachment-cbor]] +[[attachment-cbor]] ==== Use the attachment processor with CBOR To avoid encoding and decoding JSON to base64, you can instead pass CBOR data to @@ -201,7 +199,7 @@ with open(file, 'rb') as f: ) ---- -[[ingest-attachment-extracted-chars]] +[[attachment-extracted-chars]] ==== Limit the number of extracted chars To prevent extracting too many chars and overload the node memory, the number of chars being used for extraction @@ -310,8 +308,8 @@ Returns this: // TESTRESPONSE[s/"_seq_no": \d+/"_seq_no" : $body._seq_no/ s/"_primary_term" : 1/"_primary_term" : $body._primary_term/] -[[ingest-attachment-with-arrays]] -==== Using the Attachment Processor with arrays +[[attachment-with-arrays]] +==== Using the attachment processor with arrays To use the attachment processor within an array of attachments the {ref}/foreach-processor.html[foreach processor] is required. This diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc index ffa4e2d410b4..afc836dc8c80 100644 --- a/docs/reference/redirects.asciidoc +++ b/docs/reference/redirects.asciidoc @@ -1867,4 +1867,4 @@ For more information about reindexing from a remote cluster, refer to [role="exclude",id="infer-trained-model-deployment"] === Infer trained model deployment API -See <>. \ No newline at end of file +See <>. diff --git a/plugins/ingest-attachment/build.gradle b/modules/ingest-attachment/build.gradle similarity index 100% rename from plugins/ingest-attachment/build.gradle rename to modules/ingest-attachment/build.gradle diff --git a/plugins/ingest-attachment/licenses/SparseBitSet-1.2.jar.sha1 b/modules/ingest-attachment/licenses/SparseBitSet-1.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/SparseBitSet-1.2.jar.sha1 rename to modules/ingest-attachment/licenses/SparseBitSet-1.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/SparseBitSet-LICENSE.txt b/modules/ingest-attachment/licenses/SparseBitSet-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/SparseBitSet-LICENSE.txt rename to modules/ingest-attachment/licenses/SparseBitSet-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/SparseBitSet-NOTICE.txt b/modules/ingest-attachment/licenses/SparseBitSet-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/SparseBitSet-NOTICE.txt rename to modules/ingest-attachment/licenses/SparseBitSet-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-LICENSE.txt b/modules/ingest-attachment/licenses/apache-mime4j-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/apache-mime4j-LICENSE.txt rename to modules/ingest-attachment/licenses/apache-mime4j-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-NOTICE.txt b/modules/ingest-attachment/licenses/apache-mime4j-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/apache-mime4j-NOTICE.txt rename to modules/ingest-attachment/licenses/apache-mime4j-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.5.jar.sha1 b/modules/ingest-attachment/licenses/apache-mime4j-core-0.8.5.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/apache-mime4j-core-0.8.5.jar.sha1 rename to modules/ingest-attachment/licenses/apache-mime4j-core-0.8.5.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.5.jar.sha1 b/modules/ingest-attachment/licenses/apache-mime4j-dom-0.8.5.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/apache-mime4j-dom-0.8.5.jar.sha1 rename to modules/ingest-attachment/licenses/apache-mime4j-dom-0.8.5.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1 b/modules/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1 rename to modules/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-LICENSE.txt b/modules/ingest-attachment/licenses/bcmail-jdk15on-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcmail-jdk15on-LICENSE.txt rename to modules/ingest-attachment/licenses/bcmail-jdk15on-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-NOTICE.txt b/modules/ingest-attachment/licenses/bcmail-jdk15on-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcmail-jdk15on-NOTICE.txt rename to modules/ingest-attachment/licenses/bcmail-jdk15on-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1 b/modules/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1 rename to modules/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-LICENSE.txt b/modules/ingest-attachment/licenses/bcpkix-jdk15on-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcpkix-jdk15on-LICENSE.txt rename to modules/ingest-attachment/licenses/bcpkix-jdk15on-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-NOTICE.txt b/modules/ingest-attachment/licenses/bcpkix-jdk15on-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcpkix-jdk15on-NOTICE.txt rename to modules/ingest-attachment/licenses/bcpkix-jdk15on-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1 b/modules/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1 rename to modules/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-LICENSE.txt b/modules/ingest-attachment/licenses/bcprov-jdk15on-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcprov-jdk15on-LICENSE.txt rename to modules/ingest-attachment/licenses/bcprov-jdk15on-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-NOTICE.txt b/modules/ingest-attachment/licenses/bcprov-jdk15on-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/bcprov-jdk15on-NOTICE.txt rename to modules/ingest-attachment/licenses/bcprov-jdk15on-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-codec-1.14.jar.sha1 b/modules/ingest-attachment/licenses/commons-codec-1.14.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-codec-1.14.jar.sha1 rename to modules/ingest-attachment/licenses/commons-codec-1.14.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-codec-LICENSE.txt b/modules/ingest-attachment/licenses/commons-codec-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-codec-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-codec-LICENSE.txt diff --git a/modules/ingest-attachment/licenses/commons-codec-NOTICE.txt b/modules/ingest-attachment/licenses/commons-codec-NOTICE.txt new file mode 100644 index 000000000000..56916449bbe1 --- /dev/null +++ b/modules/ingest-attachment/licenses/commons-codec-NOTICE.txt @@ -0,0 +1,17 @@ +Apache Commons Codec +Copyright 2002-2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java +contains test data from http://aspell.net/test/orig/batch0.tab. +Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) + +=============================================================================== + +The content of package org.apache.commons.codec.language.bm has been translated +from the original php source code available at http://stevemorse.org/phoneticinfo.htm +with permission from the original authors. +Original source copyright: +Copyright (c) 2008 Alexander Beider & Stephen P. Morse. diff --git a/plugins/ingest-attachment/licenses/commons-collections4-4.1.jar.sha1 b/modules/ingest-attachment/licenses/commons-collections4-4.1.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-collections4-4.1.jar.sha1 rename to modules/ingest-attachment/licenses/commons-collections4-4.1.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-collections4-LICENSE.txt b/modules/ingest-attachment/licenses/commons-collections4-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-collections4-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-collections4-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-collections4-NOTICE.txt b/modules/ingest-attachment/licenses/commons-collections4-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-collections4-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-collections4-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-compress-1.21.jar.sha1 b/modules/ingest-attachment/licenses/commons-compress-1.21.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-compress-1.21.jar.sha1 rename to modules/ingest-attachment/licenses/commons-compress-1.21.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-compress-LICENSE.txt b/modules/ingest-attachment/licenses/commons-compress-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-compress-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-compress-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-compress-NOTICE.txt b/modules/ingest-attachment/licenses/commons-compress-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-compress-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-compress-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 b/modules/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 rename to modules/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-io-LICENSE.txt b/modules/ingest-attachment/licenses/commons-io-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-io-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-io-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-io-NOTICE.txt b/modules/ingest-attachment/licenses/commons-io-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-io-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-io-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-lang3-3.9.jar.sha1 b/modules/ingest-attachment/licenses/commons-lang3-3.9.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-lang3-3.9.jar.sha1 rename to modules/ingest-attachment/licenses/commons-lang3-3.9.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-lang3-LICENSE.txt b/modules/ingest-attachment/licenses/commons-lang3-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-lang3-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-lang3-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-lang3-NOTICE.txt b/modules/ingest-attachment/licenses/commons-lang3-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-lang3-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-lang3-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1 b/modules/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1 rename to modules/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-logging-LICENSE.txt b/modules/ingest-attachment/licenses/commons-logging-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-logging-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-logging-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-codec-NOTICE.txt b/modules/ingest-attachment/licenses/commons-logging-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-codec-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-logging-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/commons-math3-3.6.1.jar.sha1 b/modules/ingest-attachment/licenses/commons-math3-3.6.1.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/commons-math3-3.6.1.jar.sha1 rename to modules/ingest-attachment/licenses/commons-math3-3.6.1.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/commons-math3-LICENSE.txt b/modules/ingest-attachment/licenses/commons-math3-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-math3-LICENSE.txt rename to modules/ingest-attachment/licenses/commons-math3-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/commons-math3-NOTICE.txt b/modules/ingest-attachment/licenses/commons-math3-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/commons-math3-NOTICE.txt rename to modules/ingest-attachment/licenses/commons-math3-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/fontbox-2.0.26.jar.sha1 b/modules/ingest-attachment/licenses/fontbox-2.0.26.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/fontbox-2.0.26.jar.sha1 rename to modules/ingest-attachment/licenses/fontbox-2.0.26.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/fontbox-LICENSE.txt b/modules/ingest-attachment/licenses/fontbox-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/fontbox-LICENSE.txt rename to modules/ingest-attachment/licenses/fontbox-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/fontbox-NOTICE.txt b/modules/ingest-attachment/licenses/fontbox-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/fontbox-NOTICE.txt rename to modules/ingest-attachment/licenses/fontbox-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1 b/modules/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1 rename to modules/ingest-attachment/licenses/jempbox-1.8.16.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/jempbox-LICENSE.txt b/modules/ingest-attachment/licenses/jempbox-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/jempbox-LICENSE.txt rename to modules/ingest-attachment/licenses/jempbox-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/jempbox-NOTICE.txt b/modules/ingest-attachment/licenses/jempbox-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/jempbox-NOTICE.txt rename to modules/ingest-attachment/licenses/jempbox-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/juniversalchardet-1.0.3.jar.sha1 b/modules/ingest-attachment/licenses/juniversalchardet-1.0.3.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/juniversalchardet-1.0.3.jar.sha1 rename to modules/ingest-attachment/licenses/juniversalchardet-1.0.3.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/juniversalchardet-LICENSE.txt b/modules/ingest-attachment/licenses/juniversalchardet-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/juniversalchardet-LICENSE.txt rename to modules/ingest-attachment/licenses/juniversalchardet-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/juniversalchardet-NOTICE.txt b/modules/ingest-attachment/licenses/juniversalchardet-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/juniversalchardet-NOTICE.txt rename to modules/ingest-attachment/licenses/juniversalchardet-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/pdfbox-2.0.26.jar.sha1 b/modules/ingest-attachment/licenses/pdfbox-2.0.26.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/pdfbox-2.0.26.jar.sha1 rename to modules/ingest-attachment/licenses/pdfbox-2.0.26.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/pdfbox-LICENSE.txt b/modules/ingest-attachment/licenses/pdfbox-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/pdfbox-LICENSE.txt rename to modules/ingest-attachment/licenses/pdfbox-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/pdfbox-NOTICE.txt b/modules/ingest-attachment/licenses/pdfbox-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/pdfbox-NOTICE.txt rename to modules/ingest-attachment/licenses/pdfbox-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/poi-5.2.2.jar.sha1 b/modules/ingest-attachment/licenses/poi-5.2.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/poi-5.2.2.jar.sha1 rename to modules/ingest-attachment/licenses/poi-5.2.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/poi-LICENSE.txt b/modules/ingest-attachment/licenses/poi-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-LICENSE.txt rename to modules/ingest-attachment/licenses/poi-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/poi-NOTICE.txt b/modules/ingest-attachment/licenses/poi-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-NOTICE.txt rename to modules/ingest-attachment/licenses/poi-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1 b/modules/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1 rename to modules/ingest-attachment/licenses/poi-ooxml-5.2.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-LICENSE.txt b/modules/ingest-attachment/licenses/poi-ooxml-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-LICENSE.txt rename to modules/ingest-attachment/licenses/poi-ooxml-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-NOTICE.txt b/modules/ingest-attachment/licenses/poi-ooxml-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-NOTICE.txt rename to modules/ingest-attachment/licenses/poi-ooxml-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1 b/modules/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1 rename to modules/ingest-attachment/licenses/poi-ooxml-lite-5.2.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-LICENSE.txt b/modules/ingest-attachment/licenses/poi-ooxml-lite-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-lite-LICENSE.txt rename to modules/ingest-attachment/licenses/poi-ooxml-lite-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/poi-ooxml-lite-NOTICE.txt b/modules/ingest-attachment/licenses/poi-ooxml-lite-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-ooxml-lite-NOTICE.txt rename to modules/ingest-attachment/licenses/poi-ooxml-lite-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1 b/modules/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1 rename to modules/ingest-attachment/licenses/poi-scratchpad-5.2.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-LICENSE.txt b/modules/ingest-attachment/licenses/poi-scratchpad-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-scratchpad-LICENSE.txt rename to modules/ingest-attachment/licenses/poi-scratchpad-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/poi-scratchpad-NOTICE.txt b/modules/ingest-attachment/licenses/poi-scratchpad-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/poi-scratchpad-NOTICE.txt rename to modules/ingest-attachment/licenses/poi-scratchpad-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/slf4j-api-1.6.2.jar.sha1 b/modules/ingest-attachment/licenses/slf4j-api-1.6.2.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/slf4j-api-1.6.2.jar.sha1 rename to modules/ingest-attachment/licenses/slf4j-api-1.6.2.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/slf4j-api-LICENSE.txt b/modules/ingest-attachment/licenses/slf4j-api-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/slf4j-api-LICENSE.txt rename to modules/ingest-attachment/licenses/slf4j-api-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/slf4j-api-NOTICE.txt b/modules/ingest-attachment/licenses/slf4j-api-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/slf4j-api-NOTICE.txt rename to modules/ingest-attachment/licenses/slf4j-api-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tagsoup-1.2.1.jar.sha1 b/modules/ingest-attachment/licenses/tagsoup-1.2.1.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tagsoup-1.2.1.jar.sha1 rename to modules/ingest-attachment/licenses/tagsoup-1.2.1.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tagsoup-LICENSE.txt b/modules/ingest-attachment/licenses/tagsoup-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tagsoup-LICENSE.txt rename to modules/ingest-attachment/licenses/tagsoup-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tagsoup-NOTICE.txt b/modules/ingest-attachment/licenses/tagsoup-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tagsoup-NOTICE.txt rename to modules/ingest-attachment/licenses/tagsoup-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-core-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-core-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-core-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-core-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-core-LICENSE.txt b/modules/ingest-attachment/licenses/tika-core-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-core-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-core-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-core-NOTICE.txt b/modules/ingest-attachment/licenses/tika-core-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-core-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-core-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-LICENSE.txt b/modules/ingest-attachment/licenses/tika-langdetect-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-langdetect-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-langdetect-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-NOTICE.txt b/modules/ingest-attachment/licenses/tika-langdetect-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-langdetect-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-langdetect-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-langdetect-tika-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-langdetect-tika-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-langdetect-tika-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-langdetect-tika-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-apple-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-apple-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-apple-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-apple-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-apple-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-apple-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-apple-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-apple-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-apple-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-apple-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-apple-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-apple-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-html-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-html-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-html-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-html-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-html-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-html-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-html-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-html-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-html-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-html-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-html-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-html-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-microsoft-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-microsoft-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-microsoft-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-microsoft-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-microsoft-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-microsoft-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-microsoft-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-microsoft-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-microsoft-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-microsoft-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-miscoffice-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-miscoffice-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-miscoffice-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-miscoffice-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-miscoffice-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-miscoffice-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-miscoffice-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-pdf-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-pdf-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-pdf-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-pdf-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-pdf-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-pdf-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-pdf-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-pdf-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-pdf-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-pdf-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-text-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-text-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-text-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-text-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-text-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-text-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-text-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-text-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-text-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-text-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-text-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-text-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-xml-module-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-xml-module-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xml-module-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-xml-module-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-xml-module-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-xml-module-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xml-module-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-xml-module-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-xml-module-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-xml-module-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xml-module-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-xml-module-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-xmp-commons-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xmp-commons-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-xmp-commons-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-xmp-commons-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xmp-commons-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-xmp-commons-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-xmp-commons-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-xmp-commons-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-xmp-commons-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-xmp-commons-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.4.0.jar.sha1 b/modules/ingest-attachment/licenses/tika-parser-zip-commons-2.4.0.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-zip-commons-2.4.0.jar.sha1 rename to modules/ingest-attachment/licenses/tika-parser-zip-commons-2.4.0.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-LICENSE.txt b/modules/ingest-attachment/licenses/tika-parser-zip-commons-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-zip-commons-LICENSE.txt rename to modules/ingest-attachment/licenses/tika-parser-zip-commons-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/tika-parser-zip-commons-NOTICE.txt b/modules/ingest-attachment/licenses/tika-parser-zip-commons-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/tika-parser-zip-commons-NOTICE.txt rename to modules/ingest-attachment/licenses/tika-parser-zip-commons-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/xmlbeans-5.0.3.jar.sha1 b/modules/ingest-attachment/licenses/xmlbeans-5.0.3.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/xmlbeans-5.0.3.jar.sha1 rename to modules/ingest-attachment/licenses/xmlbeans-5.0.3.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/xmlbeans-LICENSE.txt b/modules/ingest-attachment/licenses/xmlbeans-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/xmlbeans-LICENSE.txt rename to modules/ingest-attachment/licenses/xmlbeans-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/xmlbeans-NOTICE.txt b/modules/ingest-attachment/licenses/xmlbeans-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/xmlbeans-NOTICE.txt rename to modules/ingest-attachment/licenses/xmlbeans-NOTICE.txt diff --git a/plugins/ingest-attachment/licenses/xz-1.8.jar.sha1 b/modules/ingest-attachment/licenses/xz-1.8.jar.sha1 similarity index 100% rename from plugins/ingest-attachment/licenses/xz-1.8.jar.sha1 rename to modules/ingest-attachment/licenses/xz-1.8.jar.sha1 diff --git a/plugins/ingest-attachment/licenses/xz-LICENSE.txt b/modules/ingest-attachment/licenses/xz-LICENSE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/xz-LICENSE.txt rename to modules/ingest-attachment/licenses/xz-LICENSE.txt diff --git a/plugins/ingest-attachment/licenses/xz-NOTICE.txt b/modules/ingest-attachment/licenses/xz-NOTICE.txt similarity index 100% rename from plugins/ingest-attachment/licenses/xz-NOTICE.txt rename to modules/ingest-attachment/licenses/xz-NOTICE.txt diff --git a/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/AttachmentProcessor.java b/modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/AttachmentProcessor.java similarity index 100% rename from plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/AttachmentProcessor.java rename to modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/AttachmentProcessor.java diff --git a/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/IngestAttachmentPlugin.java b/modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/IngestAttachmentPlugin.java similarity index 100% rename from plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/IngestAttachmentPlugin.java rename to modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/IngestAttachmentPlugin.java diff --git a/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java b/modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java similarity index 100% rename from plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java rename to modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java diff --git a/plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy b/modules/ingest-attachment/src/main/plugin-metadata/plugin-security.policy similarity index 100% rename from plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy rename to modules/ingest-attachment/src/main/plugin-metadata/plugin-security.policy diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorFactoryTests.java b/modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorFactoryTests.java similarity index 100% rename from plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorFactoryTests.java rename to modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorFactoryTests.java diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java b/modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java similarity index 100% rename from plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java rename to modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java b/modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java similarity index 100% rename from plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java rename to modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaImplTests.java b/modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaImplTests.java similarity index 100% rename from plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaImplTests.java rename to modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaImplTests.java diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/asciidoc.asciidoc b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/asciidoc.asciidoc similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/asciidoc.asciidoc rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/asciidoc.asciidoc diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/bad_tika.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/bad_tika.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/bad_tika.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/bad_tika.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/encrypted.pdf b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/encrypted.pdf similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/encrypted.pdf rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/encrypted.pdf diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithEmptyDateMeta.html b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithEmptyDateMeta.html similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithEmptyDateMeta.html rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithEmptyDateMeta.html diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithValidDateMeta.html b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithValidDateMeta.html similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithValidDateMeta.html rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithValidDateMeta.html diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithoutDateMeta.html b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithoutDateMeta.html similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithoutDateMeta.html rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/htmlWithoutDateMeta.html diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-104.docx b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-104.docx similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-104.docx rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-104.docx diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.doc b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.doc similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.doc rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.doc diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.docx b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.docx similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.docx rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.docx diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.vsdx b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.vsdx similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.vsdx rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/issue-22077.vsdx diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/test.pdf b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/test.pdf similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/test.pdf rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/test.pdf diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testContentLength.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testContentLength.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testContentLength.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testContentLength.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testEPUB.epub b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testEPUB.epub similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testEPUB.epub rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testEPUB.epub diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testXHTML.html b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testXHTML.html similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testXHTML.html rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/testXHTML.html diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-big5.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-big5.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-big5.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-big5.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-euc-jp.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-euc-jp.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-euc-jp.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-euc-jp.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-gbk.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-gbk.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-gbk.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-cjk-gbk.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-empty.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-empty.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-empty.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-empty.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-gibberish.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-gibberish.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-gibberish.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-gibberish.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-english.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-english.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-english.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-english.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-french.txt b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-french.txt similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-french.txt rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/sample-files/text-in-french.txt diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip b/modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip similarity index 100% rename from plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip rename to modules/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip diff --git a/plugins/ingest-attachment/src/yamlRestTest/java/org/elasticsearch/ingest/attachment/IngestAttachmentClientYamlTestSuiteIT.java b/modules/ingest-attachment/src/yamlRestTest/java/org/elasticsearch/ingest/attachment/IngestAttachmentClientYamlTestSuiteIT.java similarity index 100% rename from plugins/ingest-attachment/src/yamlRestTest/java/org/elasticsearch/ingest/attachment/IngestAttachmentClientYamlTestSuiteIT.java rename to modules/ingest-attachment/src/yamlRestTest/java/org/elasticsearch/ingest/attachment/IngestAttachmentClientYamlTestSuiteIT.java diff --git a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml similarity index 83% rename from plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml rename to modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml index 607fa5bf8b78..89bdf4db8d35 100644 --- a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml +++ b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml @@ -10,6 +10,6 @@ - do: nodes.info: {} - - contains: { 'nodes.$master.plugins': { name: ingest-attachment } } + - contains: { 'nodes.$master.modules': { name: ingest-attachment } } - contains: { 'nodes.$master.ingest.processors': { type: attachment } } diff --git a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml similarity index 100% rename from plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml rename to modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml diff --git a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml similarity index 100% rename from plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml rename to modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml diff --git a/plugins/ingest-attachment/licenses/commons-logging-NOTICE.txt b/plugins/ingest-attachment/licenses/commons-logging-NOTICE.txt deleted file mode 100644 index d3d6e140ce4f..000000000000 --- a/plugins/ingest-attachment/licenses/commons-logging-NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Commons Logging -Copyright 2003-2014 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/qa/smoke-test-plugins/build.gradle b/qa/smoke-test-plugins/build.gradle index 4ba6df8dc6d4..06a9d9a6613a 100644 --- a/qa/smoke-test-plugins/build.gradle +++ b/qa/smoke-test-plugins/build.gradle @@ -13,10 +13,6 @@ apply plugin: 'elasticsearch.internal-yaml-rest-test' ext.pluginPaths = [] project(':plugins').getChildProjects().each { pluginName, pluginProject -> - if (BuildParams.inFipsJvm && pluginName == "ingest-attachment") { - // Do not attempt to install ingest-attachment in FIPS 140 as it is not supported (it depends on non-FIPS BouncyCastle) - return - } pluginPaths << pluginProject.path } diff --git a/x-pack/qa/smoke-test-plugins-ssl/build.gradle b/x-pack/qa/smoke-test-plugins-ssl/build.gradle index 6c06bde6b7bd..bd0f9112e2a4 100644 --- a/x-pack/qa/smoke-test-plugins-ssl/build.gradle +++ b/x-pack/qa/smoke-test-plugins-ssl/build.gradle @@ -44,10 +44,6 @@ sourceSets.yamlRestTest.resources.srcDir(keystoreDir) ext.pluginPaths = [] project(':plugins').getChildProjects().each { pluginName, pluginProject -> - if (BuildParams.inFipsJvm && pluginName == "ingest-attachment") { - // Do not attempt to install ingest-attachment in FIPS 140 as it is not supported (it depends on non-FIPS BouncyCastle) - return - } pluginPaths << pluginProject.path } diff --git a/x-pack/qa/smoke-test-plugins/build.gradle b/x-pack/qa/smoke-test-plugins/build.gradle index 407d00d9aeb6..46ae4b9015db 100644 --- a/x-pack/qa/smoke-test-plugins/build.gradle +++ b/x-pack/qa/smoke-test-plugins/build.gradle @@ -8,12 +8,7 @@ dependencies { yamlRestTestImplementation project(':x-pack:qa') } -def pluginPaths = project(':plugins').getChildProjects().findAll { pluginName, pluginProject -> - // Do not attempt to install ingest-attachment in FIPS 140 as it is not supported (it depends on non-FIPS BouncyCastle) - def ignoreIngestAttachment = BuildParams.inFipsJvm && pluginName == "ingest-attachment" - - return ignoreIngestAttachment == false -}.collect {pluginName, pluginProject -> pluginProject.path } +def pluginPaths = project(':plugins').getChildProjects().collect {pluginName, pluginProject -> pluginProject.path } ext.expansions = [ 'expected.plugins.count': pluginPaths.size()