Merge pull request #1 from gossiperl/no-logging

Remove any logging dependency from core.
gossiperl · Apr 11, 2015 · 786941c · 786941c
2 parents 787c463 + 410503e
commit 786941c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.gossiperl</groupId>
     <artifactId>gossiperl-core</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
 
     <packaging>jar</packaging>
 
@@ -15,8 +15,6 @@
         <maven.compiler.version>3.0</maven.compiler.version>
         <maven.surefire.version>2.7</maven.surefire.version>
         <junit.version>4.12</junit.version>
-        <slf4j-api.version>1.7.7</slf4j-api.version>
-        <log4j.version>1.2.16</log4j.version>
     </properties>
 
     <build>
@@ -56,26 +54,6 @@
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/src/main/java/com/gossiperl/client/encryption/Aes256.java b/src/main/java/com/gossiperl/client/encryption/Aes256.java
@@ -1,6 +1,7 @@
 package com.gossiperl.client.encryption;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.crypto.*;
 import javax.crypto.spec.IvParameterSpec;
@@ -11,7 +12,6 @@
 public class Aes256 {
 
     private SecretKeySpec key;
-    private static Logger LOG = Logger.getLogger(Aes256.class);
 
     public Aes256(String key) throws NoSuchAlgorithmException, UnsupportedEncodingException {
         MessageDigest md = MessageDigest.getInstance("SHA-256");