diff options
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
-rw-r--r-- | config-model-fat/pom.xml | 1 | ||||
-rw-r--r-- | container-core/pom.xml | 25 | ||||
-rw-r--r-- | container-dev/pom.xml | 2 | ||||
-rw-r--r-- | fat-model-dependencies/pom.xml | 7 | ||||
-rw-r--r-- | linguistics-components/pom.xml | 6 | ||||
-rw-r--r-- | linguistics/pom.xml | 4 | ||||
-rw-r--r-- | opennlp-linguistics/abi-spec.json | 1 | ||||
-rw-r--r-- | opennlp-linguistics/pom.xml | 83 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java (renamed from linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/main/resources/models/langdetect-183.bin (renamed from linguistics/src/main/resources/models/langdetect-183.bin) | bin | 10568240 -> 10568240 bytes | |||
-rw-r--r-- | opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java (renamed from linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java (renamed from linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java) | 0 | ||||
-rw-r--r-- | opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java (renamed from linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java) | 0 | ||||
-rw-r--r-- | pom.xml | 1 |
23 files changed, 125 insertions, 6 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 5e439a870f6..6b63182627b 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -131,6 +131,7 @@ <include>com.yahoo.vespa:jdisc_core:*:provided</include> <include>com.yahoo.vespa:jrt:*:provided</include> <include>com.yahoo.vespa:linguistics:*:provided</include> + <include>com.yahoo.vespa:opennlp-linguistics:*:provided</include> <include>com.yahoo.vespa:messagebus:*:provided</include> <include>com.yahoo.vespa:model-evaluation:*:provided</include> <include>com.yahoo.vespa:predicate-search-core:*:provided</include> diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 9fdca334876..43d4d80bb9d 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -219,7 +219,6 @@ <i>org.apache.commons:commons-exec:*:*</i> <i>org.apache.commons:commons-math3:*:*</i> <i>org.apache.felix:org.apache.felix.framework:*:*</i> - <i>org.apache.opennlp:opennlp-tools:*:*</i> <i>org.bouncycastle:bcpkix-jdk18on:*:*</i> <i>org.bouncycastle:bcprov-jdk18on:*:*</i> <i>org.bouncycastle:bcutil-jdk18on:*:*</i> diff --git a/container-core/pom.xml b/container-core/pom.xml index ed4b05495e3..bdcaab3900b 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -84,6 +84,31 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>opennlp-linguistics</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <!-- Pulled in by language-detector in scope compile --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <!-- Pulled in by language-detector in scope compile --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>messagebus</artifactId> <version>${project.version}</version> <exclusions> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 85c6371d59c..1e45771d988 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -255,7 +255,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>linguistics</artifactId> + <artifactId>opennlp-linguistics</artifactId> <version>${project.version}</version> <exclusions> <exclusion> diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 9801098d5b6..5bb4b806ffb 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -118,6 +118,13 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-core</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <!-- OPTIMIZATION: large (10 MB) and not needed for config generation --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>opennlp-linguistics</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index eae50c778b5..ad4cbd6ce22 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -43,6 +43,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>opennlp-linguistics</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>config-bundle</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 87ecc35ba2c..bfbf1beeaea 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -58,10 +58,6 @@ <scope>provided</scope> <classifier>no_aop</classifier> </dependency> - <dependency> - <groupId>org.apache.opennlp</groupId> - <artifactId>opennlp-tools</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/opennlp-linguistics/abi-spec.json b/opennlp-linguistics/abi-spec.json new file mode 100644 index 00000000000..6f31cf5a2e6 --- /dev/null +++ b/opennlp-linguistics/abi-spec.json @@ -0,0 +1 @@ +{ }
\ No newline at end of file diff --git a/opennlp-linguistics/pom.xml b/opennlp-linguistics/pom.xml new file mode 100644 index 00000000000..40f1e95f4f4 --- /dev/null +++ b/opennlp-linguistics/pom.xml @@ -0,0 +1,83 @@ +<?xml version="1.0"?> +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<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>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <version>8-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <artifactId>opennlp-linguistics</artifactId> + <packaging>container-plugin</packaging> + <version>8-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>component</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-bundle</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>configdefinitions</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>linguistics</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <scope>provided</scope> + <classifier>no_aop</classifier> + </dependency> + <dependency> + <groupId>org.apache.opennlp</groupId> + <artifactId>opennlp-tools</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>abi-check-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java index 27c23d8d3e6..27c23d8d3e6 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java index 0cf4634c6c3..0cf4634c6c3 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/LanguageDetectorFactory.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java index d7a7d3a4744..d7a7d3a4744 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java index 1d96d8a0cdf..1d96d8a0cdf 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java index 8080dc92729..8080dc92729 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java index 883319e2f8b..883319e2f8b 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizer.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java index df8f3fad520..df8f3fad520 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/VespaCharSequenceNormalizer.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java index d7e3f88ae8d..d7e3f88ae8d 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/WordCharDetector.java diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java index 9606578b3ac..9606578b3ac 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/package-info.java diff --git a/linguistics/src/main/resources/models/langdetect-183.bin b/opennlp-linguistics/src/main/resources/models/langdetect-183.bin Binary files differindex c3cde217050..c3cde217050 100644 --- a/linguistics/src/main/resources/models/langdetect-183.bin +++ b/opennlp-linguistics/src/main/resources/models/langdetect-183.bin diff --git a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java index 746ed10da1c..746ed10da1c 100644 --- a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java +++ b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpDetectorTestCase.java diff --git a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java index cd2a0f73895..cd2a0f73895 100644 --- a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java +++ b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java diff --git a/linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java index a8c637bc6ec..a8c637bc6ec 100644 --- a/linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java +++ b/opennlp-linguistics/src/test/java/com/yahoo/language/opennlp/UrlCharSequenceNormalizerTest.java @@ -91,6 +91,7 @@ <module>jdisc_core_test</module> <module>jrt</module> <module>linguistics</module> + <module>opennlp-linguistics</module> <module>linguistics-components</module> <module>logd</module> <module>logserver</module> |