diff options
| author | gjoranv <gv@yahooinc.com> | 2023-07-24 11:39:02 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahooinc.com> | 2023-07-24 15:18:39 +0200 |
| commit | 741f94170be68edd4eb7df41cf24116f427cb638 (patch) | |
| tree | a8ab0abbae2c74e541b67949995ab3e25ee08afb | |
| parent | d978d60494cb5ccf7a81e307ee3b2a4997d29e2b (diff) | |
Add version property for commons-logging
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 3 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 7c857b7dc0e..ec5e369dc09 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -58,7 +58,7 @@ <include>com.sun.activation:javax.activation:1.2.0: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>commons-logging:commons-logging:1.2: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> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 16b20849ac2..56ea9f913ce 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -77,7 +77,7 @@ <include>com.sun.activation:javax.activation:1.2.0: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>commons-logging:commons-logging:1.2: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> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index ffb692f9eb3..425a1641284 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -91,8 +91,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <!-- This version is exported by jdisc via jcl-over-slf4j. --> - <version>1.2</version> + <version>${commons-logging.vespa.version}</version> </dependency> <dependency> <groupId>javax.inject</groupId> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 4146ea3853c..cd6141e45be 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -31,6 +31,7 @@ <!-- BEGIN Dependencies available from the Jdisc container, see container-dependency-versions/pom.xml --> <aopalliance.vespa.version>1.0</aopalliance.vespa.version> + <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.18.0</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.1-jre</guava.vespa.version> <guice.vespa.version>4.2.3</guice.vespa.version> @@ -45,6 +46,7 @@ <!-- END Dependencies available from the Jdisc container --> <!-- Dependencies used internally in Vespa, not visible for users --> + <airline.vespa.version>0.9</airline.vespa.version> <antlr.vespa.version>3.5.3</antlr.vespa.version> <antlr4.vespa.version>4.11.1</antlr4.vespa.version> |