diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-03-19 11:33:10 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-03-23 22:58:13 +0100 |
| commit | 1c33f2616f3e40e624d83efc9b2ffa19741394d2 (patch) | |
| tree | f59162bb0855b56abdc86ad25558396aded1b9a0 | |
| parent | 91af6a9faba14093880ff83a927f2da6dad9cc9b (diff) | |
Remove all dependencies to jdisc_http_service
| -rw-r--r-- | application/pom.xml | 2 | ||||
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | config-model/pom.xml | 6 | ||||
| -rw-r--r-- | container-dev/pom.xml | 11 | ||||
| -rw-r--r-- | container-search-and-docproc/pom.xml | 6 | ||||
| -rw-r--r-- | container-search-gui/pom.xml | 6 | ||||
| -rw-r--r-- | controller-server/pom.xml | 7 | ||||
| -rw-r--r-- | fat-model-dependencies/pom.xml | 5 | ||||
| -rw-r--r-- | jdisc-cloud-aws/pom.xml | 6 | ||||
| -rw-r--r-- | metrics-proxy/pom.xml | 6 | ||||
| -rw-r--r-- | model-evaluation/pom.xml | 6 | ||||
| -rwxr-xr-x | provided-dependencies/pom.xml | 5 | ||||
| -rw-r--r-- | vespaclient-java/pom.xml | 5 |
13 files changed, 1 insertions, 71 deletions
diff --git a/application/pom.xml b/application/pom.xml index 96250acb5a9..1e14610af69 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -60,7 +60,7 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <!-- Because these are provided in jdisc_http_service and just preinstalled: --> + <!-- Because these are provided in container-core and just preinstalled: --> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_jetty</artifactId> diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index d821501bd2f..75c837cc593 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -167,7 +167,6 @@ <include>com.yahoo.vespa:hosted-zone-api:*:jar:provided</include> <include>com.yahoo.vespa:http-utils:*:jar:provided</include> <include>com.yahoo.vespa:jdisc_core:*:jar:provided</include> - <include>com.yahoo.vespa:jdisc_http_service:*:jar:provided</include> <include>com.yahoo.vespa:jdisc_messagebus_service:*:jar:provided</include> <include>com.yahoo.vespa:jrt:*:jar:provided</include> <include>com.yahoo.vespa:linguistics:*:jar:provided</include> diff --git a/config-model/pom.xml b/config-model/pom.xml index 8d587c2ec8c..daedc7b4a96 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -290,12 +290,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc-security-filters</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 48f409dfc2c..2dcb03bba58 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -36,17 +36,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>simplemetrics</artifactId> <version>${project.version}</version> <exclusions> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 6e256fc0ef6..27334a8ddf3 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -128,12 +128,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>simplemetrics</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index 64c53a1f453..b1a02a2411a 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -28,12 +28,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_core</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 906cc5c0ee1..0c05f7d70bb 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -42,13 +42,6 @@ <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>zkfacade</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 694f4b4d14f..d3228cf3933 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -207,11 +207,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>${protobuf.version}</version> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 1406a70ece0..9f4572736c8 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -43,12 +43,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index 90d9f093da1..928179a6124 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -79,12 +79,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>jrt</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 3cf3988fc48..00560a22bc7 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -74,12 +74,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_jetty</artifactId> <version>${project.version}</version> <scope>test</scope> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index e73d9902ebe..acad1f9e444 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -23,11 +23,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> </dependency> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 93f1579f58c..566b48ba933 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -51,11 +51,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>predicate-search-core</artifactId> <version>${project.version}</version> </dependency> |