diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-04 19:49:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 19:49:27 +0200 |
| commit | 8586e0137c6ec1dc0a9d10b0fcbc5578e122c504 (patch) | |
| tree | 0d356ae9de3ec1642e6fce735631d60d19a4c787 /dependency-versions/pom.xml | |
| parent | 5b60dfc46e42d7c78f68e74f71b76ae8ad41e14d (diff) | |
| parent | bedbd44069d0464bbd23a367e144cb32fad4573a (diff) | |
Merge branch 'master' into bjorncs/move-jersey-out
Diffstat (limited to 'dependency-versions/pom.xml')
| -rw-r--r-- | dependency-versions/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 431eed5321a..fd93f11b2dd 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -36,9 +36,10 @@ <commons-logging.vespa.version>1.2</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> <error-prone-annotations.vespa.version>2.21.1</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.2-jre</guava.vespa.version> - <guice.vespa.version>4.2.3</guice.vespa.version> + <guice.vespa.version>6.0.0</guice.vespa.version> <jackson2.vespa.version>2.15.2</jackson2.vespa.version> <jackson-databind.vespa.version>2.15.2</jackson-databind.vespa.version> + <jakarta.inject.vespa.version>2.0.1</jakarta.inject.vespa.version> <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> @@ -46,7 +47,6 @@ <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> - <xml-apis.vespa.version>1.4.01</xml-apis.vespa.version> <!-- END Dependencies available from the Jdisc container --> @@ -89,7 +89,7 @@ <dropwizard.metrics.vespa.version>4.2.19</dropwizard.metrics.vespa.version> <eclipse-collections.vespa.version>11.1.0</eclipse-collections.vespa.version> <felix.vespa.version>7.0.5</felix.vespa.version> - <felix.log.vespa.version>1.0.1</felix.log.vespa.version> + <felix.log.vespa.version>1.3.0</felix.log.vespa.version> <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava --> <hamcrest.vespa.version>2.2</hamcrest.vespa.version> <hdrhistogram.vespa.version>2.1.12</hdrhistogram.vespa.version> |