diff options
-rw-r--r-- | application/pom.xml | 17 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-apache-http-client-bundle/pom.xml | 8 | ||||
-rw-r--r-- | parent/pom.xml | 7 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 |
5 files changed, 21 insertions, 17 deletions
diff --git a/application/pom.xml b/application/pom.xml index d404cb9bbf5..3c5d233edd0 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -91,24 +91,15 @@ <artifactId>xercesImpl</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <scope>test</scope> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-apache-http-client-bundle</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> </dependency> - <dependency> - <groupId>org.apache.httpcomponents.client5</groupId> - <artifactId>httpclient5</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</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 6f17520dbb5..6e9ae6463fb 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -25,7 +25,7 @@ <commons-codec.version>1.15</commons-codec.version> <felix.version>7.0.1</felix.version> <httpclient5.version>5.2.1</httpclient5.version> - <httpcore5.version>5.2</httpcore5.version> + <httpcore5.version>5.2.1</httpcore5.version> <httpclient.version>4.5.14</httpclient.version> <httpcore.version>4.4.16</httpcore.version> <junit5.version>5.8.1</junit5.version> <!-- TODO: in parent this is named 'junit.version' --> diff --git a/container-apache-http-client-bundle/pom.xml b/container-apache-http-client-bundle/pom.xml index 69ee2993798..979a7c21699 100644 --- a/container-apache-http-client-bundle/pom.xml +++ b/container-apache-http-client-bundle/pom.xml @@ -34,6 +34,14 @@ <artifactId>commons-codec</artifactId> </dependency> <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5-h2</artifactId> + </dependency> + <dependency> <groupId>org.apache.httpcomponents.client5</groupId> <artifactId>httpclient5</artifactId> <exclusions> diff --git a/parent/pom.xml b/parent/pom.xml index c0f2efd657f..c9b406a7ace 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -773,6 +773,11 @@ <version>${apache.httpcore5.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5-h2</artifactId> + <version>${apache.httpcore5.version}</version> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> <version>${apache.httpclient.version}</version> @@ -1098,7 +1103,7 @@ <apache.httpclient.version>4.5.14</apache.httpclient.version> <apache.httpcore.version>4.4.16</apache.httpcore.version> <apache.httpclient5.version>5.2.1</apache.httpclient5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> - <apache.httpcore5.version>5.2</apache.httpcore5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> + <apache.httpcore5.version>5.2.1</apache.httpcore5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> <asm.version>9.3</asm.version> <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories --> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 861f124a937..461e3f0aef5 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -98,8 +98,8 @@ org.apache.httpcomponents:httpclient:4.5.14 org.apache.httpcomponents:httpcore:4.4.16 org.apache.httpcomponents:httpmime:4.5.14 org.apache.httpcomponents.client5:httpclient5:5.2.1 -org.apache.httpcomponents.core5:httpcore5:5.2 -org.apache.httpcomponents.core5:httpcore5-h2:5.2 +org.apache.httpcomponents.core5:httpcore5:5.2.1 +org.apache.httpcomponents.core5:httpcore5-h2:5.2.1 org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.6 org.apache.maven:maven-artifact-manager:2.2.1 |