Skip to content

Commit a9b12ce

Browse files
geiralundgeiralund
committed
Use log4j2-logstash-layout without transitive dependencies. We have used a fatjar version of log4j2-logstash-layout (https://github.com/vy/log4j2-logstash-layout#fat-jar). The fat jar are bundled with old versions of jackson, log4j2 which may case collision
navikt/dagpenger#403
1 parent 8cc1caa commit a9b12ce

8 files changed

+36
-29
lines changed

‎buildSrc/src/main/kotlin/Constants.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ object Log4j2 {
162162

163163
object Logstash {
164164
private const val version = "1.0.2"
165-
const val logstashLayout = "com.vlkan.log4j2:log4j2-logstash-layout-fatjar:$version"
165+
const val logstashLayout = "com.vlkan.log4j2:log4j2-logstash-layout:$version"
166166
}
167167
}
168168

‎gradle/dependency-locks/compileClasspath.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
com.auth0:java-jwt:3.4.1
55
com.auth0:jwks-rsa:0.7.0
66
com.bettercloud:vault-java-driver:3.1.0
7-
com.fasterxml.jackson.core:jackson-annotations:2.9.0
8-
com.fasterxml.jackson.core:jackson-core:2.9.7
9-
com.fasterxml.jackson.core:jackson-databind:2.9.7
7+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
8+
com.fasterxml.jackson.core:jackson-core:2.11.0
9+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1010
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1111
com.github.kittinunf.fuel:fuel-moshi:2.2.1
1212
com.github.kittinunf.fuel:fuel:2.2.1
@@ -28,7 +28,7 @@ com.sun.xml.bind:jaxb-core:2.3.0
2828
com.sun.xml.bind:jaxb-impl:2.3.0
2929
com.typesafe:config:1.3.1
3030
com.uchuhimo:kotlinx-bimap:1.2
31-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
31+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
3232
com.zaxxer:HikariCP:3.4.1
3333
commons-codec:commons-codec:1.11
3434
de.huxhorn.sulky:de.huxhorn.sulky.ulid:8.2.0
@@ -67,6 +67,7 @@ javax.xml.bind:jaxb-api:2.3.0
6767
joda-time:joda-time:2.10.1
6868
no.bekk.bekkopen:nocommons:0.9.0
6969
no.nav:vault-jdbc:1.3.1
70+
org.apache.commons:commons-lang3:3.9
7071
org.apache.kafka:kafka-clients:2.3.1
7172
org.apache.logging.log4j:log4j-api:2.13.1
7273
org.apache.logging.log4j:log4j-core:2.13.1

‎gradle/dependency-locks/default.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ com.101tec:zkclient:0.10
55
com.auth0:java-jwt:3.4.1
66
com.auth0:jwks-rsa:0.7.0
77
com.bettercloud:vault-java-driver:3.1.0
8-
com.fasterxml.jackson.core:jackson-annotations:2.10.0
9-
com.fasterxml.jackson.core:jackson-core:2.10.0
10-
com.fasterxml.jackson.core:jackson-databind:2.10.0
8+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
9+
com.fasterxml.jackson.core:jackson-core:2.11.0
10+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1111
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0
1212
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1313
com.github.kittinunf.fuel:fuel-gson:2.2.1
@@ -39,7 +39,7 @@ com.sun.xml.bind:jaxb-impl:2.3.0
3939
com.thoughtworks.paranamer:paranamer:2.7
4040
com.typesafe:config:1.3.1
4141
com.uchuhimo:kotlinx-bimap:1.2
42-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
42+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
4343
com.zaxxer:HikariCP:3.4.1
4444
commons-codec:commons-codec:1.12
4545
commons-io:commons-io:2.6
@@ -88,6 +88,7 @@ no.bekk.bekkopen:nocommons:0.9.0
8888
no.nav:vault-jdbc:1.3.1
8989
org.apache.avro:avro:1.8.2
9090
org.apache.commons:commons-compress:1.8.1
91+
org.apache.commons:commons-lang3:3.9
9192
org.apache.kafka:connect-api:2.3.1
9293
org.apache.kafka:connect-json:2.3.1
9394
org.apache.kafka:kafka-clients:2.3.1

‎gradle/dependency-locks/implementationDependenciesMetadata.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
com.auth0:java-jwt:3.4.1
55
com.auth0:jwks-rsa:0.7.0
66
com.bettercloud:vault-java-driver:3.1.0
7-
com.fasterxml.jackson.core:jackson-annotations:2.9.0
8-
com.fasterxml.jackson.core:jackson-core:2.9.7
9-
com.fasterxml.jackson.core:jackson-databind:2.9.7
7+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
8+
com.fasterxml.jackson.core:jackson-core:2.11.0
9+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1010
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1111
com.github.kittinunf.fuel:fuel-moshi:2.2.1
1212
com.github.kittinunf.fuel:fuel:2.2.1
@@ -28,7 +28,7 @@ com.sun.xml.bind:jaxb-core:2.3.0
2828
com.sun.xml.bind:jaxb-impl:2.3.0
2929
com.typesafe:config:1.3.1
3030
com.uchuhimo:kotlinx-bimap:1.2
31-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
31+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
3232
com.zaxxer:HikariCP:3.4.1
3333
commons-codec:commons-codec:1.11
3434
de.huxhorn.sulky:de.huxhorn.sulky.ulid:8.2.0
@@ -67,6 +67,7 @@ javax.xml.bind:jaxb-api:2.3.0
6767
joda-time:joda-time:2.10.1
6868
no.bekk.bekkopen:nocommons:0.9.0
6969
no.nav:vault-jdbc:1.3.1
70+
org.apache.commons:commons-lang3:3.9
7071
org.apache.kafka:kafka-clients:2.3.1
7172
org.apache.logging.log4j:log4j-api:2.13.1
7273
org.apache.logging.log4j:log4j-core:2.13.1

‎gradle/dependency-locks/runtimeClasspath.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ com.101tec:zkclient:0.10
55
com.auth0:java-jwt:3.4.1
66
com.auth0:jwks-rsa:0.7.0
77
com.bettercloud:vault-java-driver:3.1.0
8-
com.fasterxml.jackson.core:jackson-annotations:2.10.0
9-
com.fasterxml.jackson.core:jackson-core:2.10.0
10-
com.fasterxml.jackson.core:jackson-databind:2.10.0
8+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
9+
com.fasterxml.jackson.core:jackson-core:2.11.0
10+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1111
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0
1212
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1313
com.github.kittinunf.fuel:fuel-gson:2.2.1
@@ -39,7 +39,7 @@ com.sun.xml.bind:jaxb-impl:2.3.0
3939
com.thoughtworks.paranamer:paranamer:2.7
4040
com.typesafe:config:1.3.1
4141
com.uchuhimo:kotlinx-bimap:1.2
42-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
42+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
4343
com.zaxxer:HikariCP:3.4.1
4444
commons-codec:commons-codec:1.12
4545
commons-io:commons-io:2.6
@@ -88,6 +88,7 @@ no.bekk.bekkopen:nocommons:0.9.0
8888
no.nav:vault-jdbc:1.3.1
8989
org.apache.avro:avro:1.8.2
9090
org.apache.commons:commons-compress:1.8.1
91+
org.apache.commons:commons-lang3:3.9
9192
org.apache.kafka:connect-api:2.3.1
9293
org.apache.kafka:connect-json:2.3.1
9394
org.apache.kafka:kafka-clients:2.3.1

‎gradle/dependency-locks/testCompileClasspath.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ch.qos.logback:logback-core:1.2.3
66
com.auth0:java-jwt:3.4.1
77
com.auth0:jwks-rsa:0.7.0
88
com.bettercloud:vault-java-driver:3.1.0
9-
com.fasterxml.jackson.core:jackson-annotations:2.9.0
10-
com.fasterxml.jackson.core:jackson-core:2.9.7
11-
com.fasterxml.jackson.core:jackson-databind:2.9.7
9+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
10+
com.fasterxml.jackson.core:jackson-core:2.11.0
11+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1212
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1313
com.github.kittinunf.fuel:fuel-moshi:2.2.1
1414
com.github.kittinunf.fuel:fuel:2.2.1
@@ -34,7 +34,7 @@ com.sun.xml.bind:jaxb-impl:2.3.0
3434
com.typesafe:config:1.3.1
3535
com.uchuhimo:kotlinx-bimap:1.2
3636
com.vaadin.external.google:android-json:0.0.20131108.vaadin1
37-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
37+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
3838
com.zaxxer:HikariCP:3.4.1
3939
commons-codec:commons-codec:1.11
4040
de.huxhorn.sulky:de.huxhorn.sulky.ulid:8.2.0
@@ -112,6 +112,7 @@ net.java.dev.jna:jna:5.5.0
112112
no.bekk.bekkopen:nocommons:0.9.0
113113
no.nav:vault-jdbc:1.3.1
114114
org.apache.commons:commons-compress:1.20
115+
org.apache.commons:commons-lang3:3.9
115116
org.apache.kafka:kafka-clients:2.3.1
116117
org.apache.logging.log4j:log4j-api:2.13.1
117118
org.apache.logging.log4j:log4j-core:2.13.1

‎gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ch.qos.logback:logback-core:1.2.3
66
com.auth0:java-jwt:3.4.1
77
com.auth0:jwks-rsa:0.7.0
88
com.bettercloud:vault-java-driver:3.1.0
9-
com.fasterxml.jackson.core:jackson-annotations:2.9.0
10-
com.fasterxml.jackson.core:jackson-core:2.9.7
11-
com.fasterxml.jackson.core:jackson-databind:2.9.7
9+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
10+
com.fasterxml.jackson.core:jackson-core:2.11.0
11+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1212
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1313
com.github.kittinunf.fuel:fuel-moshi:2.2.1
1414
com.github.kittinunf.fuel:fuel:2.2.1
@@ -34,7 +34,7 @@ com.sun.xml.bind:jaxb-impl:2.3.0
3434
com.typesafe:config:1.3.1
3535
com.uchuhimo:kotlinx-bimap:1.2
3636
com.vaadin.external.google:android-json:0.0.20131108.vaadin1
37-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
37+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
3838
com.zaxxer:HikariCP:3.4.1
3939
commons-codec:commons-codec:1.11
4040
de.huxhorn.sulky:de.huxhorn.sulky.ulid:8.2.0
@@ -109,6 +109,7 @@ net.java.dev.jna:jna:5.5.0
109109
no.bekk.bekkopen:nocommons:0.9.0
110110
no.nav:vault-jdbc:1.3.1
111111
org.apache.commons:commons-compress:1.20
112+
org.apache.commons:commons-lang3:3.9
112113
org.apache.kafka:kafka-clients:2.3.1
113114
org.apache.logging.log4j:log4j-api:2.13.1
114115
org.apache.logging.log4j:log4j-core:2.13.1

‎gradle/dependency-locks/testRuntimeClasspath.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ com.101tec:zkclient:0.10
77
com.auth0:java-jwt:3.4.1
88
com.auth0:jwks-rsa:0.7.0
99
com.bettercloud:vault-java-driver:3.1.0
10-
com.fasterxml.jackson.core:jackson-annotations:2.10.0
11-
com.fasterxml.jackson.core:jackson-core:2.10.0
12-
com.fasterxml.jackson.core:jackson-databind:2.10.0
10+
com.fasterxml.jackson.core:jackson-annotations:2.11.0
11+
com.fasterxml.jackson.core:jackson-core:2.11.0
12+
com.fasterxml.jackson.core:jackson-databind:2.11.0
1313
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0
1414
com.github.kittinunf.fuel:fuel-coroutines:2.2.1
1515
com.github.kittinunf.fuel:fuel-gson:2.2.1
@@ -48,7 +48,7 @@ com.typesafe:config:1.3.1
4848
com.uchuhimo:kotlinx-bimap:1.2
4949
com.univocity:univocity-parsers:2.8.4
5050
com.vaadin.external.google:android-json:0.0.20131108.vaadin1
51-
com.vlkan.log4j2:log4j2-logstash-layout-fatjar:1.0.2
51+
com.vlkan.log4j2:log4j2-logstash-layout:1.0.2
5252
com.zaxxer:HikariCP:3.4.1
5353
commons-codec:commons-codec:1.12
5454
commons-io:commons-io:2.6
@@ -139,6 +139,7 @@ no.bekk.bekkopen:nocommons:0.9.0
139139
no.nav:vault-jdbc:1.3.1
140140
org.apache.avro:avro:1.8.2
141141
org.apache.commons:commons-compress:1.20
142+
org.apache.commons:commons-lang3:3.9
142143
org.apache.kafka:connect-api:2.3.1
143144
org.apache.kafka:connect-json:2.3.1
144145
org.apache.kafka:kafka-clients:2.3.1

0 commit comments

Comments
 (0)