Revert "Try to downgrade log4j2 to match version in log4j2-logstash-layout"

geiralund · geiralund · commit a4a8dbed277b · 2020-05-06T13:35:48.000+02:00
This reverts commit 8616f1a.
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -153,7 +153,7 @@ object Ktor {
 }
 
 object Log4j2 {
-    const val version = "2.12.1"
+    const val version = "2.13.1"
     const val api = "org.apache.logging.log4j:log4j-api:$version"
     const val core = "org.apache.logging.log4j:log4j-core:$version"
     const val slf4j = "org.apache.logging.log4j:log4j-slf4j-impl:$version"
diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile
@@ -69,9 +69,9 @@ no.bekk.bekkopen:nocommons:0.9.0
 no.nav:vault-jdbc:1.3.1
 org.apache.commons:commons-lang3:3.9
 org.apache.kafka:kafka-clients:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
 org.flywaydb:flyway-core:6.3.2
 org.hdrhistogram:HdrHistogram:2.1.12
diff --git a/gradle/dependency-locks/default.lockfile b/gradle/dependency-locks/default.lockfile
@@ -93,9 +93,9 @@ org.apache.kafka:connect-api:2.3.1
 org.apache.kafka:connect-json:2.3.1
 org.apache.kafka:kafka-clients:2.3.1
 org.apache.kafka:kafka-streams:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.4.13
 org.checkerframework:checker-qual:2.5.2
diff --git a/gradle/dependency-locks/implementationDependenciesMetadata.lockfile b/gradle/dependency-locks/implementationDependenciesMetadata.lockfile
@@ -69,9 +69,9 @@ no.bekk.bekkopen:nocommons:0.9.0
 no.nav:vault-jdbc:1.3.1
 org.apache.commons:commons-lang3:3.9
 org.apache.kafka:kafka-clients:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
 org.flywaydb:flyway-core:6.3.2
 org.hdrhistogram:HdrHistogram:2.1.12
diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -93,9 +93,9 @@ org.apache.kafka:connect-api:2.3.1
 org.apache.kafka:connect-json:2.3.1
 org.apache.kafka:kafka-clients:2.3.1
 org.apache.kafka:kafka-streams:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.4.13
 org.checkerframework:checker-qual:2.5.2
diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -114,9 +114,9 @@ no.nav:vault-jdbc:1.3.1
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.9
 org.apache.kafka:kafka-clients:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
 org.eclipse.jetty.http2:http2-client:9.4.19.v20190610
diff --git a/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile b/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile
@@ -111,9 +111,9 @@ no.nav:vault-jdbc:1.3.1
 org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.9
 org.apache.kafka:kafka-clients:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
 org.eclipse.jetty.http2:http2-client:9.4.19.v20190610
diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -144,9 +144,9 @@ org.apache.kafka:connect-api:2.3.1
 org.apache.kafka:connect-json:2.3.1
 org.apache.kafka:kafka-clients:2.3.1
 org.apache.kafka:kafka-streams:2.3.1
-org.apache.logging.log4j:log4j-api:2.12.1
-org.apache.logging.log4j:log4j-core:2.12.1
-org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
+org.apache.logging.log4j:log4j-api:2.13.1
+org.apache.logging.log4j:log4j-core:2.13.1
+org.apache.logging.log4j:log4j-slf4j-impl:2.13.1
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.4.13
 org.apiguardian:apiguardian-api:1.1.0

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ object Ktor {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`object Log4j2 {`
`156`		`- const val version = "2.12.1"`
	`156`	`+ const val version = "2.13.1"`
`157`	`157`	`const val api = "org.apache.logging.log4j:log4j-api:$version"`
`158`	`158`	`const val core = "org.apache.logging.log4j:log4j-core:$version"`
`159`	`159`	`const val slf4j = "org.apache.logging.log4j:log4j-slf4j-impl:$version"`