Skip to content

Commit cfb54db

Browse files
alermanalerman
authored
slf4j and log4j updates (#3085)
Breaking up the Bulkv2 PR to try to limit its scope and identify issues in smaller batches
1 parent ac99123 commit cfb54db

File tree

22 files changed

+173
-21
lines changed

22 files changed

+173
-21
lines changed

‎common-test/src/main/java/datawave/common/test/logging/TestLogCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private TestLogCollector(Builder b) {
4040
@Override
4141
protected void before() {
4242
StringLayout layout = PatternLayout.newBuilder().withPattern(PatternLayout.DEFAULT_CONVERSION_PATTERN).build();
43-
Appender appender = WriterAppender.newBuilder().setName(TestLogCollector.class.getSimpleName()).setFilter(new FilterAdapter(new Filter() {
43+
Appender appender = WriterAppender.newBuilder().setName(TestLogCollector.class.getSimpleName()).setFilter(FilterAdapter.adapt(new Filter() {
4444
@Override
4545
public int decide(LoggingEvent event) {
4646
messages.add(event.getMessage().toString());

‎core/base-rest-responses/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@
2828
<groupId>org.apache.commons</groupId>
2929
<artifactId>commons-lang3</artifactId>
3030
<version>${version.commons-lang3}</version>
31+
<exclusions>
32+
<exclusion>
33+
<groupId>org.slf4j</groupId>
34+
<artifactId>slf4j-api</artifactId>
35+
</exclusion>
36+
</exclusions>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>slf4j-api</artifactId>
41+
<version>${version.slf4j}</version>
3142
</dependency>
3243
<dependency>
3344
<groupId>io.protostuff</groupId>

‎core/metrics-reporter/pom.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<version.dropwizard-metrics>4.1.2</version.dropwizard-metrics>
2828
<version.httpclient>4.5.10</version.httpclient>
2929
<version.javastatsd>3.1.0</version.javastatsd>
30+
<version.slf4j>2.0.12</version.slf4j>
3031
</properties>
3132
<dependencyManagement>
3233
<dependencies>
@@ -44,6 +45,12 @@
4445
<groupId>io.dropwizard.metrics</groupId>
4546
<artifactId>metrics-core</artifactId>
4647
<version>${version.dropwizard-metrics}</version>
48+
<exclusions>
49+
<exclusion>
50+
<groupId>org.slf4j</groupId>
51+
<artifactId>slf4j-api</artifactId>
52+
</exclusion>
53+
</exclusions>
4754
</dependency>
4855
<dependency>
4956
<groupId>org.apache.httpcomponents</groupId>
@@ -56,6 +63,11 @@
5663
</exclusion>
5764
</exclusions>
5865
</dependency>
66+
<dependency>
67+
<groupId>org.slf4j</groupId>
68+
<artifactId>slf4j-api</artifactId>
69+
<version>${version.slf4j}</version>
70+
</dependency>
5971
</dependencies>
6072
</dependencyManagement>
6173
<dependencies>
@@ -70,11 +82,22 @@
7082
<dependency>
7183
<groupId>io.dropwizard.metrics</groupId>
7284
<artifactId>metrics-core</artifactId>
85+
<exclusions>
86+
<exclusion>
87+
<groupId>org.slf4j</groupId>
88+
<artifactId>slf4j-api</artifactId>
89+
</exclusion>
90+
</exclusions>
7391
</dependency>
7492
<dependency>
7593
<groupId>org.apache.httpcomponents</groupId>
7694
<artifactId>httpclient</artifactId>
7795
</dependency>
96+
<dependency>
97+
<groupId>org.slf4j</groupId>
98+
<artifactId>slf4j-api</artifactId>
99+
<version>${version.slf4j}</version>
100+
</dependency>
78101
</dependencies>
79102
<repositories>
80103
<repository>

‎microservices/configcheck/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<spotbugs.excludes.file />
2525
<surefire.forkCount>1C</surefire.forkCount>
2626
<version.jackson>2.13.2</version.jackson>
27-
<version.log4j.bom>2.17.2</version.log4j.bom>
27+
<version.log4j.bom>2.19.0</version.log4j.bom>
2828
<version.spring.boot>2.7.1</version.spring.boot>
2929
<version.junit5>5.12.0</version.junit5>
3030
<version.junit5.platform>1.12.0</version.junit5.platform>

‎microservices/microservice-service-parent/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
6969
<version>0.13.0</version>
7070
<scope>provided</scope>
71+
<exclusions>
72+
<exclusion>
73+
<groupId>org.slf4j</groupId>
74+
<artifactId>slf4j-api</artifactId>
75+
</exclusion>
76+
</exclusions>
7177
</dependency>
7278
<!-- includes test libraries (forcing the test scope) for all modules -->
7379
<dependency>
@@ -79,6 +85,10 @@
7985
<groupId>jakarta.xml.bind</groupId>
8086
<artifactId>jakarta.xml.bind-api</artifactId>
8187
</exclusion>
88+
<exclusion>
89+
<groupId>org.slf4j</groupId>
90+
<artifactId>slf4j-api</artifactId>
91+
</exclusion>
8292
</exclusions>
8393
</dependency>
8494
</dependencies>

‎microservices/services/authorization/api/pom.xml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<version.jackson>2.10.1</version.jackson>
2424
<version.jaxb>2.3.3</version.jaxb>
2525
<version.jjwt>0.11.2</version.jjwt>
26-
<version.slf4j>1.7.26</version.slf4j>
26+
<version.slf4j>2.0.12</version.slf4j>
2727
</properties>
2828
<dependencyManagement>
2929
<dependencies>
@@ -43,6 +43,12 @@
4343
<groupId>io.jsonwebtoken</groupId>
4444
<artifactId>jjwt-impl</artifactId>
4545
<version>${version.jjwt}</version>
46+
<exclusions>
47+
<exclusion>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-api</artifactId>
50+
</exclusion>
51+
</exclusions>
4652
</dependency>
4753
<dependency>
4854
<groupId>io.jsonwebtoken</groupId>
@@ -92,6 +98,12 @@
9298
<dependency>
9399
<groupId>com.fasterxml.jackson.core</groupId>
94100
<artifactId>jackson-databind</artifactId>
101+
<exclusions>
102+
<exclusion>
103+
<groupId>org.slf4j</groupId>
104+
<artifactId>slf4j-api</artifactId>
105+
</exclusion>
106+
</exclusions>
95107
</dependency>
96108
<dependency>
97109
<groupId>com.google.guava</groupId>
@@ -102,6 +114,12 @@
102114
<groupId>com.sun.xml.bind</groupId>
103115
<artifactId>jaxb-impl</artifactId>
104116
<version>${version.jaxb}</version>
117+
<exclusions>
118+
<exclusion>
119+
<groupId>org.slf4j</groupId>
120+
<artifactId>slf4j-api</artifactId>
121+
</exclusion>
122+
</exclusions>
105123
</dependency>
106124
<dependency>
107125
<groupId>io.jsonwebtoken</groupId>
@@ -110,6 +128,12 @@
110128
<dependency>
111129
<groupId>io.jsonwebtoken</groupId>
112130
<artifactId>jjwt-jackson</artifactId>
131+
<exclusions>
132+
<exclusion>
133+
<groupId>org.slf4j</groupId>
134+
<artifactId>slf4j-api</artifactId>
135+
</exclusion>
136+
</exclusions>
113137
</dependency>
114138
<dependency>
115139
<groupId>jakarta.xml.bind</groupId>
@@ -122,6 +146,7 @@
122146
<dependency>
123147
<groupId>org.slf4j</groupId>
124148
<artifactId>slf4j-api</artifactId>
149+
<version>${version.slf4j}</version>
125150
</dependency>
126151
</dependencies>
127152
<repositories>

‎microservices/services/hazelcast/common/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<dependency>
4343
<groupId>org.springframework.boot</groupId>
4444
<artifactId>spring-boot-starter-log4j2</artifactId>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>org.apache.logging.log4j</groupId>
48+
<artifactId>log4j-slf4j-impl</artifactId>
49+
</exclusion>
50+
</exclusions>
4551
</dependency>
4652
<dependency>
4753
<groupId>org.springframework.cloud</groupId>

‎microservices/services/query-metric/api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<version.jaxb-api>2.3.1</version.jaxb-api>
3232
<version.protobuf-java>3.16.3</version.protobuf-java>
3333
<version.protostuff>1.6.2</version.protostuff>
34-
<version.slf4j>1.7.36</version.slf4j>
34+
<version.slf4j>2.0.12</version.slf4j>
3535
</properties>
3636
<dependencyManagement>
3737
<dependencies>

‎microservices/services/query-metric/service/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
3434
<version.in-memory-accumulo>4.0.0</version.in-memory-accumulo>
3535
<version.protobuf-java>3.16.3</version.protobuf-java>
36+
<version.slf4j>2.0.12</version.slf4j>
3637
<version.validation-api>2.0.2</version.validation-api>
3738
<version.webjars.bootstrap>4.3.1</version.webjars.bootstrap>
3839
<version.webjars.jquery>3.4.1</version.webjars.jquery>
@@ -212,7 +213,7 @@
212213
<exclusions>
213214
<exclusion>
214215
<groupId>org.apache.logging.log4j</groupId>
215-
<artifactId>log4j-slf4j-impl</artifactId>
216+
<artifactId>log4j-slf4j2-impl</artifactId>
216217
</exclusion>
217218
</exclusions>
218219
</dependency>
@@ -356,6 +357,11 @@
356357
<groupId>javax.cache</groupId>
357358
<artifactId>cache-api</artifactId>
358359
</dependency>
360+
<dependency>
361+
<groupId>org.slf4j</groupId>
362+
<artifactId>slf4j-api</artifactId>
363+
<version>${version.slf4j}</version>
364+
</dependency>
359365
<dependency>
360366
<groupId>org.springframework.boot</groupId>
361367
<artifactId>spring-boot-starter-cache</artifactId>

‎microservices/starters/cache/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<groupId>net.sf.ehcache</groupId>
4343
<artifactId>ehcache</artifactId>
4444
<optional>true</optional>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>org.slf4j</groupId>
48+
<artifactId>slf4j-api</artifactId>
49+
</exclusion>
50+
</exclusions>
4551
</dependency>
4652
<dependency>
4753
<groupId>org.cache2k</groupId>

0 commit comments

Comments
 (0)