diff options
| author | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-12-08 10:41:30 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-12-08 10:59:26 +0100 |
| commit | dd866f6070d65c36d7c68607a0b4115f853a6c47 (patch) | |
| tree | d202f1f544285f27cdd6fb22e6eba3fb191d2844 | |
| parent | 2908eb01b5d7d8d427af68efe1f05cc225a76423 (diff) | |
Don't embed commons-logging
| -rw-r--r-- | container-apache-http-client-bundle/pom.xml | 12 | ||||
| -rw-r--r-- | jdisc-cloud-aws/pom.xml | 4 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/container-apache-http-client-bundle/pom.xml b/container-apache-http-client-bundle/pom.xml index e580364a51a..21e4fee56c1 100644 --- a/container-apache-http-client-bundle/pom.xml +++ b/container-apache-http-client-bundle/pom.xml @@ -23,6 +23,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -80,10 +86,8 @@ <Import-Package> !javax.servlet, javax.*, - org.slf4j, - org.slf4j.spi, - org.slf4j.helpers, - org.slf4j.event, + org.apache.commons.logging.*, + org.slf4j.*, org.ietf.jgss </Import-Package> <Embed-Transitive>true</Embed-Transitive> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index af5c5c7cc8f..8b96cb22fab 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -37,6 +37,10 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 46fc60d9abc..2eb7a5f9bb7 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -258,6 +258,10 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |