From 19bc3ba7fcea40ba8a8185119a4d3cdf00a25152 Mon Sep 17 00:00:00 2001 From: JPAV Date: Tue, 22 Feb 2011 16:28:42 -0600 Subject: [PATCH] Modified infinispan module's build to exclude older version of jboss-logging library --- .../test/java/org/hibernate/testing/junit/UnitTestCase.java | 4 +++- hibernate-infinispan/hibernate-infinispan.gradle | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java index 8f6bab6576..5134999c1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java @@ -31,11 +31,13 @@ import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.hibernate.TestLogger; import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.test.common.ServiceRegistryHolder; +import org.jboss.logging.Logger; /** * A basic JUnit {@link junit.framework.TestCase} subclass for @@ -61,7 +63,7 @@ public abstract class UnitTestCase extends junit.framework.TestCase { public void runBare() throws Throwable { final boolean doValidate = getName().endsWith( "FailureExpected" ) && Boolean.getBoolean( "hibernate.test.validatefailureexpected" ); try { - LOG.info("Starting test [" + fullTestName() + "]"); + Logger.getMessageLogger(TestLogger.class, TestLogger.class.getName()).info("Starting test [" + fullTestName() + "]"); super.runBare(); if ( doValidate ) { throw new FailureExpectedTestPassedException(); diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle index 2b3e46b1dd..19e6598568 100644 --- a/hibernate-infinispan/hibernate-infinispan.gradle +++ b/hibernate-infinispan/hibernate-infinispan.gradle @@ -1,5 +1,9 @@ apply plugin: 'java' +configurations { + all*.exclude group: 'org.jboss.logging', module: 'jboss-logging-spi' +} + dependencies { infinispanVersion = '4.2.0.CR4' jnpVersion = '5.0.3.GA'