diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-07 15:46:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 15:46:45 +0100 |
| commit | 38a38c0e7bbd14cb6197477c127089b6dced6e83 (patch) | |
| tree | 487faa921c7eedd8bb251b17a70cc72038ccd07d | |
| parent | 87d4d5e5dd13488b048e6b701e2fe6e6a47bc57b (diff) | |
| parent | 26e12ca1f47c49305c5cfa34566149111cd34862 (diff) | |
Merge pull request #30507 from vespa-engine/renovate/jaxb.runtime.vespa.version
Update dependency org.glassfish.jaxb:jaxb-runtime to v4.0.5
| -rw-r--r-- | dependency-versions/pom.xml | 3 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index c3543e50e99..f6f6646eb76 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -91,6 +91,7 @@ <commons-cli.vespa.version>1.6.0</commons-cli.vespa.version> <curator.vespa.version>5.6.0</curator.vespa.version> <dropwizard.metrics.vespa.version>4.2.25</dropwizard.metrics.vespa.version> <!-- ZK 3.9.1 requires this --> + <eclipse-angus.vespa.version>2.0.2</eclipse-angus.vespa.version> <eclipse-collections.vespa.version>11.1.0</eclipse-collections.vespa.version> <eclipse-sisu.vespa.version>0.9.0.M2</eclipse-sisu.vespa.version> <failureaccess.vespa.version>1.0.2</failureaccess.vespa.version> @@ -104,7 +105,7 @@ <java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version> <java-jwt.vespa.version>4.4.0</java-jwt.vespa.version> <javax.annotation.vespa.version>1.2</javax.annotation.vespa.version> - <jaxb.runtime.vespa.version>4.0.4</jaxb.runtime.vespa.version> + <jaxb.runtime.vespa.version>4.0.5</jaxb.runtime.vespa.version> <jetty.vespa.version>11.0.20</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> <jimfs.vespa.version>1.3.0</jimfs.vespa.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 04de64414eb..8408399d60c 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -138,7 +138,7 @@ org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version} org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version} -org.eclipse.angus:angus-activation:${jakarta.inject.vespa.version} +org.eclipse.angus:angus-activation:${eclipse-angus.vespa.version} org.eclipse.collections:eclipse-collections-api:${eclipse-collections.vespa.version} org.eclipse.collections:eclipse-collections:${eclipse-collections.vespa.version} org.eclipse.jetty.http2:http2-client:${jetty.vespa.version} |