diff options
author | gjoranv <gjoranv@gmail.com> | 2023-06-30 16:27:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-30 16:27:29 +0200 |
commit | 042e03f464f29a8656391b9e48c780b8acd8e795 (patch) | |
tree | 1276570b4354fe8a2482184f51faae3cc056af69 | |
parent | 84547d49cfbaaeb6c36c70aa9dc904e25c1ce88c (diff) | |
parent | 2eb5baf1fc320eaef8fd8984c6ce9287d37e553c (diff) |
Merge pull request #27597 from vespa-engine/dont-provide-http-utils
Do not provide http-utils via container(-dev)
-rw-r--r-- | application/pom.xml | 5 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dev/pom.xml | 8 | ||||
-rw-r--r-- | container/pom.xml | 4 |
5 files changed, 19 insertions, 2 deletions
diff --git a/application/pom.xml b/application/pom.xml index 236bcb6d81a..6e5c6426220 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -36,6 +36,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>http-utils</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>model-integration</artifactId> <version>${project.version}</version> </dependency> diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 4d022f96520..cc4fcecd755 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -130,7 +130,6 @@ <include>com.yahoo.vespa:fileacquirer:*:provided</include> <include>com.yahoo.vespa:fsa:*:provided</include> <include>com.yahoo.vespa:hosted-zone-api:*:provided</include> - <include>com.yahoo.vespa:http-utils:*:provided</include> <include>com.yahoo.vespa:jdisc_core:*:provided</include> <include>com.yahoo.vespa:jrt:*:provided</include> <include>com.yahoo.vespa:linguistics:*:provided</include> @@ -160,6 +159,7 @@ <include>com.yahoo.vespa:container-apache-http-client-bundle:*:test</include> <include>com.yahoo.vespa:container-test:*:test</include> <include>com.yahoo.vespa:hosted-api:*:test</include> + <include>com.yahoo.vespa:http-utils:*:test</include> <include>com.yahoo.vespa:indexinglanguage:*:test</include> <include>com.yahoo.vespa:logd:*:test</include> <include>com.yahoo.vespa:metrics-proxy:*:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index a016c44f829..5b9f351b448 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -112,7 +112,6 @@ <include>com.yahoo.vespa:fileacquirer:*:provided</include> <include>com.yahoo.vespa:fsa:*:provided</include> <include>com.yahoo.vespa:hosted-zone-api:*:provided</include> - <include>com.yahoo.vespa:http-utils:*:provided</include> <include>com.yahoo.vespa:jdisc_core:*:provided</include> <include>com.yahoo.vespa:jrt:*:provided</include> <include>com.yahoo.vespa:linguistics:*:provided</include> @@ -140,6 +139,7 @@ <include>com.yahoo.vespa:config-provisioning:*:test</include> <include>com.yahoo.vespa:container-apache-http-client-bundle:*:test</include> <include>com.yahoo.vespa:container-test:*:test</include> + <include>com.yahoo.vespa:http-utils:*:test</include> <include>com.yahoo.vespa:indexinglanguage:*:test</include> <include>com.yahoo.vespa:logd:*:test</include> <include>com.yahoo.vespa:metrics-proxy:*:test</include> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index bc87185bf25..7d5deba4392 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -99,6 +99,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>http-utils</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> @@ -226,6 +230,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>http-utils</artifactId> + </exclusion> + <exclusion> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </exclusion> diff --git a/container/pom.xml b/container/pom.xml index 29216b6579c..fa81ba333e1 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -23,6 +23,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>http-utils</artifactId> + </exclusion> + <exclusion> <groupId>org.bouncycastle</groupId> <artifactId>*</artifactId> </exclusion> |