diff options
| -rw-r--r-- | container-dev/pom.xml | 4 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 0120a6c82fe..96aa120d42f 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -33,6 +33,10 @@ <groupId>org.jvnet.hudson</groupId> <artifactId>annotation-indexer</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 4d63810cd4b..14f1aa7e1a6 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -42,7 +42,7 @@ <javax.inject.vespa.version>1</javax.inject.vespa.version> <javax.servlet-api.vespa.version>3.1.0</javax.servlet-api.vespa.version> <javax.ws.rs-api.vespa.version>2.1.1</javax.ws.rs-api.vespa.version> - <jaxb-api.vespa.version>2.3.0</jaxb-api.vespa.version> + <jaxb-api.vespa.version>2.3.1</jaxb-api.vespa.version> <jaxb-core.vespa.version>2.3.0.1</jaxb-core.vespa.version> <jaxb-impl.vespa.version>2.3.0</jaxb-impl.vespa.version> <slf4j.vespa.version>1.7.36</slf4j.vespa.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 64e61410915..c56329f0b95 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -84,11 +84,12 @@ io.prometheus:simpleclient_tracer_otel_agent:0.16.0 jakarta.annotation:jakarta.annotation-api:1.3.5 jakarta.validation:jakarta.validation-api:2.0.2 jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 +javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 javax.servlet:javax.servlet-api:3.1.0 javax.ws.rs:javax.ws.rs-api:2.1.1 -javax.xml.bind:jaxb-api:2.3.0 +javax.xml.bind:jaxb-api:2.3.1 joda-time:joda-time:2.12.5 junit:junit:4.13.2 net.java.dev.jna:jna:5.13.0 |