diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-12-22 09:44:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 09:44:41 +0100 |
| commit | 95da3db0757ce9a768adf22adfecf243a8003872 (patch) | |
| tree | 204e958a744c7c7df678b35a6c6b78862012e70d | |
| parent | 97da8a6366d2c1743d0e757849eb958831018c9c (diff) | |
| parent | 8f01450551ec19da4f11d5e14393a371978ad85f (diff) | |
Merge pull request #29740 from vespa-engine/balder/explicit-logback-version-control
Balder/explicit logback version control
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 10 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index f6ee1e257b1..c8df510c6a3 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -113,6 +113,7 @@ <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 f203bbc4f0b..8de1442b369 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -460,6 +460,16 @@ <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> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 8ffb4582e5f..6c5b82fc735 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -4,8 +4,8 @@ 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:1.2.10 -ch.qos.logback:logback-core:1.2.10 +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} |