diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 15:03:09 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 15:03:09 +0200 |
| commit | 757e3c8d05a9c45536f939d48e9892953981e4d4 (patch) | |
| tree | f00dbc9ea862824461ad868eb37fea2ccfe29354 | |
| parent | 3c0574dacee144660f87685b86344d9b0292e6b3 (diff) | |
jaxb are many components with different versioning.
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 6 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 6 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8b069933970..3a5098b8b4e 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -55,13 +55,13 @@ <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> - <include>com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided</include> - <include>com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided</include> + <include>com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided</include> + <include>com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided</include> <include>commons-logging:commons-logging:${commons-logging.vespa.version}:provided</include> <include>javax.inject:javax.inject:${javax.inject.vespa.version}:provided</include> <include>javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided</include> <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided</include> - <include>javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided</include> + <include>javax.xml.bind:jaxb-api:${jaxb-api.vespa.version}:provided</include> <include>org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:slf4j-api:${slf4j.vespa.version}:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 3c991823d5d..885be3b6ee6 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -75,13 +75,13 @@ <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> - <include>com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided</include> - <include>com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided</include> + <include>com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided</include> + <include>com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided</include> <include>commons-logging:commons-logging:${commons-logging.vespa.version}:provided</include> <include>javax.inject:javax.inject:${javax.inject.vespa.version}:provided</include> <include>javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided</include> <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided</include> - <include>javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided</include> + <include>javax.xml.bind:jaxb-api:${jaxb-api.vespa.version}:provided</include> <include>org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:slf4j-api:${slf4j.vespa.version}:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 72af951d965..8d3ae6aca0e 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -116,19 +116,19 @@ <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>${jaxb.vespa.version}</version> + <version>${jaxb-api.vespa.version}</version> </dependency> <dependency> <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> - <version>${jaxb.vespa.version}</version> + <version>${jaxb-core.vespa.version}</version> </dependency> <dependency> <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>${jaxb.vespa.version}</version> + <version>${jaxb-impl.vespa.version}</version> </dependency> <dependency> <!-- Needed by jaxb-api, and possibly guice --> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 7c38ca2e6ac..8f6b4c4b8c1 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -42,7 +42,9 @@ <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.vespa.version>2.3.0</jaxb.vespa.version> + <jaxb-api.vespa.version>2.3.0</jaxb-api.vespa.version> + <jaxb-core.vespa.version>2.3.0</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> |