diff options
-rw-r--r-- | athenz-identity-provider-service/pom.xml | 16 | ||||
-rwxr-xr-x | config/pom.xml | 6 | ||||
-rw-r--r-- | configserver-client/pom.xml | 6 | ||||
-rw-r--r-- | configserver/pom.xml | 6 | ||||
-rw-r--r-- | container-core/pom.xml | 26 | ||||
-rw-r--r-- | controller-api/pom.xml | 7 | ||||
-rw-r--r-- | controller-server/pom.xml | 17 | ||||
-rw-r--r-- | docker-api/pom.xml | 24 | ||||
-rw-r--r-- | filedistribution/pom.xml | 10 | ||||
-rw-r--r-- | http-utils/pom.xml | 9 | ||||
-rw-r--r-- | jdisc-cloud-aws/pom.xml | 12 | ||||
-rw-r--r-- | metrics-proxy/pom.xml | 6 | ||||
-rw-r--r-- | node-admin/pom.xml | 16 | ||||
-rw-r--r-- | node-repository/pom.xml | 10 | ||||
-rw-r--r-- | service-monitor/pom.xml | 14 | ||||
-rw-r--r-- | vespa-athenz/pom.xml | 18 | ||||
-rw-r--r-- | vespaclient-container-plugin/pom.xml | 5 |
17 files changed, 102 insertions, 106 deletions
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 3c5f96a1fec..855b3afafaf 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -28,12 +28,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -85,6 +79,16 @@ <scope>provided</scope> </dependency> + <!-- COMPILE --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <!-- TEST --> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/config/pom.xml b/config/pom.xml index 8355587c10b..6e4e26ed0f1 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -15,12 +15,6 @@ <dependencies> <!-- provided scope --> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <scope>provided</scope> diff --git a/configserver-client/pom.xml b/configserver-client/pom.xml index 39005c9ccab..0a29ba003f4 100644 --- a/configserver-client/pom.xml +++ b/configserver-client/pom.xml @@ -30,12 +30,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>security-utils</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/configserver/pom.xml b/configserver/pom.xml index a237d7e00ad..3b7fef085b1 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -142,12 +142,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <!-- To get all necessary test deps. --> <groupId>com.yahoo.vespa</groupId> <artifactId>container-test</artifactId> diff --git a/container-core/pom.xml b/container-core/pom.xml index c7fe2998530..2b87d79daa4 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -140,6 +140,10 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> </dependency> @@ -207,12 +211,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -264,6 +262,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -299,6 +302,17 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 02a7028b8ca..2f01f45edaa 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -27,13 +27,6 @@ <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>serviceview</artifactId> <scope>provided</scope> <version>${project.version}</version> diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 3673e3cb9f9..0c05f7d70bb 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -20,13 +20,6 @@ <!-- provided --> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>controller-api</artifactId> <version>${project.version}</version> @@ -135,6 +128,16 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <dependency> <groupId>com.auth0</groupId> <artifactId>java-jwt</artifactId> <exclusions> diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 7de2d502dc3..749eca97c53 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -31,12 +31,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- Compile --> <dependency> @@ -99,6 +93,24 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <!-- We explicitly specify the version of httpcore to be used by + docker-java so the dependency is declared closer to the root of maven and + more likely be the version that is finally being used. --> + <version>4.4.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <!-- We explicitly specify the version of httpclient to be used by + docker-java so the dependency is declared closer to the root of maven and + more likely be the version that is finally being used. --> + <version>4.5</version> + <scope>compile</scope> + </dependency> <!-- Test --> <dependency> diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index e922d878dd7..8bfa85d8b16 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -20,12 +20,6 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> </dependency> @@ -64,6 +58,10 @@ <artifactId>airline</artifactId> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/http-utils/pom.xml b/http-utils/pom.xml index 2a8ec1b9bb9..1f85658430f 100644 --- a/http-utils/pom.xml +++ b/http-utils/pom.xml @@ -31,21 +31,22 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> - <!-- Apache client artifacts are provided by the jdisc container and are therefore scoped as such --> + + <!-- compile scope --> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents.client5</groupId> <artifactId>httpclient5</artifactId> - <scope>provided</scope> + <scope>compile</scope> <exclusions> <exclusion> <groupId>org.slf4j</groupId> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 0c89872aa46..9f4572736c8 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -24,20 +24,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.amazonaws</groupId> diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index 19b545df616..a7579aeb2ea 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -60,12 +60,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>container-core</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 5d3bdb6207c..52873501744 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -21,12 +21,6 @@ <!-- Provided --> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>docker-api</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -74,6 +68,16 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <scope>compile</scope> diff --git a/node-repository/pom.xml b/node-repository/pom.xml index e7fdc560bc5..30aa76658fd 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -26,12 +26,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>config-provisioning</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -85,6 +79,10 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>http-utils</artifactId> <version>${project.version}</version> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index df28737f352..578fcc83006 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -16,6 +16,14 @@ <description>Service monitor component for hosted vespa.</description> <dependencies> + <!-- compile scope --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5</version> + <!-- This is necessary to get 4.4's HostnameVerifier API of SSLConnectionSocketFactory::new --> + <scope>compile</scope> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>http-utils</artifactId> @@ -26,12 +34,6 @@ <!-- provided scope --> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>config</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index c4dc849a460..90ab2a81e0c 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -25,12 +25,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>security-utils</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -137,6 +131,14 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId> <exclusions> @@ -152,10 +154,6 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 17443b11b6a..834c3d7c988 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -38,6 +38,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespa-http-client</artifactId> <version>${project.version}</version> |