You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/12/04 15:05:20 UTC
[tika] 01/02: Move integration tests into
tika-parsers-classic-package.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 26afddaea785006127cc44be247a4171c2188922
Author: tallison <ta...@apache.org>
AuthorDate: Fri Dec 4 10:02:39 2020 -0500
Move integration tests into tika-parsers-classic-package.
---
.../tika-parser-integration-tests/pom.xml | 331 ---------------------
.../tika-parsers-classic-package/pom.xml | 178 ++++++++++-
.../apache/tika/config/TikaDetectorConfigTest.java | 0
.../tika/config/TikaEncodingDetectorTest.java | 0
.../apache/tika/config/TikaParserConfigTest.java | 0
.../tika/config/TikaTranslatorConfigTest.java | 0
.../tika/detect/TestContainerAwareDetector.java | 0
.../tika/detect/TestFileCommandDetector.java | 0
.../tika/extractor/EmbeddedDocumentUtilTest.java | 0
.../java/org/apache/tika/mime/MimeTypeTest.java | 0
.../java/org/apache/tika/mime/MimeTypesTest.java | 0
.../java/org/apache/tika/mime/TestMimeTypes.java | 0
.../apache/tika/parser/AutoDetectParserTest.java | 0
.../tika/parser/AutoDetectReaderParserTest.java | 0
.../parser/BouncyCastleDigestingParserTest.java | 0
.../apache/tika/parser/DigestingParserTest.java | 0
.../org/apache/tika/parser/ParsingReaderTest.java | 0
.../tika/parser/RecursiveParserWrapperTest.java | 0
.../org/apache/tika/parser/TabularFormatsTest.java | 0
.../java/org/apache/tika/parser/TestParsers.java | 0
.../apache/tika/parser/TestXMLEntityExpansion.java | 0
.../java/org/apache/tika/parser/TestXXEInXML.java | 0
.../java/org/apache/tika/parser/XMLTestBase.java | 0
.../parser/apple/AppleSingleFileParserTest.java | 0
.../apache/tika/parser/apple/PListParserTest.java | 0
.../apache/tika/parser/crypto/TSDParserTest.java | 0
.../parser/fork/ForkParserIntegrationTest.java | 0
.../apache/tika/parser/html/HtmlParserTest.java | 0
.../apache/tika/parser/mail/MboxParserTest.java | 0
.../apache/tika/parser/mail/RFC822ParserTest.java | 0
.../tika/parser/microsoft/EMFParserTest.java | 0
.../tika/parser/microsoft/ExcelParserTest.java | 0
.../microsoft/POIContainerExtractionTest.java | 0
.../parser/microsoft/PowerPointParserTest.java | 0
.../tika/parser/microsoft/XML2003ParserTest.java | 0
.../parser/microsoft/ooxml/OOXMLParserTest.java | 0
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 0
.../tika/parser/microsoft/rtf/RTFParserTest.java | 0
.../apache/tika/parser/mock/MockParserTest.java | 0
.../tika/parser/ocr/TesseractOCRParserTest.java | 0
.../org/apache/tika/parser/odf/ODFParserTest.java | 0
.../org/apache/tika/parser/pdf/PDFParserTest.java | 0
.../org/apache/tika/parser/pkg/ArParserTest.java | 0
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 0
.../pkg/CompositeZipContainerDetectorTest.java | 0
.../apache/tika/parser/pkg/CompressParserTest.java | 0
.../tika/parser/pkg/CompressorParserTest.java | 1 +
.../org/apache/tika/parser/pkg/GzipParserTest.java | 0
.../org/apache/tika/parser/pkg/RarParserTest.java | 0
.../apache/tika/parser/pkg/Seven7ParserTest.java | 0
.../org/apache/tika/parser/pkg/TarParserTest.java | 0
.../org/apache/tika/parser/pkg/ZipParserTest.java | 0
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 0
.../tika/parser/xml/FictionBookParserTest.java | 0
.../sax/PhoneExtractingContentHandlerTest.java | 0
.../sax/StandardsExtractingContentHandlerTest.java | 0
.../apache/tika/utils/ServiceLoaderUtilsTest.java | 0
.../src/test/resources/log4j.properties | 0
.../org/apache/tika/config/TIKA-1558-exclude.xml | 0
.../apache/tika/config/TIKA-1558-excludesub.xml | 0
.../tika/config/TIKA-1702-detector-exclude.xml | 0
.../tika/config/TIKA-1702-translator-default.xml | 0
.../config/TIKA-1702-translator-empty-default.xml | 0
.../tika/config/TIKA-1702-translator-empty.xml | 0
.../tika/config/TIKA-1708-detector-composite.xml | 0
.../tika/config/TIKA-1708-detector-default.xml | 0
...-2273-encoding-detector-outside-static-init.xml | 0
...TIKA-2273-exclude-encoding-detector-default.xml | 0
.../TIKA-2273-no-icu4j-encoding-detector.xml | 0
.../TIKA-2273-non-detecting-params-bad-charset.xml | 0
.../tika/config/TIKA-2273-non-detecting-params.xml | 0
.../TIKA-2273-parameterize-encoding-detector.xml | 0
.../TIKA-2485-encoding-detector-mark-limits.xml | 0
.../org/apache/tika/parser/TIKA-3137-include.xml | 0
.../apache/tika/parser/odf/tika-config-macros.xml | 0
.../CVLKRA-KYC_Download_File_Structure_V3.1.xlsx | Bin
.../test/resources/test-documents/NUTCH-1997.cbor | 0
.../active_layer_arcss_grid_barrow_alaska_2012.dif | 0
.../src/test/resources/test-documents/baseball.gif | Bin
.../src/test/resources/test-documents/baseball.jpg | Bin
.../src/test/resources/test-documents/baseball.png | Bin
..._values_of_alkanes_extracted_from_paleosols.dif | 0
.../test-documents/mock/embedded_then_npe.xml | 0
.../test/resources/test-documents/mock/example.xml | 0
.../resources/test-documents/mock/fake_oom.xml | 0
.../resources/test-documents/mock/heavy_hang.xml | 0
.../resources/test-documents/mock/nothing_bad.xml | 0
.../resources/test-documents/mock/null_pointer.xml | 0
.../test-documents/mock/null_pointer_no_msg.xml | 0
.../resources/test-documents/mock/real_oom.xml | 0
.../test/resources/test-documents/mock/sleep.xml | 0
.../test-documents/mock/sleep_interruptible.xml | 0
.../mock/sleep_not_interruptible.xml | 0
.../resources/test-documents/mock/system_exit.xml | 0
.../test-documents/mock/thread_interrupt.xml | 0
.../resources/test-documents/test-columnar.csv | 0
.../resources/test-documents/test-columnar.ods | Bin
.../resources/test-documents/test-columnar.xpt | Bin
.../src/test/resources/test-documents/test1.swf | Bin
.../src/test/resources/test-documents/test2.swf | Bin
.../src/test/resources/test-documents/test3.swf | Bin
.../src/test/resources/test-documents/testAC3.ac3 | Bin
.../test/resources/test-documents/testAMR-WB.amr | Bin
.../src/test/resources/test-documents/testAMR.amr | Bin
.../src/test/resources/test-documents/testAPK.apk | Bin
.../src/test/resources/test-documents/testASF.asf | Bin
.../test/resources/test-documents/testASiCE.asice | Bin
.../test/resources/test-documents/testASiCS.asics | Bin
.../src/test/resources/test-documents/testBAT.bat | 0
.../test/resources/test-documents/testBATUpper.bat | 0
.../resources/test-documents/testBDB_btree_2.db | Bin
.../resources/test-documents/testBDB_btree_3.db | Bin
.../resources/test-documents/testBDB_btree_4.db | Bin
.../resources/test-documents/testBDB_btree_5.db | Bin
.../resources/test-documents/testBDB_hash_2.db | Bin
.../resources/test-documents/testBDB_hash_3.db | Bin
.../resources/test-documents/testBDB_hash_4.db | Bin
.../resources/test-documents/testBDB_hash_5.db | Bin
.../test/resources/test-documents/testBIBTEX.bib | 0
.../test/resources/test-documents/testBMPfp.txt | 0
.../src/test/resources/test-documents/testCERT.der | Bin
.../src/test/resources/test-documents/testCERT.pem | 0
.../test/resources/test-documents/testCOREL.shw | Bin
.../src/test/resources/test-documents/testCSS.css | 0
.../src/test/resources/test-documents/testCSV.csv | 0
.../test/resources/test-documents/testComment.pdf | Bin
.../src/test/resources/test-documents/testDCX.dcx | Bin
.../test/resources/test-documents/testDITA.dita | 0
.../test/resources/test-documents/testDITA.ditamap | 0
.../test/resources/test-documents/testDITA2.dita | 0
.../test/resources/test-documents/testDJVU.djvu | Bin
.../test/resources/test-documents/testDSAKEY.der | Bin
.../test/resources/test-documents/testDSAKEY.pem | 0
.../resources/test-documents/testDSAPARAMS.pem | 0
.../test/resources/test-documents/testDWF2010.dwf | Bin
.../resources/test-documents/testDXF_ascii.dxf | 0
.../test/resources/test-documents/testDigilite.fdf | 0
.../src/test/resources/test-documents/testEAC3.ac3 | Bin
.../src/test/resources/test-documents/testEAR.ear | Bin
.../test/resources/test-documents/testECKEY.der | Bin
.../test/resources/test-documents/testECKEY.pem | 0
.../test/resources/test-documents/testECPARAMS.pem | 0
.../test-documents/testEndNoteImportFile.enw | 0
.../test/resources/test-documents/testFITS.fits | 0
.../test-documents/testFITS_ShorterHeader.fits | 0
.../test/resources/test-documents/testFLAC.flac | Bin
.../src/test/resources/test-documents/testFLAC.oga | Bin
.../test/resources/test-documents/testFOXMAIL.box | 0
.../resources/test-documents/testFreeBSD-x86-64 | Bin
.../resources/test-documents/testGRAPHVIZd.dot | 0
.../resources/test-documents/testGRAPHVIZdc.dot | 0
.../resources/test-documents/testGRAPHVIZg.dot | 0
.../src/test/resources/test-documents/testH.h | 0
.../src/test/resources/test-documents/testHFA.hfa | Bin
.../resources/test-documents/testICalendar.ics | 0
.../test/resources/test-documents/testINDD.indd | Bin
.../src/test/resources/test-documents/testIPA.ipa | Bin
.../test-documents/testJAVAPROPS.properties | 0
.../resources/test-documents/testJNILIB.jnilib | Bin
.../resources/test-documents/testJavaHprofBinary | Bin
.../resources/test-documents/testJavaHprofText | 0
.../src/test/resources/test-documents/testKML.kml | 0
.../test-documents/testLotus123-lotusftp.123 | Bin
.../test-documents/testLotus123-lotusftp.wk4 | Bin
.../test/resources/test-documents/testLotus123.wk1 | Bin
.../test/resources/test-documents/testLotus123.wk3 | Bin
.../test/resources/test-documents/testLotus123.wks | Bin
.../test/resources/test-documents/testLotusEml.eml | 0
.../test-documents/testMHTMLFirefox.mhtml | 0
.../src/test/resources/test-documents/testMKV.mkv | Bin
.../resources/test-documents/testMSWriteFile.wri | Bin
.../test/resources/test-documents/testMYSQL.MYD | Bin
.../test/resources/test-documents/testMYSQL.MYI | Bin
.../test/resources/test-documents/testMYSQL.frm | Bin
.../resources/test-documents/testMemgraph.memgraph | Bin
.../resources/test-documents/testMessageNews.txt | 0
.../src/test/resources/test-documents/testNLS1.nls | Bin
.../src/test/resources/test-documents/testNLS2.nls | Bin
.../test/resources/test-documents/testOPUS.opus | Bin
.../test-documents/testOptionalHyphen.doc | Bin
.../test-documents/testOptionalHyphen.docx | Bin
.../test-documents/testOptionalHyphen.ppt | Bin
.../test-documents/testOptionalHyphen.pptx | Bin
.../test-documents/testOptionalHyphen.rtf | 0
.../src/test/resources/test-documents/testPBM.pbm | 0
.../src/test/resources/test-documents/testPCX.pcx | Bin
.../src/test/resources/test-documents/testPGM.pgm | 0
.../src/test/resources/test-documents/testPICT.pct | Bin
.../test-documents/testPKCS17Sig-v2.xml.p7m | Bin
.../test-documents/testPKCS17Sig-v3.xml.p7m | 0
.../test-documents/testPKCS17Sig-v4.xml.p7m | 0
.../resources/test-documents/testPKCS17Sig.xml.p7m | 0
.../test-documents/testPhoneNumberExtractor.odt | Bin
.../src/test/resources/test-documents/testRDF.rdf | 0
.../test/resources/test-documents/testRSAKEY.der | Bin
.../test/resources/test-documents/testRSAKEY.pem | 0
.../test/resources/test-documents/testRotated.png | Bin
.../resources/test-documents/testSolaris-x86-32 | Bin
.../test-documents/testStarOffice-5.2-calc.sdc | Bin
.../test-documents/testStarOffice-5.2-draw.sda | Bin
.../test-documents/testStarOffice-5.2-impress.sdd | Bin
.../test-documents/testStarOffice-5.2-writer.sdw | Bin
.../test-documents/testStarOffice-6.0-calc.sxc | Bin
.../test-documents/testStarOffice-6.0-draw.sxd | Bin
.../test-documents/testStarOffice-6.0-draw.sxi | Bin
.../testStarOffice-6.0-writer-template.stw | Bin
.../test-documents/testStarOffice-6.0-writer.sxw | Bin
.../test/resources/test-documents/testStataDTA.dta | Bin
.../test/resources/test-documents/testStataDTA.txt | 0
.../resources/test-documents/testTAR_no_magic.tar | Bin
.../test/resources/test-documents/testTXT-tika.axx | Bin
.../src/test/resources/test-documents/testTXT.txt | 0
.../test-documents/testTXTNonASCIIUTF8.txt | 0
.../test-documents/testThunderbirdEml.eml | 0
.../test/resources/test-documents/testTinyPE.exe | Bin
.../test/resources/test-documents/testVORBIS.ogg | Bin
.../test-documents/testVORCalcTemplate.vor | Bin
.../test-documents/testVORDrawTemplate.vor | Bin
.../test-documents/testVORImpressTemplate.vor | Bin
.../test-documents/testVORWriterTemplate.vor | Bin
.../test/resources/test-documents/testVideoMp4.mp4 | Bin
.../src/test/resources/test-documents/testWAR.war | Bin
.../test/resources/test-documents/testWEBM.webm | Bin
.../src/test/resources/test-documents/testWMA.wma | Bin
.../src/test/resources/test-documents/testWMV.wmv | Bin
.../test/resources/test-documents/testWMV_WMV2.wmv | Bin
.../test/resources/test-documents/testWORKS.wps | Bin
.../resources/test-documents/testWORKS2000.wps | Bin
.../test-documents/testWORKSWordProcessor3.0.wps | Bin
.../test-documents/testWORKSWordProcessor4.0.wps | Bin
.../test/resources/test-documents/testWebVTT.vtt | 0
.../resources/test-documents/testWebVTT_header.vtt | 0
.../resources/test-documents/testWebVTT_simple.vtt | 0
.../test-documents/testWindowsMediaMeta.asx | 0
.../src/test/resources/test-documents/testXDP.xdp | 0
.../test/resources/test-documents/testXFDF.xfdf | 0
236 files changed, 169 insertions(+), 341 deletions(-)
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/pom.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/pom.xml
deleted file mode 100644
index 0e16f10..0000000
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/pom.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-parsers-classic-modules</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>tika-parser-integration-tests</artifactId>
-
- <dependencies>
- <!-- test dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-crypto-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-digest-commons</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-audiovideo-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-apple-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-cad-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-code-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-font-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-image-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-mail-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-miscoffice-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-news-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-ocr-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pkg-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- pkg module brings this in as provided
- we need to bring it in literally-->
- <dependency>
- <groupId>com.github.luben</groupId>
- <artifactId>zstd-jni</artifactId>
- <version>1.4.5-4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- include the test-documents -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-apple-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-audiovideo-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-cad-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-code-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-crypto-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-font-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-image-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-mail-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-miscoffice-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-news-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-ocr-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pkg-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <!-- Externally Maintained Parsers -->
- <dependency>
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-tika</artifactId>
- <version>${vorbis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-core</artifactId>
- <version>${vorbis.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
index 7c50d8b..19f94a4 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
@@ -158,6 +158,160 @@
<version>${vorbis.version}</version>
</dependency>
+ <!-- integration test jars -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.luben</groupId>
+ <artifactId>zstd-jni</artifactId>
+ <version>${zstd.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-zip-commons</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-apple-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-audiovideo-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-cad-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-code-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-crypto-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-font-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-html-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-xml-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-image-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-mail-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-microsoft-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-miscoffice-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-news-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-ocr-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-pdf-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-pkg-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-text-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -242,20 +396,24 @@
</filter>
</filters>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Automatic-Module-Name>org.apache.tika.parsers</Automatic-Module-Name>
</manifestEntries>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/services/org.apache.tika.detect.Detector</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/services/org.apache.tika.detect.EncodingDetector</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/services/org.apache.tika.parser.Parser</resource>
- </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.detect.Detector</resource>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.detect.EncodingDetector</resource>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.parser.Parser</resource>
+ </transformer>
</transformers>
</configuration>
</execution>
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestParsers.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestParsers.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/XMLTestBase.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/XMLTestBase.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
similarity index 99%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
index b93d777..4bb3b73 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
@@ -22,6 +22,7 @@ import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.List;
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/log4j.properties b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/log4j.properties
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/log4j.properties
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/log4j.properties
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/NUTCH-1997.cbor
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/NUTCH-1997.cbor
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.gif
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.gif
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.jpg
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.jpg
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.png
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/baseball.png
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/embedded_then_npe.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/embedded_then_npe.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/example.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/example.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/fake_oom.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/fake_oom.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/heavy_hang.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/heavy_hang.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/nothing_bad.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/nothing_bad.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/null_pointer.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/null_pointer.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/real_oom.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/real_oom.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep_interruptible.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep_interruptible.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/system_exit.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/system_exit.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/thread_interrupt.xml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/mock/thread_interrupt.xml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.csv
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.csv
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.ods
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.ods
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.xpt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test-columnar.xpt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test1.swf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test1.swf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test2.swf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test2.swf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test3.swf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/test3.swf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAC3.ac3
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAC3.ac3
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAMR-WB.amr
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAMR-WB.amr
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAMR.amr
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAMR.amr
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAPK.apk
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testAPK.apk
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASF.asf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASF.asf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASiCE.asice
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASiCE.asice
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASiCS.asics
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testASiCS.asics
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBAT.bat
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBAT.bat
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBATUpper.bat
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBATUpper.bat
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_2.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_2.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_3.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_3.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_4.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_4.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_5.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_btree_5.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_2.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_2.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_3.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_3.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_4.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_4.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_5.db
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBDB_hash_5.db
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBIBTEX.bib
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBIBTEX.bib
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBMPfp.txt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testBMPfp.txt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCERT.der b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCERT.der
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCERT.der
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCERT.der
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCERT.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCERT.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCERT.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCERT.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCOREL.shw
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCOREL.shw
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCSS.css
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCSS.css
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCSV.csv
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testCSV.csv
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testComment.pdf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testComment.pdf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDCX.dcx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDCX.dcx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA.dita
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA.dita
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA.ditamap
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA.ditamap
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA2.dita
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDITA2.dita
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDJVU.djvu
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDJVU.djvu
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAKEY.der b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAKEY.der
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAKEY.der
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAKEY.der
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAKEY.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAKEY.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAKEY.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAKEY.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAPARAMS.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAPARAMS.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDSAPARAMS.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDSAPARAMS.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDWF2010.dwf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDWF2010.dwf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDXF_ascii.dxf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDXF_ascii.dxf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDigilite.fdf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testDigilite.fdf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEAC3.ac3
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEAC3.ac3
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEAR.ear
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEAR.ear
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECKEY.der b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECKEY.der
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECKEY.der
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECKEY.der
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECKEY.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECKEY.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECKEY.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECKEY.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECPARAMS.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECPARAMS.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testECPARAMS.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testECPARAMS.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEndNoteImportFile.enw
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testEndNoteImportFile.enw
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFITS.fits
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFITS.fits
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFITS_ShorterHeader.fits
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFITS_ShorterHeader.fits
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFLAC.flac
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFLAC.flac
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFLAC.oga
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFLAC.oga
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFOXMAIL.box
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFOXMAIL.box
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFreeBSD-x86-64
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testFreeBSD-x86-64
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZd.dot
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZd.dot
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZdc.dot
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZdc.dot
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZg.dot
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testGRAPHVIZg.dot
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testH.h b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testH.h
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testH.h
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testH.h
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testHFA.hfa
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testHFA.hfa
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testICalendar.ics
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testICalendar.ics
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testINDD.indd
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testINDD.indd
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testIPA.ipa
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testIPA.ipa
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJAVAPROPS.properties
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJAVAPROPS.properties
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJNILIB.jnilib
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJNILIB.jnilib
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJavaHprofBinary
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJavaHprofBinary
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJavaHprofText
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testJavaHprofText
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testKML.kml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testKML.kml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123-lotusftp.123
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123-lotusftp.123
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123-lotusftp.wk4
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123-lotusftp.wk4
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wk1
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wk1
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wk3
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wk3
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wks
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotus123.wks
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotusEml.eml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testLotusEml.eml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMHTMLFirefox.mhtml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMHTMLFirefox.mhtml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMKV.mkv
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMKV.mkv
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMSWriteFile.wri
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMSWriteFile.wri
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.MYD
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.MYD
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.MYI
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.MYI
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.frm
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMYSQL.frm
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMemgraph.memgraph
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMemgraph.memgraph
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMessageNews.txt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testMessageNews.txt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testNLS1.nls
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testNLS1.nls
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testNLS2.nls
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testNLS2.nls
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOPUS.opus
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOPUS.opus
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.doc
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.doc
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.docx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.docx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.ppt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.ppt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.pptx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.pptx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.rtf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testOptionalHyphen.rtf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPBM.pbm
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPBM.pbm
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPCX.pcx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPCX.pcx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPGM.pgm
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPGM.pgm
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPICT.pct
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPICT.pct
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPhoneNumberExtractor.odt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testPhoneNumberExtractor.odt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRDF.rdf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRDF.rdf
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRSAKEY.der b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRSAKEY.der
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRSAKEY.der
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRSAKEY.der
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRSAKEY.pem b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRSAKEY.pem
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRSAKEY.pem
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRSAKEY.pem
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRotated.png
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testRotated.png
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testSolaris-x86-32
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testSolaris-x86-32
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStataDTA.dta
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStataDTA.dta
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStataDTA.txt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testStataDTA.txt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTAR_no_magic.tar
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTAR_no_magic.tar
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXT-tika.axx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXT-tika.axx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXT.txt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXT.txt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testThunderbirdEml.eml
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testThunderbirdEml.eml
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTinyPE.exe
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testTinyPE.exe
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORBIS.ogg
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORBIS.ogg
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORCalcTemplate.vor
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORCalcTemplate.vor
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORDrawTemplate.vor
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORDrawTemplate.vor
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORImpressTemplate.vor
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORImpressTemplate.vor
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORWriterTemplate.vor
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVORWriterTemplate.vor
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4 b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVideoMp4.mp4
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testVideoMp4.mp4
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWAR.war
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWAR.war
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWEBM.webm
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWEBM.webm
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMA.wma
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMA.wma
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMV.wmv
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMV.wmv
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMV_WMV2.wmv
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWMV_WMV2.wmv
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKS.wps
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKS.wps
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKS2000.wps
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKS2000.wps
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT.vtt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT.vtt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT_header.vtt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT_header.vtt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT_simple.vtt
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWebVTT_simple.vtt
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWindowsMediaMeta.asx
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testWindowsMediaMeta.asx
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testXDP.xdp
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testXDP.xdp
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testXFDF.xfdf
similarity index 100%
rename from tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf
rename to tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/test/resources/test-documents/testXFDF.xfdf