diff options
author | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-12-08 10:51:03 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-12-08 11:03:10 +0100 |
commit | a6702a49dcdd7278c5972b11ed78ce5b330cad4b (patch) | |
tree | e7098991b691d98bf27c2aeaba8d7bb5f3b1b840 | |
parent | dd866f6070d65c36d7c68607a0b4115f853a6c47 (diff) |
Remove commons-logging from container-dev
We do not provide commons-logging, only slf4j bindings through jcl-over-slf4j.
The bindings is what available at runtime through jdisc_core.
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 5 | ||||
-rw-r--r-- | container-dev/pom.xml | 4 | ||||
-rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
-rw-r--r-- | jdisc-cloud-aws/pom.xml | 2 | ||||
-rw-r--r-- | parent/pom.xml | 5 |
7 files changed, 7 insertions, 13 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ce673aea54e..2a757e323a4 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -58,7 +58,6 @@ <include>com.sun.activation:javax.activation:[1.2.0, 2):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> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index a56cd148b66..e96a715bfc5 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -77,7 +77,6 @@ <include>com.sun.activation:javax.activation:[1.2.0, 2):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> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index e7b603b4bdd..bd1cbf8fcf6 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -83,11 +83,6 @@ <version>${guice.vespa.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.vespa.version}</version> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <version>${javax.inject.vespa.version}</version> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index a7e660da13a..0f0bb58d641 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -67,10 +67,6 @@ <artifactId>jna</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>provided-dependencies</artifactId> <version>${project.version}</version> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 35bba2d5e74..484f6d8b3b3 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -33,7 +33,6 @@ <!-- DO NOT UPGRADE THESE TO A NEW MAJOR VERSION WITHOUT CHECKING FOR BINARY COMPATIBILITY --> <aopalliance.vespa.version>1.0</aopalliance.vespa.version> - <commons-logging.vespa.version>1.3.0</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> <error-prone-annotations.vespa.version>2.23.0</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.3-jre</guava.vespa.version> <guice.vespa.version>6.0.0</guice.vespa.version> @@ -87,6 +86,7 @@ <commons-exec.vespa.version>1.3</commons-exec.vespa.version> <commons-io.vespa.version>2.15.1</commons-io.vespa.version> <commons-lang3.vespa.version>3.14.0</commons-lang3.vespa.version> + <commons-logging.vespa.version>1.3.0</commons-logging.vespa.version> <!-- Bindings exported by jdisc through jcl-over-slf4j. --> <commons.math3.vespa.version>3.6.1</commons.math3.vespa.version> <commons-compress.vespa.version>1.25.0</commons-compress.vespa.version> <commons-cli.vespa.version>1.6.0</commons-cli.vespa.version> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 8b96cb22fab..55cc03be562 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -82,7 +82,7 @@ <extensions>true</extensions> <configuration> <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-annotations, com.fasterxml.jackson.core:jackson-core, - com.fasterxml.jackson.core:jackson-databind, commons-logging:commons-logging</allowEmbeddedArtifacts> + com.fasterxml.jackson.core:jackson-databind</allowEmbeddedArtifacts> </configuration> </plugin> </plugins> diff --git a/parent/pom.xml b/parent/pom.xml index f8bb67fa544..2bd71b97cfb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -674,6 +674,11 @@ <version>${commons-codec.vespa.version}</version> </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.vespa.version}</version> + </dependency> + <dependency> <groupId>io.airlift</groupId> <artifactId>aircompressor</artifactId> <version>${aircompressor.vespa.version}</version> |