diff options
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 4 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
-rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 4 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 85805da76a5..64e6459bd70 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -38,7 +38,7 @@ <!-- ALL BELOW MUST BE KEPT IN SYNC WITH container-dependency-versions pom Copied here because cloud-tenant-base does not have a parent. --> <aopalliance.version>1.0</aopalliance.version> - <guava.version>27.1-jre</guava.version> + <guava.version>32.1.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.15.2</jackson2.version> <jackson-databind.version>2.15.2</jackson-databind.version> @@ -89,7 +89,7 @@ <include>com.google.guava:guava:${guava.version}:provided</include> <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include> <include>com.google.guava:failureaccess:1.0.1:provided</include> - <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> + <include>com.google.j2objc:j2objc-annotations:2.8:provided</include> <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include> <include>com.sun.activation:javax.activation:1.2.0:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 5b9f351b448..c1e51f63dbf 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -71,7 +71,7 @@ <include>com.google.guava:guava:${guava.version}:provided</include> <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include> <include>com.google.guava:failureaccess:1.0.1:provided</include> - <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> + <include>com.google.j2objc:j2objc-annotations:2.8:provided</include> <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include> <include>com.sun.activation:javax.activation:1.2.0:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 92d06a5c1bd..0e210a54d87 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -241,7 +241,7 @@ <properties> <aopalliance.version>1.0</aopalliance.version> <error-prone-annotations.version>2.18.0</error-prone-annotations.version> - <guava.version>27.1-jre</guava.version> + <guava.version>32.1.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.15.2</jackson2.version> <jackson-databind.version>2.15.2</jackson-databind.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index d504357b07c..530971e25f9 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -8,9 +8,9 @@ com.fasterxml.jackson.core:jackson-core:2.15.2 com.fasterxml.jackson.core:jackson-databind:2.15.2 com.google.errorprone:error_prone_annotations:2.18.0 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:32.1.1-jre com.google.inject:guice:4.2.3:no_aop -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:2.8 commons-io:commons-io:2.11.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index a66aec154d9..91da0490ee1 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -27,9 +27,9 @@ com.github.spotbugs:spotbugs-annotations:3.1.9 com.google.code.findbugs:jsr305:3.0.2 com.google.errorprone:error_prone_annotations:2.18.0 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:32.1.1-jre com.google.inject:guice:4.2.3:no_aop -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:2.8 com.google.protobuf:protobuf-java:3.21.7 com.ibm.icu:icu4j:70.1 com.intellij:annotations:9.0.4 @@ -222,7 +222,7 @@ xml-apis:xml-apis:1.4.01 # Contains dependencies that are used exclusively in 'test' scope com.github.luben:zstd-jni:1.5.2-1 com.github.tomakehurst:wiremock-jre8-standalone:2.35.0 -com.google.guava:guava-testlib:27.1-jre +com.google.guava:guava-testlib:32.1.1-jre com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.2 junit:junit:4.13.2 |