diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 2cc573bc096..eff4e4125e9 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -52,7 +52,7 @@ <include>com.google.guava:guava:${guava.vespa.version}:provided</include> <include>com.google.errorprone:error_prone_annotations:[2.21.1, 3):provided</include> <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> - <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> + <include>com.google.j2objc:j2objc-annotations:[3.0.0, 4):provided</include> <include>com.google.inject:guice:jar:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 4f624d0a870..a06365abbeb 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -71,7 +71,7 @@ <include>com.google.guava:guava:${guava.vespa.version}:provided</include> <include>com.google.errorprone:error_prone_annotations:[2.21.1, 3):provided</include> <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> - <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> + <include>com.google.j2objc:j2objc-annotations:[3.0.0, 4):provided</include> <include>com.google.inject:guice:jar:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 0f85dbd9812..b2a1d1a0641 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -36,6 +36,7 @@ <error-prone-annotations.vespa.version>2.26.1</error-prone-annotations.vespa.version> <guava.vespa.version>33.1.0-jre</guava.vespa.version> <guice.vespa.version>6.0.0</guice.vespa.version> + <j2objc-annotations.vespa.version>3.0.0</j2objc-annotations.vespa.version> <jackson2.vespa.version>2.16.2</jackson2.vespa.version> <jackson-databind.vespa.version>${jackson2.vespa.version}</jackson-databind.vespa.version> <jakarta.inject.vespa.version>2.0.1</jakarta.inject.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index c63b1e0863f..e3414b48ee6 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -9,7 +9,7 @@ com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.ve com.google.guava:failureaccess:${failureaccess.vespa.version} com.google.guava:guava:${guava.vespa.version} com.google.inject:guice:${guice.vespa.version} -com.google.j2objc:j2objc-annotations:2.8 +com.google.j2objc:j2objc-annotations:${j2objc-annotations.vespa.version} commons-codec:commons-codec:${commons-codec.vespa.version} commons-io:commons-io:${commons-io.vespa.version} jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version} diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 8408399d60c..9ffde513481 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -25,7 +25,7 @@ com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.ve com.google.guava:failureaccess:${failureaccess.vespa.version} com.google.guava:guava:${guava.vespa.version} com.google.inject:guice:${guice.vespa.version} -com.google.j2objc:j2objc-annotations:2.8 +com.google.j2objc:j2objc-annotations:${j2objc-annotations.vespa.version} com.google.jimfs:jimfs:${jimfs.vespa.version} com.google.protobuf:protobuf-java:${protobuf.vespa.version} com.ibm.icu:icu4j:${icu4j.vespa.version} |