diff options
| -rw-r--r-- | application/pom.xml | 10 | ||||
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-search-and-docproc/pom.xml | 10 | ||||
| -rw-r--r-- | fat-model-dependencies/pom.xml | 14 |
5 files changed, 36 insertions, 2 deletions
diff --git a/application/pom.xml b/application/pom.xml index f5704541308..7c34cd966eb 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -43,6 +43,16 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>model-integration</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 9d011786753..6d9cefe8b8a 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -97,6 +97,7 @@ <include>com.yahoo.vespa:messagebus:*:provided</include> <include>com.yahoo.vespa:metrics:*:provided</include> <include>com.yahoo.vespa:model-evaluation:*:provided</include> + <include>com.yahoo.vespa:model-integration:*:provided</include> <include>com.yahoo.vespa:opennlp-linguistics:*:provided</include> <include>com.yahoo.vespa:predicate-search-core:*:provided</include> <include>com.yahoo.vespa:provided-dependencies:*:provided</include> @@ -122,7 +123,6 @@ <include>com.yahoo.vespa:indexinglanguage:*:test</include> <include>com.yahoo.vespa:logd:*:test</include> <include>com.yahoo.vespa:metrics-proxy:*:test</include> - <include>com.yahoo.vespa:model-integration:*:test</include> <include>com.yahoo.vespa:searchsummary:*:test</include> <include>com.yahoo.vespa:standalone-container:*:test</include> <include>com.yahoo.vespa:storage:*:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index cbe8b4b6d24..6451e32941c 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -116,6 +116,7 @@ <include>com.yahoo.vespa:messagebus:*:provided</include> <include>com.yahoo.vespa:metrics:*:provided</include> <include>com.yahoo.vespa:model-evaluation:*:provided</include> + <include>com.yahoo.vespa:model-integration:*:provided</include> <include>com.yahoo.vespa:opennlp-linguistics:*:provided</include> <include>com.yahoo.vespa:predicate-search-core:*:provided</include> <include>com.yahoo.vespa:provided-dependencies:*:provided</include> @@ -139,7 +140,6 @@ <include>com.yahoo.vespa:indexinglanguage:*:test</include> <include>com.yahoo.vespa:logd:*:test</include> <include>com.yahoo.vespa:metrics-proxy:*:test</include> - <include>com.yahoo.vespa:model-integration:*:test</include> <include>com.yahoo.vespa:searchsummary:*:test</include> <include>com.yahoo.vespa:standalone-container:*:test</include> <include>com.yahoo.vespa:storage:*:test</include> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 280b5d663b3..ee74b86dbec 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -101,6 +101,16 @@ <artifactId>model-integration</artifactId> <version>${project.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> + </exclusions> </dependency> <!-- PROVIDED scope --> diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 069b53a0dcd..c4ecd3d2e1c 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -96,6 +96,14 @@ <groupId>com.theokanning.openai-gpt3-java</groupId> <artifactId>service</artifactId> </exclusion> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -230,6 +238,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-search-and-docproc</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>model-integration</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |