Skip to content

Commit

Permalink
Showing 17 changed files with 130 additions and 215 deletions.
9 changes: 2 additions & 7 deletions leshan-bsserver-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -53,14 +53,9 @@ Contributors:
</dependency>

<!-- runtime dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>

43 changes: 0 additions & 43 deletions leshan-bsserver-demo/src/main/resources/log4j2.xml

This file was deleted.

31 changes: 31 additions & 0 deletions leshan-bsserver-demo/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013-2015 Sierra Wireless and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html
and the Eclipse Distribution License is available at
http://www.eclipse.org/org/documents/edl-v10.html.
Contributors:
Sierra Wireless - initial API and implementation
-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %p %C{0} - %m%n</pattern>
</encoder>
</appender>

<root level="WARN">
<appender-ref ref="STDOUT" />
</root>

<logger name="org.eclipse.leshan" level="INFO"/>
<logger name="org.eclipse.leshan.server.security.SecurityCheck" level="DEBUG"/>
<logger name="org.eclipse.leshan.core.model.LwM2mModel" level="TRACE"/>
</configuration>
9 changes: 2 additions & 7 deletions leshan-client-cf/pom.xml
Original file line number Diff line number Diff line change
@@ -49,13 +49,8 @@ Contributors:

<!-- test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
9 changes: 2 additions & 7 deletions leshan-client-core/pom.xml
Original file line number Diff line number Diff line change
@@ -37,13 +37,8 @@ Contributors:

<!-- test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
9 changes: 2 additions & 7 deletions leshan-core/pom.xml
Original file line number Diff line number Diff line change
@@ -46,13 +46,8 @@ Contributors:
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
5 changes: 5 additions & 0 deletions leshan-integration-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -47,6 +47,11 @@ Contributors:
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.californium</groupId>
<artifactId>californium-core</artifactId>
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright (c) 2013-2015 Sierra Wireless and others.
All rights reserved. This program and the accompanying materials
@@ -15,22 +13,16 @@ and the Eclipse Distribution License is available at
Contributors:
Sierra Wireless - initial API and implementation
-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</encoder>
</appender>

<root level="ERROR">
<appender-ref ref="STDOUT" />
</root>
</configuration>

<Configuration status="warn" strict="true" name="unit test execution"
packages="org.apache.logging.log4j.test">

<Appenders>
<Appender type="Console" name="STDOUT">
<Layout type="PatternLayout" pattern="%d %p %C{1.} [%t] %m%n"/>
</Appender>
</Appenders>

<Loggers>
<Root level="error">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>

</Configuration>
9 changes: 2 additions & 7 deletions leshan-server-cf/pom.xml
Original file line number Diff line number Diff line change
@@ -53,13 +53,8 @@ Contributors:
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
9 changes: 2 additions & 7 deletions leshan-server-cluster/pom.xml
Original file line number Diff line number Diff line change
@@ -53,13 +53,8 @@ Contributors:

<!-- runtime dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>

43 changes: 0 additions & 43 deletions leshan-server-cluster/src/main/resources/log4j2.xml

This file was deleted.

31 changes: 31 additions & 0 deletions leshan-server-cluster/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013-2015 Sierra Wireless and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html
and the Eclipse Distribution License is available at
http://www.eclipse.org/org/documents/edl-v10.html.
Contributors:
Sierra Wireless - initial API and implementation
-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %p %C{0} - %m%n</pattern>
</encoder>
</appender>

<root level="WARN">
<appender-ref ref="STDOUT" />
</root>

<logger name="org.eclipse.leshan" level="INFO"/>
<logger name="org.eclipse.leshan.server.security.SecurityCheck" level="DEBUG"/>
<logger name="org.eclipse.leshan.core.model.LwM2mModel" level="TRACE"/>
</configuration>
9 changes: 2 additions & 7 deletions leshan-server-core/pom.xml
Original file line number Diff line number Diff line change
@@ -41,13 +41,8 @@ Contributors:
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
9 changes: 2 additions & 7 deletions leshan-server-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -74,13 +74,8 @@ Contributors:

<!-- runtime dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>

43 changes: 0 additions & 43 deletions leshan-server-demo/src/main/resources/log4j2.xml

This file was deleted.

31 changes: 31 additions & 0 deletions leshan-server-demo/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013-2015 Sierra Wireless and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html
and the Eclipse Distribution License is available at
http://www.eclipse.org/org/documents/edl-v10.html.
Contributors:
Sierra Wireless - initial API and implementation
-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %p %C{0} - %m%n</pattern>
</encoder>
</appender>

<root level="WARN">
<appender-ref ref="STDOUT" />
</root>

<logger name="org.eclipse.leshan" level="INFO"/>
<logger name="org.eclipse.leshan.server.security.SecurityCheck" level="DEBUG"/>
<logger name="org.eclipse.leshan.core.model.LwM2mModel" level="TRACE"/>
</configuration>
16 changes: 5 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -106,8 +106,8 @@ Contributors:
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<californium.version>2.0.0-M6</californium.version>
<log4j.version>2.1</log4j.version>
<slf4j.api.version>1.7.10</slf4j.api.version>
<logback.version>1.2.3</logback.version>
<slf4j.api.version>1.7.25</slf4j.api.version>
<jetty.version>9.1.4.v20140401</jetty.version>
<test.exclusion.pattern>**/Redis*.java</test.exclusion.pattern>
</properties>
@@ -423,15 +423,9 @@ Contributors:
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>

0 comments on commit d103207

Please sign in to comment.