diff options
| author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2023-08-10 14:15:55 +0200 |
|---|---|---|
| committer | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2023-08-10 18:50:48 +0200 |
| commit | a5b4d30d5b2b6895447612344d2349f329b40eb4 (patch) | |
| tree | dbd1979b1909dba3168f6f15b56c0b3097939c74 | |
| parent | dd7116842630be3186b51e9d2942f323f49312d7 (diff) | |
Pull in new enough google-http-client with matching transitive dependency versions to our other dependencies.
| -rw-r--r-- | parent/pom.xml | 9 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 38 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 8 |
3 files changed, 49 insertions, 6 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index f2d9f71d553..56c896d57cc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1164,12 +1164,17 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-apache-v2</artifactId> - <version>1.43.2</version> + <version>1.43.3</version> + </dependency> + <dependency> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + <version>1.43.3</version> </dependency> <dependency> <groupId>com.google.auth</groupId> <artifactId>google-auth-library-oauth2-http</artifactId> - <version>1.15.0</version> + <version>1.19.0</version> </dependency> </dependencies> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index e6e4a0a17b7..66b369f00fe 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -278,10 +278,48 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-apache-v2</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.google.auth</groupId> <artifactId>google-auth-library-oauth2-http</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 729e872053b..cb2806b66d8 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -24,16 +24,16 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.2 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 com.github.spotbugs:spotbugs-annotations:3.1.9 -com.google.auth:google-auth-library-credentials:1.15.0 -com.google.auth:google-auth-library-oauth2-http:1.15.0 +com.google.auth:google-auth-library-credentials:1.19.0 +com.google.auth:google-auth-library-oauth2-http:1.19.0 com.google.auto.value:auto-value-annotations:1.10.1 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.10 com.google.errorprone:error_prone_annotations:2.18.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.1-jre -com.google.http-client:google-http-client:1.43.2 -com.google.http-client:google-http-client-apache-v2:1.43.2 +com.google.http-client:google-http-client:1.43.3 +com.google.http-client:google-http-client-apache-v2:1.43.3 com.google.http-client:google-http-client-gson:1.42.3 com.google.inject:guice:4.2.3:no_aop com.google.j2objc:j2objc-annotations:2.8 |