HHH-10781 - Remove all slf4j dependencies

hibernate · May 31, 2016 · 438e964 · 438e964
1 parent 5e8bb78
commit 438e964
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/hibernate-hikaricp/hibernate-hikaricp.gradle b/hibernate-hikaricp/hibernate-hikaricp.gradle
@@ -8,7 +8,6 @@ dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.hikaricp )
     testCompile project( ':hibernate-testing' )
-    testRuntime libraries.slf4j_log4j
 }
 
 mavenPom {

diff --git a/libraries.gradle b/libraries.gradle
@@ -51,9 +51,6 @@ ext {
             logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.0.0.Final',
             logging_processor:  'org.jboss.logging:jboss-logging-processor:2.0.0.Final',
 
-            slf4j_api:                 "org.slf4j:slf4j-api:1.7.5",
-            slf4j_log4j:               "org.slf4j:slf4j-log4j12:1.7.5",
-
             // jaxb task
 			jaxb:           'com.sun.xml.bind:jaxb-xjc:2.2.5',
 			jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3',

diff --git a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
@@ -10,9 +10,7 @@ apply plugin: 'org.hibernate.build.gradle.xjc'
 dependencies {
 	testCompile libraries.junit
     testCompile libraries.jpa
-    testCompile project( ':hibernate-core' ) 
-	testCompile libraries.slf4j_api
-	testCompile libraries.slf4j_log4j
+    testCompile project( ':hibernate-core' )
 }
 
 mavenPom {

diff --git a/...del-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationStatement.java b/...del-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationStatement.java
@@ -20,9 +20,10 @@
 import javax.tools.ToolProvider;
 
 import org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor;
+
 import org.junit.runners.model.Statement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import org.jboss.logging.Logger;
 
 import static org.junit.Assert.fail;
 
@@ -35,7 +36,7 @@
  * @author Hardy Ferentschik
  */
 public class CompilationStatement extends Statement {
-	private static final Logger log = LoggerFactory.getLogger( CompilationStatement.class );
+	private static final Logger log = Logger.getLogger( CompilationStatement.class );
 	private static final String PACKAGE_SEPARATOR = ".";
 	private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A";
 	private static final String SOURCE_BASE_DIR_PROPERTY = "sourceBaseDir";

diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java
@@ -20,8 +20,7 @@
 import java.util.List;
 import javax.tools.Diagnostic;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -33,7 +32,7 @@
  * @author Hardy Ferentschik
  */
 public class TestUtil {
-	private static final Logger log = LoggerFactory.getLogger( TestUtil.class );
+	private static final Logger log = Logger.getLogger( TestUtil.class );
 	private static final String PATH_SEPARATOR = File.separator;
 	public static final String RESOURCE_SEPARATOR = "/";
 	private static final String PACKAGE_SEPARATOR = ".";