diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-24 14:32:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-24 14:32:37 +0100 |
commit | 5ac9755df4627eba5e73f6f8280f0744cf5b709e (patch) | |
tree | a77d4ecf93e7046aae3e875127ed57101f0c28af | |
parent | 3d25f0d0c389a51b5feb68dc194acb0e7c4e211f (diff) | |
parent | 916db7c909ad2efffea101bff94d5e2ef87f57d4 (diff) |
Merge pull request #17156 from vespa-engine/bjorncs/commons-logging
Match commons-logging version with packages provided by jcl-over-slf4j [run-systemtest]
-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 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ddddab4bf90..d889fd79fdc 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -94,7 +94,7 @@ <include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include> <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> - <include>commons-logging:commons-logging:[1.1.3]:jar:provided</include> + <include>commons-logging:commons-logging:[1.2]:jar:provided</include> <include>jakarta.activation:jakarta.activation-api:[1.2.1]:jar:provided</include> <include>jakarta.xml.bind:jakarta.xml.bind-api:[2.3.2]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index c2d0fd8510d..ab2cfdda1a1 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -89,7 +89,7 @@ <include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include> <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> - <include>commons-logging:commons-logging:[1.1.3]:jar:provided</include> + <include>commons-logging:commons-logging:[1.2]:jar:provided</include> <include>jakarta.activation:jakarta.activation-api:[1.2.1]:jar:provided</include> <include>jakarta.xml.bind:jakarta.xml.bind-api:[2.3.2]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 2c5d764c013..04ce3405d83 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -118,7 +118,7 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <!-- This version is exported by jdisc via jcl-over-slf4j. --> - <version>1.1.3</version> + <version>1.2</version> </dependency> <dependency> <groupId>javax.annotation</groupId> |