diff options
| author | gjoranv <gjoranv@gmail.com> | 2023-07-25 15:24:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-25 15:24:08 +0200 |
| commit | 83ea8501b3dab10cc3762987c68e18435e6458b1 (patch) | |
| tree | 4a00c5c5d754604ffbccc73b17e6d1f838cbfd79 | |
| parent | 1491d38bc513bdfd0c6fc475cccf46f21dd2b6a9 (diff) | |
| parent | de9325b0b465bebb1b24db00b9e2efdb3ba76123 (diff) | |
Merge pull request #27889 from vespa-engine/one-jaxb-runtime-version
Use v 2.3.2 for jaxb-runtime everywhere
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 7d4931e407d..088356dd685 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -88,6 +88,7 @@ <icu4j.vespa.version>70.1</icu4j.vespa.version> <java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version> <java-jwt.vespa.version>3.10.0</java-jwt.vespa.version> + <jaxb.runtime.vespa.version>2.3.2</jaxb.runtime.vespa.version> <!-- 2.3.3 has a BROKEN manifest --> <jersey.vespa.version>2.25</jersey.vespa.version> <jetty.vespa.version>11.0.15</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 2c140f01ced..e6950f32546 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>2.3.2</version> <!-- 2.3.3 has BROKEN manifest --> + <version>${jaxb.runtime.vespa.version}</version> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 69f3a733f7b..d624bb2cd8c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1005,7 +1005,7 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest --> + <version>${jaxb.runtime.vespa.version}</version> </dependency> <dependency> <groupId>org.hamcrest</groupId> |