Skip to content

Commit

Permalink
update tests to use slf4j
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin Lee committed Dec 7, 2016
1 parent c006ea5 commit 989cbed
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 21 deletions.
6 changes: 5 additions & 1 deletion morphia/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ dependencies {
testCompile "org.zeroturnaround:zt-exec:${ztExecVersion}"
testCompile "com.jayway.awaitility:awaitility:${awaitilityVersion}"
testCompile "org.skyscreamer:jsonassert:${jsonAssertVersion}"

testCompile "log4j:log4j:1.2.17"
testCompile "org.slf4j:slf4j-log4j12:1.7.2"
testCompile "org.slf4j:jul-to-slf4j:1.7.2"
}

clirr {
excludeFilter = new File("$configDir/clirr-exclude.yml")
baseline = ['org.mongodb.morphia:morphia:1.2.0'].join(':')
failOnErrors = false
}
}
34 changes: 34 additions & 0 deletions morphia/src/test/resources/log4j.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2016 MongoDB, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">

<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{yyMMdd HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/>
</layout>
</appender>

<root>
<level value="WARN" />
<appender-ref ref="CONSOLE"/>
</root>

</log4j:configuration>
20 changes: 0 additions & 20 deletions morphia/src/test/resources/logging.properties

This file was deleted.

0 comments on commit 989cbed

Please sign in to comment.