Migrate to ch.qos.logback.access:tomcat

See qos-ch/logback-access#17
jonatan-ivanov · Aug 20, 2024 · 99f2c95 · 99f2c95
1 parent e0b07a6
commit 99f2c95
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 13 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,7 +6,10 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
     implementation 'org.apache.commons:commons-lang3'
     implementation 'io.github.openfeign:feign-micrometer'
-    implementation 'ch.qos.logback:logback-access:1.4.+'
+    implementation('ch.qos.logback.access:tomcat:latest.release') {
+        exclude group: 'org.apache.tomcat'
+        exclude group: 'jakarta.servlet'
+    }
     implementation 'org.apache.tomcat.embed:tomcat-embed-core'
 
     compileOnly 'net.ttddyy.observation:datasource-micrometer-spring-boot:latest.release'

diff --git a/core/gradle.lockfile b/core/gradle.lockfile
@@ -2,8 +2,9 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=runtimeClasspath,testRuntimeClasspath

diff --git a/eureka/gradle.lockfile b/eureka/gradle.lockfile
@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 aopalliance:aopalliance:1.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

diff --git a/spring-boot-admin/gradle.lockfile b/spring-boot-admin/gradle.lockfile
@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 aopalliance:aopalliance:1.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

diff --git a/tea-service/gradle.lockfile b/tea-service/gradle.lockfile
@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 aopalliance:aopalliance:1.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

diff --git a/tealeaf-service/gradle.lockfile b/tealeaf-service/gradle.lockfile
@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 aopalliance:aopalliance:1.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

diff --git a/water-service/gradle.lockfile b/water-service/gradle.lockfile
@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 aopalliance:aopalliance:1.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-access:1.4.14=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:common:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+ch.qos.logback.access:tomcat:2.0.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath