diff options
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 18 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | zookeeper-server/zookeeper-server/pom.xml | 8 |
4 files changed, 8 insertions, 21 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 4c7f26430ea..7768fdcc52d 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -114,7 +114,6 @@ <junit.vespa.version>5.10.0</junit.vespa.version> <junit.platform.vespa.version>1.10.0</junit.platform.vespa.version> <junit4.vespa.version>4.13.2</junit4.vespa.version> - <logback.vespa.version>1.2.13</logback.vespa.version> <luben.zstd.vespa.version>1.5.5-11</luben.zstd.vespa.version> <lucene.vespa.version>9.9.1</lucene.vespa.version> <maven-archiver.vespa.version>3.6.1</maven-archiver.vespa.version> diff --git a/parent/pom.xml b/parent/pom.xml index 6cc2902136b..3fc520c86c7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -460,16 +460,6 @@ <version>${huggingface.vespa.version}</version> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.vespa.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.vespa.version}</version> - </dependency> - <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId> <version>${aws-sdk.vespa.version}</version> @@ -504,6 +494,14 @@ <artifactId>zookeeper</artifactId> <version>${zookeeper.client.vespa.version}</version> <exclusions> + <!-- + Container provides wiring for all common log libraries + Duplicate embedding results in various warnings being printed to stderr + --> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index ad044ceca01..472b926b5a1 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -4,8 +4,6 @@ ai.djl.huggingface:tokenizers:${huggingface.vespa.version} ai.djl:api:${huggingface.vespa.version} aopalliance:aopalliance:${aopalliance.vespa.version} backport-util-concurrent:backport-util-concurrent:3.1 -ch.qos.logback:logback-classic:${logback.vespa.version} -ch.qos.logback:logback-core:${logback.vespa.version} classworlds:classworlds:1.1-alpha-2 com.amazonaws:aws-java-sdk-core:${aws-sdk.vespa.version} com.amazonaws:aws-java-sdk-kms:${aws-sdk.vespa.version} diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index 77aec63a781..bb4a819b5ac 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -45,14 +45,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> </exclusions> </dependency> <!-- snappy-java and metrics-core are included here |