Skip to content

Implementation of Log4j2 instead of Logback in Leshan #1744

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

Open
JaroslawLegierski wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Implementation of Log4j2 instead of Logback in Leshan #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb39dc0
First working version with log4j2
JaroslawLegierski Nov 28, 2025
db95bdc
Changed logger to log4j2 in tests
JaroslawLegierski Jan 9, 2026
a813b78
pom.xml in integration test correction and line separator correction
JaroslawLegierski Feb 13, 2026
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ bin/
*.ear

# log Files #
**/src/main/**/logback*.xml
**/src/test/**/logback*.xml
**/src/main/**/log4j*.xml
**/src/test/**/log4j*.xml

# Credentials files #
**/*.der
Expand Down
33 changes: 33 additions & 0 deletions build-config/demo-build-config/jar-with-dependencies-with-log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

<id>jar-with-dependencies</id>

<formats>
<format>jar</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>log4j2.xml</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<exclude>*:*:*:tests</exclude>
</excludes>
</dependencySet>
</dependencySets>

</assembly>
28 changes: 0 additions & 28 deletions build-config/demo-build-config/jar-with-dependencies-with-logback.xml
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions build-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,8 @@ Contributors:
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<logback.configurationFile>logback-leshan-test.xml</logback.configurationFile>
</systemPropertyVariables>
<parallel>classes</parallel>
<!-- TODO OSCORE threadcount should be set to 4 again as soon as
<parallel>none</parallel>
<!-- TODO OSCORE threadcount should be set to 4 again as soon as
instability was resolved see : https://github.com/eclipse/leshan/pull/1180#issuecomment-1007587985 -->
<threadCount>1</threadCount>
<excludes>
Expand Down
35 changes: 0 additions & 35 deletions leshan-demo-bsserver/logback-config.xml
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions leshan-demo-bsserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ Contributors:
<groupId>org.eclipse.leshan</groupId>
<artifactId>leshan-demo-servers-shared</artifactId>
</dependency>

<!-- runtime dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -77,7 +70,7 @@ Contributors:
</manifest>
</archive>
<descriptors>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-logback.xml</descriptor>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-log4j2.xml</descriptor>
</descriptors>
</configuration>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions ...mo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
public class LeshanBootstrapServerDemo {

static {
// Define a default logback.configurationFile
String property = System.getProperty("logback.configurationFile");
// Define a default log4j.configurationFile
String property = System.getProperty("log4j2.configurationFile");
if (property == null) {
System.setProperty("logback.configurationFile", "logback-config.xml");
System.setProperty("log4j2.configurationFile", "log4j2.xml");
}
}

Expand Down
36 changes: 0 additions & 36 deletions leshan-demo-client/logback-config.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion leshan-demo-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Contributors:
</manifest>
</archive>
<descriptors>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-logback.xml</descriptor>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-log4j2.xml</descriptor>
</descriptors>
</configuration>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/LeshanClientDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@
public class LeshanClientDemo {

static {
// Define a default logback.configurationFile
String property = System.getProperty("logback.configurationFile");
// Define a default log4j2.configurationFile
String property = System.getProperty("log4j2.configurationFile");
if (property == null) {
System.setProperty("logback.configurationFile", "logback-config.xml");
System.setProperty("log4j2.configurationFile", "log4j2.xml");
}
}

Expand Down
34 changes: 0 additions & 34 deletions leshan-demo-server/logback-config.xml
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions leshan-demo-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ Contributors:
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>

<!-- runtime dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -101,7 +94,7 @@ Contributors:
</manifest>
</archive>
<descriptors>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-logback.xml</descriptor>
<descriptor>../build-config/demo-build-config/jar-with-dependencies-with-log4j2.xml</descriptor>
</descriptors>
</configuration>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
public class LeshanServerDemo {

static {
// Define a default logback.configurationFile
String property = System.getProperty("logback.configurationFile");
// Define a default log4j2.configurationFile
String property = System.getProperty("log4j2.configurationFile");
if (property == null) {
System.setProperty("logback.configurationFile", "logback-config.xml");
System.setProperty("log4j2.configurationFile", "log4j2.xml");
}
}

Expand Down
6 changes: 3 additions & 3 deletions leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/DdfDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
public class DdfDownloader {

static {
// Define a default logback.configurationFile
String property = System.getProperty("logback.configurationFile");
// Define a default log4j2.configurationFile
String property = System.getProperty("log4j2.configurationFile");
if (property == null) {
System.setProperty("logback.configurationFile", "logback-config.xml");
System.setProperty("log4j2.configurationFile", "log4j2.xml");
}
}

Expand Down
35 changes: 0 additions & 35 deletions leshan-demo-shared/logback-leshan-test.xml
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions leshan-demo-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ Contributors:
<artifactId>picocli-shell-jline2</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.californium</groupId>
Expand Down
Loading
Loading