summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-07-19 14:36:22 +0200
committergjoranv <gv@oath.com>2018-07-19 14:36:22 +0200
commit57665ba326d5c2a258680934e845b952abc322ba (patch)
tree7e5dcaafc1ea79ec36c4e22e539d8d1b4247a95b
parent45792413391528f305c54fafccab63e3a2a226d0 (diff)
Explicitly exclude opennlp from indexinglanguage
.. and add it to application for the test classpath.
-rw-r--r--application/pom.xml4
-rw-r--r--container-dev/pom.xml19
2 files changed, 17 insertions, 6 deletions
diff --git a/application/pom.xml b/application/pom.xml
index 0808f2be58e..3361ca85367 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -102,6 +102,10 @@
<artifactId>commons-exec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-tools</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
</dependency>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 11b6c79fee2..6e45f42db32 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -100,10 +100,6 @@
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-tools</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.tensorflow</groupId>
<artifactId>proto</artifactId>
</exclusion>
@@ -193,7 +189,7 @@
<version>${project.version}</version>
</dependency>
- <!-- Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container,
+ <!-- NOTE: Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container,
and hence make them invisible to user projects' build classpath.
Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. -->
<dependency>
@@ -209,6 +205,17 @@
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
+ <artifactId>linguistics</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
<artifactId>predicate-search-core</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -218,6 +225,6 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- DO NOT add dependencies here, but above the NOTE! -->
</dependencies>
</project>