aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2015-10-23 13:56:18 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2015-10-23 13:56:19 -0400
commit288501df011b623db37378100e697a9cf64b8bc2 (patch)
tree14fe86c721fb1a79eee71f0977ec4bddc5ed74c2 /org.eclipse.jgit.test/tst/org/eclipse/jgit
parent2c70d183f539b9a696e9670f5752a5829a4efbba (diff)
parent6c424d320c5058e9d4ea0f342c48733f9de468de (diff)
downloadjgit-288501df011b623db37378100e697a9cf64b8bc2.tar.gz
jgit-288501df011b623db37378100e697a9cf64b8bc2.zip
Merge "WalkEncryptionTest: get rid of Log4J dependency"
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java
index 042d7ba78b..90d78e4b62 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java
@@ -76,7 +76,6 @@ import java.util.UUID;
import javax.crypto.Cipher;
import javax.crypto.SecretKeyFactory;
-import org.apache.log4j.Logger;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
@@ -92,6 +91,8 @@ import org.junit.runners.MethodSorters;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.junit.runners.Suite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.*;
@@ -119,7 +120,7 @@ public class WalkEncryptionTest {
/**
* Logger setup: ${project_loc}/tst-rsrc/log4j.properties
*/
- static final Logger logger = Logger.getLogger(WalkEncryptionTest.class);
+ static final Logger logger = LoggerFactory.getLogger(WalkEncryptionTest.class);
/**
* Property names used in test session.