Skip to content

slf4j and log4j updates #3085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alerman merged 12 commits into from
Aug 7, 2025
Merged

slf4j and log4j updates #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fc13816
Main datawave updates to slf4j and log4j
alerman Aug 5, 2025
4856da9
Updates to microservices for log4j updates
alerman Aug 5, 2025
d1c7a81
Update dependency to correct slf4j2 version
alerman Aug 7, 2025
9a8278d
Additional fixes to log4j and slf4j dependencies
alerman Aug 7, 2025
38ea64b
Update to add slf4j version
alerman Aug 7, 2025
fb9dc39
Formatting fixes
alerman Aug 7, 2025
f9a4bce
Remove errant dependency
alerman Aug 7, 2025
59ae082
Remove errant dependency
alerman Aug 7, 2025
1f3347f
Fix formatting
alerman Aug 7, 2025
dd25da1
Update log4j config
alerman Aug 7, 2025
e9b35ec
Update map-file-bulk-loader.sh
alerman Aug 7, 2025
60b6324
Update map-file-bulk-loader.sh
alerman Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-test/src/main/java/datawave/common/test/logging/TestLogCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private TestLogCollector(Builder b) {
@Override
protected void before() {
StringLayout layout = PatternLayout.newBuilder().withPattern(PatternLayout.DEFAULT_CONVERSION_PATTERN).build();
Appender appender = WriterAppender.newBuilder().setName(TestLogCollector.class.getSimpleName()).setFilter(new FilterAdapter(new Filter() {
Appender appender = WriterAppender.newBuilder().setName(TestLogCollector.class.getSimpleName()).setFilter(FilterAdapter.adapt(new Filter() {
@Override
public int decide(LoggingEvent event) {
messages.add(event.getMessage().toString());
Expand Down
11 changes: 11 additions & 0 deletions core/base-rest-responses/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${version.commons-lang3}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
Expand Down
23 changes: 23 additions & 0 deletions core/metrics-reporter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<version.dropwizard-metrics>4.1.2</version.dropwizard-metrics>
<version.httpclient>4.5.10</version.httpclient>
<version.javastatsd>3.1.0</version.javastatsd>
<version.slf4j>2.0.12</version.slf4j>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -44,6 +45,12 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${version.dropwizard-metrics}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -56,6 +63,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand All @@ -70,11 +82,22 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
</dependencies>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion microservices/configcheck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<spotbugs.excludes.file />
<surefire.forkCount>1C</surefire.forkCount>
<version.jackson>2.13.2</version.jackson>
<version.log4j.bom>2.17.2</version.log4j.bom>
<version.log4j.bom>2.19.0</version.log4j.bom>
<version.spring.boot>2.7.1</version.spring.boot>
<version.junit5>5.12.0</version.junit5>
<version.junit5.platform>1.12.0</version.junit5.platform>
Expand Down
10 changes: 10 additions & 0 deletions microservices/microservice-service-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
<version>0.13.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- includes test libraries (forcing the test scope) for all modules -->
<dependency>
Expand All @@ -79,6 +85,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
27 changes: 26 additions & 1 deletion microservices/services/authorization/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<version.jackson>2.10.1</version.jackson>
<version.jaxb>2.3.3</version.jaxb>
<version.jjwt>0.11.2</version.jjwt>
<version.slf4j>1.7.26</version.slf4j>
<version.slf4j>2.0.12</version.slf4j>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -43,6 +43,12 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>${version.jjwt}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand Down Expand Up @@ -92,6 +98,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -102,6 +114,12 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jaxb}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand All @@ -110,6 +128,12 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand All @@ -122,6 +146,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
</dependencies>
<repositories>
Expand Down
6 changes: 6 additions & 0 deletions microservices/services/hazelcast/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
Expand Down
2 changes: 1 addition & 1 deletion microservices/services/query-metric/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<version.jaxb-api>2.3.1</version.jaxb-api>
<version.protobuf-java>3.16.3</version.protobuf-java>
<version.protostuff>1.6.2</version.protostuff>
<version.slf4j>1.7.36</version.slf4j>
<version.slf4j>2.0.12</version.slf4j>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
8 changes: 7 additions & 1 deletion microservices/services/query-metric/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
<version.in-memory-accumulo>4.0.0</version.in-memory-accumulo>
<version.protobuf-java>3.16.3</version.protobuf-java>
<version.slf4j>2.0.12</version.slf4j>
<version.validation-api>2.0.2</version.validation-api>
<version.webjars.bootstrap>4.3.1</version.webjars.bootstrap>
<version.webjars.jquery>3.4.1</version.webjars.jquery>
Expand Down Expand Up @@ -212,7 +213,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -356,6 +357,11 @@
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions microservices/starters/cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.cache2k</groupId>
Expand Down
26 changes: 26 additions & 0 deletions microservices/starters/datawave/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<version.jzlib>1.1.3</version.jzlib>
<version.metrics-spring>3.1.3</version.metrics-spring>
<version.protostuff>1.6.2</version.protostuff>
<version.slf4j>2.0.12</version.slf4j>
<version.springdoc>1.6.9</version.springdoc>
</properties>
<dependencyManagement>
Expand All @@ -56,6 +57,12 @@
<groupId>com.ryantenney.metrics</groupId>
<artifactId>metrics-spring</artifactId>
<version>${version.metrics-spring}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Expand Down Expand Up @@ -201,8 +208,17 @@
<groupId>ch.qos.logback</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-javadoc</artifactId>
Expand Down Expand Up @@ -320,6 +336,16 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<version.jython>2.7.2b2</version.jython>
<version.kryo>2.20</version.kryo>
<version.kryonet>2.20</version.kryonet>
<version.log4j2>2.17.2</version.log4j2>
<version.log4j2>2.19.0</version.log4j2>
<version.lucene>7.5.0</version.lucene>
<version.metrics-cdi>1.6.0</version.metrics-cdi>
<version.minlog>1.2</version.minlog>
Expand All @@ -133,7 +133,7 @@
<version.powermock>2.0.9</version.powermock>
<version.protobuf>3.16.3</version.protobuf>
<version.protostuff>1.6.2</version.protostuff>
<version.slf4j>1.7.36</version.slf4j>
<version.slf4j>2.0.12</version.slf4j>
<version.spotify-dns>3.1.5</version.spotify-dns>
<version.spring>5.2.2.RELEASE</version.spring>
<version.springframework>${version.spring}</version.springframework>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/assemble/datawave/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
20 changes: 20 additions & 0 deletions warehouse/ingest-configuration/src/main/resources/config/log4j-bulkloader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">

<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %p [%c{1.}] [%t-%tid] %m%n"/>
</layout>
</appender>

<logger name="org.apache.hadoop">
<level value="info"/>
</logger>

<root>
<priority value="debug"/>
<appender-ref ref="CONSOLE"/>
</root>
</log4j:configuration>
Loading