From 75045d28da4e3d2d1bb756edc59f97984a508cca Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 22 Dec 2023 07:41:14 +0100
Subject: Control logback version explicit

---
 dependency-versions/pom.xml                                |  1 +
 parent/pom.xml                                             | 10 ++++++++++
 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..080d4cb2446 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.4.14</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
@@ -459,6 +459,16 @@
                 <artifactId>tokenizers</artifactId>
                 <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>
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}
-- 
cgit v1.2.3


From 8f01450551ec19da4f11d5e14393a371978ad85f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 22 Dec 2023 09:13:22 +0100
Subject: Stay with latest logback in 1.2 series for now.

---
 dependency-versions/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 080d4cb2446..c8df510c6a3 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -113,7 +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.4.14</logback.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>
-- 
cgit v1.2.3