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/09/01 19:25:22 UTC
[tika] branch main updated (9405c5f -> c2a2567)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 9405c5f TIKA-3179 -- Fix parent information in tika-parsers-extended TIKA-3183 -- alphabetize/normalize properties
new aad9659 TIKA-3179 -- fix parent in tika-parsers module
new c2a2567 TIKA-3176 -- modularize language detectors
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
tika-app/pom.xml | 2 +-
tika-langdetect/pom.xml | 227 +++------------------
.../tika-langdetect-commons}/pom.xml | 15 +-
.../tika/langdetect/LanguageDetectorTest.java | 3 +-
.../src/test/resources/log4j.properties | 0
.../apache/tika/langdetect/language-tests/da.test | 0
.../apache/tika/langdetect/language-tests/de.test | 0
.../apache/tika/langdetect/language-tests/el.test | 0
.../apache/tika/langdetect/language-tests/en.test | 0
.../apache/tika/langdetect/language-tests/es.test | 0
.../apache/tika/langdetect/language-tests/et.test | 0
.../apache/tika/langdetect/language-tests/fi.test | 0
.../apache/tika/langdetect/language-tests/fr.test | 0
.../apache/tika/langdetect/language-tests/it.test | 0
.../apache/tika/langdetect/language-tests/ja.test | 0
.../apache/tika/langdetect/language-tests/lt.test | 0
.../apache/tika/langdetect/language-tests/nl.test | 0
.../apache/tika/langdetect/language-tests/pt.test | 0
.../apache/tika/langdetect/language-tests/sv.test | 0
.../apache/tika/langdetect/language-tests/th.test | 0
.../apache/tika/langdetect/language-tests/zh.test | 0
.../org/apache/tika/langdetect/text-test.tsv | 0
tika-langdetect/tika-langdetect-lingo24/pom.xml | 74 +++++++
.../langdetect/lingo24}/Lingo24LangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../lingo24}/langdetect.lingo24.properties | 0
.../lingo24}/Lingo24LangDetectorTest.java | 19 +-
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 73 +++++++
.../tika/langdetect/mitll}/TextLangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../langdetect/mitll}/TextLangDetectorTest.java | 12 +-
.../src/test/resources/log4j.properties | 0
.../tika-langdetect-optimaize}/pom.xml | 38 ++--
.../optimaize}/OptimaizeLangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../optimaize}/OptimaizeLangDetectorTest.java | 3 +-
.../tika/langdetect/optimaize}/language-codes.txt | 0
.../tika/langdetect/optimaize}/udhr-known.txt | 0
.../tika/langdetect/optimaize}/udhr-unknown.txt | 0
tika-parsers/pom.xml | 15 +-
tika-parsers/tika-parser-apple-module/pom.xml | 2 +-
tika-parsers/tika-parser-audiovideo-module/pom.xml | 2 +-
tika-parsers/tika-parser-cad-module/pom.xml | 2 +-
tika-parsers/tika-parser-code-module/pom.xml | 2 +-
tika-parsers/tika-parser-crypto-module/pom.xml | 2 +-
tika-parsers/tika-parser-digest-commons/pom.xml | 2 +-
tika-parsers/tika-parser-font-module/pom.xml | 2 +-
tika-parsers/tika-parser-html-module/pom.xml | 2 +-
tika-parsers/tika-parser-image-module/pom.xml | 2 +-
tika-parsers/tika-parser-integration-tests/pom.xml | 2 +-
tika-parsers/tika-parser-jdbc-commons/pom.xml | 2 +-
tika-parsers/tika-parser-mail-commons/pom.xml | 2 +-
tika-parsers/tika-parser-mail-module/pom.xml | 2 +-
tika-parsers/tika-parser-microsoft-module/pom.xml | 2 +-
tika-parsers/tika-parser-miscoffice-module/pom.xml | 2 +-
tika-parsers/tika-parser-news-module/pom.xml | 2 +-
tika-parsers/tika-parser-ocr-module/pom.xml | 2 +-
tika-parsers/tika-parser-pdf-module/pom.xml | 2 +-
tika-parsers/tika-parser-pkg-module/pom.xml | 2 +-
tika-parsers/tika-parser-text-module/pom.xml | 2 +-
tika-parsers/tika-parser-xml-module/pom.xml | 2 +-
tika-parsers/tika-parser-xmp-commons/pom.xml | 2 +-
tika-parsers/tika-parser-zip-commons/pom.xml | 2 +-
tika-server/pom.xml | 2 +-
.../tika/server/resource/LanguageResource.java | 3 +-
.../tika/server/resource/TranslateResource.java | 2 +-
tika-translate/pom.xml | 26 ++-
.../language/translate/AbstractTranslator.java | 2 +-
69 files changed, 295 insertions(+), 281 deletions(-)
copy {tika-parsers/tika-parser-font-module => tika-langdetect/tika-langdetect-commons}/pom.xml (78%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java (95%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/log4j.properties (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/da.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/de.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/el.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/en.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/es.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/et.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/fi.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/fr.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/it.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/ja.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/lt.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/nl.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/pt.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/sv.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/th.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/language-tests/zh.test (100%)
rename tika-langdetect/{ => tika-langdetect-commons}/src/test/resources/org/apache/tika/langdetect/text-test.tsv (100%)
create mode 100644 tika-langdetect/tika-langdetect-lingo24/pom.xml
rename tika-langdetect/{src/main/java/org/apache/tika/langdetect => tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24}/Lingo24LangDetector.java (99%)
copy tika-langdetect/{ => tika-langdetect-lingo24}/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector (93%)
rename tika-langdetect/{src/main/resources/org/apache/tika/langdetect => tika-langdetect-lingo24/src/main/resources/org/apache/tika/langdetect/lingo24}/langdetect.lingo24.properties (100%)
rename tika-langdetect/{src/test/java/org/apache/tika/langdetect => tika-langdetect-lingo24/src/test/java/org/apache/tika/langdetect/lingo24}/Lingo24LangDetectorTest.java (83%)
create mode 100644 tika-langdetect/tika-langdetect-mitll-text/pom.xml
rename tika-langdetect/{src/main/java/org/apache/tika/langdetect => tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll}/TextLangDetector.java (99%)
copy tika-langdetect/{ => tika-langdetect-mitll-text}/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector (94%)
rename tika-langdetect/{src/test/java/org/apache/tika/langdetect => tika-langdetect-mitll-text/src/test/java/org/apache/tika/langdetect/mitll}/TextLangDetectorTest.java (90%)
copy {tika-parsers/tika-parser-integration-tests => tika-langdetect/tika-langdetect-mitll-text}/src/test/resources/log4j.properties (100%)
copy {tika-parsers-extended/tika-parsers-extended-integration-tests => tika-langdetect/tika-langdetect-optimaize}/pom.xml (52%)
rename tika-langdetect/{src/main/java/org/apache/tika/langdetect => tika-langdetect-optimaize/src/main/java/org/apache/tika/langdetect/optimaize}/OptimaizeLangDetector.java (99%)
rename tika-langdetect/{ => tika-langdetect-optimaize}/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector (93%)
rename tika-langdetect/{src/test/java/org/apache/tika/langdetect => tika-langdetect-optimaize/src/test/java/org/apache/tika/langdetect/optimaize}/OptimaizeLangDetectorTest.java (98%)
rename tika-langdetect/{src/test/resources/org/apache/tika/langdetect => tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize}/language-codes.txt (100%)
rename tika-langdetect/{src/test/resources/org/apache/tika/langdetect => tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize}/udhr-known.txt (100%)
rename tika-langdetect/{src/test/resources/org/apache/tika/langdetect => tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize}/udhr-unknown.txt (100%)
[tika] 02/02: TIKA-3176 -- modularize language detectors
Posted by ta...@apache.org.
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 c2a25674dbbafaae335d9066ec72bbb294bdb655
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 1 15:23:54 2020 -0400
TIKA-3176 -- modularize language detectors
---
pom.xml | 2 +-
tika-app/pom.xml | 2 +-
tika-langdetect/pom.xml | 227 +++------------------
tika-langdetect/tika-langdetect-commons/pom.xml | 46 +++++
.../tika/langdetect/LanguageDetectorTest.java | 3 +-
.../src/test/resources/log4j.properties | 0
.../apache/tika/langdetect/language-tests/da.test | 0
.../apache/tika/langdetect/language-tests/de.test | 0
.../apache/tika/langdetect/language-tests/el.test | 0
.../apache/tika/langdetect/language-tests/en.test | 0
.../apache/tika/langdetect/language-tests/es.test | 0
.../apache/tika/langdetect/language-tests/et.test | 0
.../apache/tika/langdetect/language-tests/fi.test | 0
.../apache/tika/langdetect/language-tests/fr.test | 0
.../apache/tika/langdetect/language-tests/it.test | 0
.../apache/tika/langdetect/language-tests/ja.test | 0
.../apache/tika/langdetect/language-tests/lt.test | 0
.../apache/tika/langdetect/language-tests/nl.test | 0
.../apache/tika/langdetect/language-tests/pt.test | 0
.../apache/tika/langdetect/language-tests/sv.test | 0
.../apache/tika/langdetect/language-tests/th.test | 0
.../apache/tika/langdetect/language-tests/zh.test | 0
.../org/apache/tika/langdetect/text-test.tsv | 0
tika-langdetect/tika-langdetect-lingo24/pom.xml | 74 +++++++
.../langdetect/lingo24}/Lingo24LangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../lingo24}/langdetect.lingo24.properties | 0
.../lingo24}/Lingo24LangDetectorTest.java | 19 +-
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 73 +++++++
.../tika/langdetect/mitll}/TextLangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../langdetect/mitll}/TextLangDetectorTest.java | 12 +-
.../src/test/resources/log4j.properties | 0
tika-langdetect/tika-langdetect-optimaize/pom.xml | 55 +++++
.../optimaize}/OptimaizeLangDetector.java | 2 +-
...rg.apache.tika.language.detect.LanguageDetector | 2 +-
.../optimaize}/OptimaizeLangDetectorTest.java | 3 +-
.../tika/langdetect/optimaize}/language-codes.txt | 0
.../tika/langdetect/optimaize}/udhr-known.txt | 0
.../tika/langdetect/optimaize}/udhr-unknown.txt | 0
tika-server/pom.xml | 2 +-
.../tika/server/resource/LanguageResource.java | 3 +-
.../tika/server/resource/TranslateResource.java | 2 +-
tika-translate/pom.xml | 26 ++-
.../language/translate/AbstractTranslator.java | 2 +-
45 files changed, 342 insertions(+), 221 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1fa7a53..cc3c98e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,11 +44,11 @@
<module>tika-xmp</module>
<module>tika-serialization</module>
<module>tika-batch</module>
+ <module>tika-langdetect</module>
<module>tika-app</module>
<module>tika-server</module>
<module>tika-fuzzing</module>
<module>tika-translate</module>
- <module>tika-langdetect</module>
<module>tika-example</module>
<module>tika-java7</module>
<module>tika-eval</module>
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index b5d7afb..c917358 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-langdetect</artifactId>
+ <artifactId>tika-langdetect-optimaize</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 9b18fe4..b1fa8b3 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -1,196 +1,33 @@
<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>tika-langdetect</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Tika language detection</name>
- <url>http://tika.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- for java 10
- See TIKA-2778 for why we need to do this now.
- May the gods of dependency management fix this in the future.
- -->
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>com.optimaize.languagedetector</groupId>
- <artifactId>language-detector</artifactId>
- <version>${optimaize.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- exclude and then add back in to avoid
- conflicts with edu.ucar:cdm in tika-parsers -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Bundle-Activator>
- org.apache.tika.parser.internal.Activator
- </Bundle-Activator>
- <Import-Package>
- org.w3c.dom,
- org.apache.tika.*,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/org/apache/tika/langdetect/*</exclude>
- <exclude>src/test/resources/org/apache/tika/langdetect/language-tests/*</exclude>
-
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.langdetect</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <!-- This plugin's configuration is used to store Eclipse m2e -->
- <!-- settings only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>${maven.scr.version}</version>
- <goals>
- <goal>scr</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <description>This is the language detection Apache Tika™ toolkit.
- </description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
-</project>
+<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>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../tika-parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-langdetect</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tika language detection</name>
+ <url>http://tika.apache.org/</url>
+
+ <modules>
+ <module>tika-langdetect-commons</module>
+ <module>tika-langdetect-lingo24</module>
+ <module>tika-langdetect-optimaize</module>
+ <module>tika-langdetect-mitll-text</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/tika-langdetect/tika-langdetect-commons/pom.xml b/tika-langdetect/tika-langdetect-commons/pom.xml
new file mode 100644
index 0000000..0c34704
--- /dev/null
+++ b/tika-langdetect/tika-langdetect-commons/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-langdetect</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-langdetect-commons</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.langdetect.commons</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java b/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
similarity index 95%
rename from tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
rename to tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
index 726219b..8120e67 100644
--- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
+++ b/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -35,7 +34,7 @@ public abstract class LanguageDetectorTest {
List<String> result = new ArrayList<>();
List<String> lines = IOUtils.readLines(
- LanguageDetectorTest.class.getResourceAsStream("language-codes.txt"),
+ this.getClass().getResourceAsStream("language-codes.txt"),
UTF_8);
for (String line : lines) {
line = line.trim();
diff --git a/tika-langdetect/src/test/resources/log4j.properties b/tika-langdetect/tika-langdetect-commons/src/test/resources/log4j.properties
similarity index 100%
copy from tika-langdetect/src/test/resources/log4j.properties
copy to tika-langdetect/tika-langdetect-commons/src/test/resources/log4j.properties
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/da.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/da.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/da.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/da.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/de.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/de.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/de.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/de.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/el.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/el.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/el.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/el.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/en.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/en.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/en.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/en.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/es.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/es.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/es.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/es.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/et.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/et.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/et.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/et.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/fi.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/fi.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/fi.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/fi.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/fr.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/fr.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/fr.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/fr.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/it.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/it.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/it.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/it.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/ja.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/ja.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/ja.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/ja.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/lt.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/lt.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/lt.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/lt.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/nl.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/nl.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/nl.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/nl.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/pt.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/pt.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/pt.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/pt.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/sv.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/sv.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/sv.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/sv.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/th.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/th.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/th.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/th.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/zh.test b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/zh.test
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-tests/zh.test
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/language-tests/zh.test
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/text-test.tsv b/tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/text-test.tsv
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/text-test.tsv
rename to tika-langdetect/tika-langdetect-commons/src/test/resources/org/apache/tika/langdetect/text-test.tsv
diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml b/tika-langdetect/tika-langdetect-lingo24/pom.xml
new file mode 100644
index 0000000..cdf1e48
--- /dev/null
+++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-langdetect</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-langdetect-lingo24</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- for java 10
+ See TIKA-2778 for why we need to do this now.
+ May the gods of dependency management fix this in the future.
+ -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tika-langdetect/src/main/java/org/apache/tika/langdetect/Lingo24LangDetector.java b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
similarity index 99%
rename from tika-langdetect/src/main/java/org/apache/tika/langdetect/Lingo24LangDetector.java
rename to tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
index 9ce9548..ca8e31f 100644
--- a/tika-langdetect/src/main/java/org/apache/tika/langdetect/Lingo24LangDetector.java
+++ b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.lingo24;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
diff --git a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector b/tika-langdetect/tika-langdetect-lingo24/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
similarity index 93%
copy from tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
copy to tika-langdetect/tika-langdetect-lingo24/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
index 79fc24e..e463066 100644
--- a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
+++ b/tika-langdetect/tika-langdetect-lingo24/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.langdetect.OptimaizeLangDetector
+org.apache.tika.langdetect.lingo24.Lingo24LangDetector
diff --git a/tika-langdetect/src/main/resources/org/apache/tika/langdetect/langdetect.lingo24.properties b/tika-langdetect/tika-langdetect-lingo24/src/main/resources/org/apache/tika/langdetect/lingo24/langdetect.lingo24.properties
similarity index 100%
rename from tika-langdetect/src/main/resources/org/apache/tika/langdetect/langdetect.lingo24.properties
rename to tika-langdetect/tika-langdetect-lingo24/src/main/resources/org/apache/tika/langdetect/lingo24/langdetect.lingo24.properties
diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/Lingo24LangDetectorTest.java b/tika-langdetect/tika-langdetect-lingo24/src/test/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetectorTest.java
similarity index 83%
rename from tika-langdetect/src/test/java/org/apache/tika/langdetect/Lingo24LangDetectorTest.java
rename to tika-langdetect/tika-langdetect-lingo24/src/test/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetectorTest.java
index 151e877..c04788f 100644
--- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/Lingo24LangDetectorTest.java
+++ b/tika-langdetect/tika-langdetect-lingo24/src/test/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetectorTest.java
@@ -14,14 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.lingo24;
import org.apache.tika.io.IOUtils;
+import org.apache.tika.langdetect.LanguageDetectorTest;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.apache.tika.language.detect.LanguageWriter;
import org.junit.Test;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -31,7 +34,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
/**
- * Test harness for the {@link org.apache.tika.langdetect.Lingo24LangDetector}.
+ * Test harness for the {@link org.apache.tika.langdetect.lingo24.Lingo24LangDetector}.
*/
public class Lingo24LangDetectorTest {
@@ -48,14 +51,18 @@ public class Lingo24LangDetectorTest {
@Test
public void testLanguageDetection() throws Exception {
+ // Reusing the test data from OptimaizeLangDetectorTest
+ // Test taht we can at least read the test file
+ List<String> lines = IOUtils.readLines(
+ new InputStreamReader(
+ LanguageDetectorTest.class.getResourceAsStream("text-test.tsv"), StandardCharsets.UTF_8));
+ assertEquals(18, lines.size());
+
LanguageDetector detector = new Lingo24LangDetector();
assumeTrue(((Lingo24LangDetector) detector).isAvailable());
LanguageWriter writer = new LanguageWriter(detector);
- // Reusing the test data from OptimaizeLangDetectorTest
- List<String> lines = IOUtils.readLines(
- Lingo24LangDetectorTest.class.getResourceAsStream("text-test.tsv"),
- StandardCharsets.UTF_8);
+
for (String line : lines) {
String[] data = line.split("\t");
if (data.length != 2) continue;
diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
new file mode 100644
index 0000000..8d6d398
--- /dev/null
+++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-langdetect</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-langdetect-mitll-text</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- for java 10
+ See TIKA-2778 for why we need to do this now.
+ May the gods of dependency management fix this in the future.
+ -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tika-langdetect/src/main/java/org/apache/tika/langdetect/TextLangDetector.java b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
similarity index 99%
rename from tika-langdetect/src/main/java/org/apache/tika/langdetect/TextLangDetector.java
rename to tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
index dd1dbbb..9a692ed 100644
--- a/tika-langdetect/src/main/java/org/apache/tika/langdetect/TextLangDetector.java
+++ b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.mitll;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
diff --git a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector b/tika-langdetect/tika-langdetect-mitll-text/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
similarity index 94%
copy from tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
copy to tika-langdetect/tika-langdetect-mitll-text/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
index 79fc24e..cd768ac 100644
--- a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
+++ b/tika-langdetect/tika-langdetect-mitll-text/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.langdetect.OptimaizeLangDetector
+org.apache.tika.langdetect.mitll.TextLangDetector
diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/TextLangDetectorTest.java b/tika-langdetect/tika-langdetect-mitll-text/src/test/java/org/apache/tika/langdetect/mitll/TextLangDetectorTest.java
similarity index 90%
rename from tika-langdetect/src/test/java/org/apache/tika/langdetect/TextLangDetectorTest.java
rename to tika-langdetect/tika-langdetect-mitll-text/src/test/java/org/apache/tika/langdetect/mitll/TextLangDetectorTest.java
index 023d0b3..00deec8 100644
--- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/TextLangDetectorTest.java
+++ b/tika-langdetect/tika-langdetect-mitll-text/src/test/java/org/apache/tika/langdetect/mitll/TextLangDetectorTest.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.mitll;
import org.apache.tika.io.IOUtils;
+import org.apache.tika.langdetect.LanguageDetectorTest;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.apache.tika.language.detect.LanguageWriter;
@@ -36,14 +37,17 @@ public class TextLangDetectorTest {
@Test
public void test() throws Exception {
+ List<String> lines = IOUtils.readLines(
+ LanguageDetectorTest.class.getResourceAsStream("text-test.tsv"),
+ StandardCharsets.UTF_8);
+
+ assertEquals(18, lines.size());
+
assumeTrue(TextLangDetector.canRun());
LanguageDetector detector = new TextLangDetector();
LanguageWriter writer = new LanguageWriter(detector);
- List<String> lines = IOUtils.readLines(
- TextLangDetectorTest.class.getResourceAsStream("text-test.tsv"),
- StandardCharsets.UTF_8);
for (String line : lines) {
String[] data = line.split("\t");
if (data.length != 2) continue;
diff --git a/tika-langdetect/src/test/resources/log4j.properties b/tika-langdetect/tika-langdetect-mitll-text/src/test/resources/log4j.properties
similarity index 100%
rename from tika-langdetect/src/test/resources/log4j.properties
rename to tika-langdetect/tika-langdetect-mitll-text/src/test/resources/log4j.properties
diff --git a/tika-langdetect/tika-langdetect-optimaize/pom.xml b/tika-langdetect/tika-langdetect-optimaize/pom.xml
new file mode 100644
index 0000000..3899736
--- /dev/null
+++ b/tika-langdetect/tika-langdetect-optimaize/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-langdetect</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-langdetect-optimaize</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.optimaize.languagedetector</groupId>
+ <artifactId>language-detector</artifactId>
+ <version>${optimaize.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- exclude and then add back in to avoid
+ conflicts with edu.ucar:cdm in tika-parsers -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-langdetect-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/tika-langdetect/src/main/java/org/apache/tika/langdetect/OptimaizeLangDetector.java b/tika-langdetect/tika-langdetect-optimaize/src/main/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetector.java
similarity index 99%
rename from tika-langdetect/src/main/java/org/apache/tika/langdetect/OptimaizeLangDetector.java
rename to tika-langdetect/tika-langdetect-optimaize/src/main/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetector.java
index 585b748..81d46f7 100644
--- a/tika-langdetect/src/main/java/org/apache/tika/langdetect/OptimaizeLangDetector.java
+++ b/tika-langdetect/tika-langdetect-optimaize/src/main/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.optimaize;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector b/tika-langdetect/tika-langdetect-optimaize/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
similarity index 93%
rename from tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
rename to tika-langdetect/tika-langdetect-optimaize/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
index 79fc24e..e439510 100644
--- a/tika-langdetect/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
+++ b/tika-langdetect/tika-langdetect-optimaize/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.langdetect.OptimaizeLangDetector
+org.apache.tika.langdetect.optimaize.OptimaizeLangDetector
\ No newline at end of file
diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java b/tika-langdetect/tika-langdetect-optimaize/src/test/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetectorTest.java
similarity index 98%
rename from tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java
rename to tika-langdetect/tika-langdetect-optimaize/src/test/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetectorTest.java
index 59ed89d..cc92ee0 100644
--- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java
+++ b/tika-langdetect/tika-langdetect-optimaize/src/test/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetectorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.langdetect;
+package org.apache.tika.langdetect.optimaize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,6 +29,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.tika.io.IOUtils;
+import org.apache.tika.langdetect.LanguageDetectorTest;
import org.apache.tika.language.detect.LanguageConfidence;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-codes.txt b/tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/language-codes.txt
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/language-codes.txt
rename to tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/language-codes.txt
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/udhr-known.txt b/tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/udhr-known.txt
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/udhr-known.txt
rename to tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/udhr-known.txt
diff --git a/tika-langdetect/src/test/resources/org/apache/tika/langdetect/udhr-unknown.txt b/tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/udhr-unknown.txt
similarity index 100%
rename from tika-langdetect/src/test/resources/org/apache/tika/langdetect/udhr-unknown.txt
rename to tika-langdetect/tika-langdetect-optimaize/src/test/resources/org/apache/tika/langdetect/optimaize/udhr-unknown.txt
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 59404d4..dca3ed1 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-langdetect</artifactId>
+ <artifactId>tika-langdetect-optimaize</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
index 7269ebb..537b1e6 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
@@ -29,7 +29,8 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import org.apache.commons.io.IOUtils;
-import org.apache.tika.langdetect.OptimaizeLangDetector;
+//TODO: don't hardcode optimaize
+import org.apache.tika.langdetect.optimaize.OptimaizeLangDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
index 0417077..bc10e59 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
@@ -36,7 +36,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.tika.config.LoadErrorHandler;
import org.apache.tika.config.ServiceLoader;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.langdetect.OptimaizeLangDetector;
+import org.apache.tika.langdetect.optimaize.OptimaizeLangDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.apache.tika.language.translate.Translator;
import org.apache.tika.server.ServerStatus;
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 7cc8bf5..bcce5cd 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-langdetect</artifactId>
+ <artifactId>tika-langdetect-optimaize</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -62,6 +62,30 @@
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
</dependency>
+ <!-- for java 10
+ See TIKA-2778 for why we need to do this now.
+ May the gods of dependency management fix this in the future.
+ -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/AbstractTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/AbstractTranslator.java
index 2a331bb..da250cf 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/AbstractTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/AbstractTranslator.java
@@ -18,7 +18,7 @@ package org.apache.tika.language.translate;
import java.io.IOException;
-import org.apache.tika.langdetect.OptimaizeLangDetector;
+import org.apache.tika.langdetect.optimaize.OptimaizeLangDetector;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
[tika] 01/02: TIKA-3179 -- fix parent in tika-parsers module
Posted by ta...@apache.org.
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 aad96595ffb7accca2779021d38021b996a371d4
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 1 13:46:36 2020 -0400
TIKA-3179 -- fix parent in tika-parsers module
---
tika-parsers/pom.xml | 15 +--------------
tika-parsers/tika-parser-apple-module/pom.xml | 2 +-
tika-parsers/tika-parser-audiovideo-module/pom.xml | 2 +-
tika-parsers/tika-parser-cad-module/pom.xml | 2 +-
tika-parsers/tika-parser-code-module/pom.xml | 2 +-
tika-parsers/tika-parser-crypto-module/pom.xml | 2 +-
tika-parsers/tika-parser-digest-commons/pom.xml | 2 +-
tika-parsers/tika-parser-font-module/pom.xml | 2 +-
tika-parsers/tika-parser-html-module/pom.xml | 2 +-
tika-parsers/tika-parser-image-module/pom.xml | 2 +-
tika-parsers/tika-parser-integration-tests/pom.xml | 2 +-
tika-parsers/tika-parser-jdbc-commons/pom.xml | 2 +-
tika-parsers/tika-parser-mail-commons/pom.xml | 2 +-
tika-parsers/tika-parser-mail-module/pom.xml | 2 +-
tika-parsers/tika-parser-microsoft-module/pom.xml | 2 +-
tika-parsers/tika-parser-miscoffice-module/pom.xml | 2 +-
tika-parsers/tika-parser-news-module/pom.xml | 2 +-
tika-parsers/tika-parser-ocr-module/pom.xml | 2 +-
tika-parsers/tika-parser-pdf-module/pom.xml | 2 +-
tika-parsers/tika-parser-pkg-module/pom.xml | 2 +-
tika-parsers/tika-parser-text-module/pom.xml | 2 +-
tika-parsers/tika-parser-xml-module/pom.xml | 2 +-
tika-parsers/tika-parser-xmp-commons/pom.xml | 2 +-
tika-parsers/tika-parser-zip-commons/pom.xml | 2 +-
24 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index a2cfcb1..53edd5c 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -29,24 +29,11 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<packaging>pom</packaging>
<name>Apache Tika parser modules</name>
<url>http://tika.apache.org/</url>
- <properties>
- <jempbox.version>1.8.16</jempbox.version>
- <mime4j.version>0.8.3</mime4j.version>
- <pdfbox.version>2.0.21</pdfbox.version>
- <jempbox.version>1.8.16</jempbox.version>
- <tagsoup.version>1.2.1</tagsoup.version>
- <commons.logging.version>1.2</commons.logging.version>
- <commons.collections4.version>4.4</commons.collections4.version>
- <commons.csv.version>1.8</commons.csv.version>
- <!-- used by POI, PDFBox and Jackcess ...try to sync -->
- <bouncycastle.version>1.65</bouncycastle.version>
- <parso.version>2.0.11</parso.version>
- </properties>
<dependencies>
<dependency>
diff --git a/tika-parsers/tika-parser-apple-module/pom.xml b/tika-parsers/tika-parser-apple-module/pom.xml
index d09aeee..2b5e594 100644
--- a/tika-parsers/tika-parser-apple-module/pom.xml
+++ b/tika-parsers/tika-parser-apple-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-audiovideo-module/pom.xml b/tika-parsers/tika-parser-audiovideo-module/pom.xml
index 8c53e82..507b11f 100644
--- a/tika-parsers/tika-parser-audiovideo-module/pom.xml
+++ b/tika-parsers/tika-parser-audiovideo-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-cad-module/pom.xml b/tika-parsers/tika-parser-cad-module/pom.xml
index f0ae940..bf00168 100644
--- a/tika-parsers/tika-parser-cad-module/pom.xml
+++ b/tika-parsers/tika-parser-cad-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-code-module/pom.xml b/tika-parsers/tika-parser-code-module/pom.xml
index efe9c7d..69621fc 100644
--- a/tika-parsers/tika-parser-code-module/pom.xml
+++ b/tika-parsers/tika-parser-code-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-crypto-module/pom.xml b/tika-parsers/tika-parser-crypto-module/pom.xml
index 0aae2a4..7998382 100644
--- a/tika-parsers/tika-parser-crypto-module/pom.xml
+++ b/tika-parsers/tika-parser-crypto-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parser-digest-commons/pom.xml
index eebebc4..32ed81f 100644
--- a/tika-parsers/tika-parser-digest-commons/pom.xml
+++ b/tika-parsers/tika-parser-digest-commons/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-font-module/pom.xml b/tika-parsers/tika-parser-font-module/pom.xml
index fe6891f..e8313fa 100644
--- a/tika-parsers/tika-parser-font-module/pom.xml
+++ b/tika-parsers/tika-parser-font-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-html-module/pom.xml b/tika-parsers/tika-parser-html-module/pom.xml
index d279612..efbabce 100644
--- a/tika-parsers/tika-parser-html-module/pom.xml
+++ b/tika-parsers/tika-parser-html-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-image-module/pom.xml b/tika-parsers/tika-parser-image-module/pom.xml
index 10d81a4..1ae0d4b 100644
--- a/tika-parsers/tika-parser-image-module/pom.xml
+++ b/tika-parsers/tika-parser-image-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-integration-tests/pom.xml b/tika-parsers/tika-parser-integration-tests/pom.xml
index 6cba03c..1394283 100644
--- a/tika-parsers/tika-parser-integration-tests/pom.xml
+++ b/tika-parsers/tika-parser-integration-tests/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-jdbc-commons/pom.xml b/tika-parsers/tika-parser-jdbc-commons/pom.xml
index 02e321a..4862868 100644
--- a/tika-parsers/tika-parser-jdbc-commons/pom.xml
+++ b/tika-parsers/tika-parser-jdbc-commons/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-mail-commons/pom.xml b/tika-parsers/tika-parser-mail-commons/pom.xml
index 03e8313..544cd4b 100644
--- a/tika-parsers/tika-parser-mail-commons/pom.xml
+++ b/tika-parsers/tika-parser-mail-commons/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-mail-module/pom.xml b/tika-parsers/tika-parser-mail-module/pom.xml
index 5843745..b36bba4 100644
--- a/tika-parsers/tika-parser-mail-module/pom.xml
+++ b/tika-parsers/tika-parser-mail-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parser-microsoft-module/pom.xml
index 8a32527..6a66126 100644
--- a/tika-parsers/tika-parser-microsoft-module/pom.xml
+++ b/tika-parsers/tika-parser-microsoft-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-miscoffice-module/pom.xml b/tika-parsers/tika-parser-miscoffice-module/pom.xml
index fac84f4..9cfee81 100644
--- a/tika-parsers/tika-parser-miscoffice-module/pom.xml
+++ b/tika-parsers/tika-parser-miscoffice-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-news-module/pom.xml b/tika-parsers/tika-parser-news-module/pom.xml
index fdbe901..486a3d1 100644
--- a/tika-parsers/tika-parser-news-module/pom.xml
+++ b/tika-parsers/tika-parser-news-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-ocr-module/pom.xml b/tika-parsers/tika-parser-ocr-module/pom.xml
index ed33bfb..7a9fc09 100644
--- a/tika-parsers/tika-parser-ocr-module/pom.xml
+++ b/tika-parsers/tika-parser-ocr-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parser-pdf-module/pom.xml
index 87e2cf8..f09338d 100644
--- a/tika-parsers/tika-parser-pdf-module/pom.xml
+++ b/tika-parsers/tika-parser-pdf-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-pkg-module/pom.xml b/tika-parsers/tika-parser-pkg-module/pom.xml
index 542119e..3e70223 100644
--- a/tika-parsers/tika-parser-pkg-module/pom.xml
+++ b/tika-parsers/tika-parser-pkg-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-text-module/pom.xml b/tika-parsers/tika-parser-text-module/pom.xml
index 5aa75e7..30b76c8 100644
--- a/tika-parsers/tika-parser-text-module/pom.xml
+++ b/tika-parsers/tika-parser-text-module/pom.xml
@@ -21,7 +21,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-xml-module/pom.xml b/tika-parsers/tika-parser-xml-module/pom.xml
index 1639376..38a393d 100644
--- a/tika-parsers/tika-parser-xml-module/pom.xml
+++ b/tika-parsers/tika-parser-xml-module/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-xmp-commons/pom.xml b/tika-parsers/tika-parser-xmp-commons/pom.xml
index 9021874..17e885d 100644
--- a/tika-parsers/tika-parser-xmp-commons/pom.xml
+++ b/tika-parsers/tika-parser-xmp-commons/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/tika-parser-zip-commons/pom.xml b/tika-parsers/tika-parser-zip-commons/pom.xml
index edd861c..c82c9b7 100644
--- a/tika-parsers/tika-parser-zip-commons/pom.xml
+++ b/tika-parsers/tika-parser-zip-commons/pom.xml
@@ -3,7 +3,7 @@
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-parser-modules</artifactId>
+ <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>