diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 17:53:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 17:53:58 +0200 |
| commit | 17b93b6ef0d7225723394def1e832ef37a517231 (patch) | |
| tree | bc182ad50f4274917f583cc7bfcbd5983910897c | |
| parent | da3ed91ef813e5f2bc43ac966dacc027126a8e61 (diff) | |
| parent | be528a8e2cd8f0677762b02d778e3b71659fae3c (diff) | |
Merge pull request #28329 from vespa-engine/renovate/major-jaxb.runtime.vespa.version
Update dependency org.glassfish.jaxb:jaxb-runtime to v4
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 4ba0777766e..cdfbff75911 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -95,7 +95,7 @@ <icu4j.vespa.version>73.2</icu4j.vespa.version> <java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version> <java-jwt.vespa.version>4.4.0</java-jwt.vespa.version> - <jaxb.runtime.vespa.version>2.3.8</jaxb.runtime.vespa.version> + <jaxb.runtime.vespa.version>4.0.3</jaxb.runtime.vespa.version> <jersey.vespa.version>2.40</jersey.vespa.version> <jetty.vespa.version>11.0.16</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index fc2efbdb317..27b9ac62a54 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -42,7 +42,7 @@ com.google.protobuf:protobuf-java:3.24.2 com.ibm.icu:icu4j:73.2 com.microsoft.onnxruntime:onnxruntime:1.15.1 com.sun.activation:javax.activation:1.2.0 -com.sun.istack:istack-commons-runtime:3.0.12 +com.sun.istack:istack-commons-runtime:4.1.2 com.sun.xml.bind:jaxb-core:2.3.0.1 com.sun.xml.bind:jaxb-impl:2.3.0 com.thaiopensource:jing:20091111 @@ -146,6 +146,7 @@ org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:1.26 org.codehaus.plexus:plexus-io:3.4.1 org.codehaus.plexus:plexus-utils:3.5.1 +org.eclipse.angus:angus-activation:2.0.1 org.eclipse.collections:eclipse-collections:11.1.0 org.eclipse.collections:eclipse-collections-api:11.1.0 org.eclipse.jetty:jetty-alpn-client:11.0.16 @@ -171,8 +172,9 @@ org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 org.fusesource.jansi:jansi:1.18 org.glassfish.hk2:osgi-resource-locator:1.0.3 org.glassfish.hk2.external:jakarta.inject:2.6.1 -org.glassfish.jaxb:jaxb-runtime:2.3.8 -org.glassfish.jaxb:txw2:2.3.8 +org.glassfish.jaxb:jaxb-core:4.0.3 +org.glassfish.jaxb:jaxb-runtime:4.0.3 +org.glassfish.jaxb:txw2:4.0.3 org.glassfish.jersey.core:jersey-client:2.40 org.glassfish.jersey.core:jersey-common:2.40 org.glassfish.jersey.core:jersey-server:2.40 |