Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10781 - Remove all slf4j dependencies

This commit is contained in:
Vlad Mihalcea 2016-05-31 16:06:57 +03:00
parent 5e8bb78b77
commit 438e9643f9
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-hikaricp/hibernate-hikaricp.gradle
View File

@ -8,7 +8,6 @@ dependencies {
compile project( ':hibernate-core' ) compile project( ':hibernate-core' )
compile( libraries.hikaricp ) compile( libraries.hikaricp )
testCompile project( ':hibernate-testing' ) testCompile project( ':hibernate-testing' )
testRuntime libraries.slf4j_log4j
} }
mavenPom { mavenPom {

3
libraries.gradle
View File

@ -51,9 +51,6 @@ ext {
logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.0.0.Final', logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.0.0.Final',
logging_processor: 'org.jboss.logging:jboss-logging-processor: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 task
jaxb: 'com.sun.xml.bind:jaxb-xjc:2.2.5', jaxb: 'com.sun.xml.bind:jaxb-xjc:2.2.5',
jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3', jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3',

2
tooling/metamodel-generator/hibernate-jpamodelgen.gradle
View File

@ -11,8 +11,6 @@ dependencies {
testCompile libraries.junit testCompile libraries.junit
testCompile libraries.jpa testCompile libraries.jpa
testCompile project( ':hibernate-core' ) testCompile project( ':hibernate-core' )
testCompile libraries.slf4j_api
testCompile libraries.slf4j_log4j
} }
mavenPom { mavenPom {

7
tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationStatement.java
View File

@ -20,9 +20,10 @@ import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider; import javax.tools.ToolProvider;
import org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor; import org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor;
import org.junit.runners.model.Statement; 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; import static org.junit.Assert.fail;
@ -35,7 +36,7 @@ import static org.junit.Assert.fail;
* @author Hardy Ferentschik * @author Hardy Ferentschik
*/ */
public class CompilationStatement extends Statement { 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 PACKAGE_SEPARATOR = ".";
private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A"; private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A";
private static final String SOURCE_BASE_DIR_PROPERTY = "sourceBaseDir"; private static final String SOURCE_BASE_DIR_PROPERTY = "sourceBaseDir";

5
tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java
View File

@ -20,8 +20,7 @@ import java.net.URLClassLoader;
import java.util.List; import java.util.List;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import org.slf4j.Logger; import org.jboss.logging.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -33,7 +32,7 @@ import static org.junit.Assert.fail;
* @author Hardy Ferentschik * @author Hardy Ferentschik
*/ */
public class TestUtil { 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; private static final String PATH_SEPARATOR = File.separator;
public static final String RESOURCE_SEPARATOR = "/"; public static final String RESOURCE_SEPARATOR = "/";
private static final String PACKAGE_SEPARATOR = "."; private static final String PACKAGE_SEPARATOR = ".";