diff --git a/config/src/test/resources/log4j.properties b/config/src/test/resources/log4j.properties deleted file mode 100644 index 3818295d70..0000000000 --- a/config/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%p %c{1} - %m%n - -log4j.logger.org.springframework.security=DEBUG - -log4j.logger.org.apache.directory=ERROR diff --git a/config/src/test/resources/logback-test.xml b/config/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..a53fe39b00 --- /dev/null +++ b/config/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 47f6fab0d8..721761c47a 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -9,13 +9,17 @@ apacheDsVersion = '1.5.5' jstlVersion = '1.1.2' jettyVersion = '6.1.22' hsqlVersion = '1.8.0.10' +slf4jVersion = '1.6.1' +logbackVersion = '0.9.24' configurations { provided compile.extendsFrom provided + compile.transitive = false } dependencies { + // We only compile against commons logging. It is excluded from all other configurations compile 'commons-logging:commons-logging:1.1.1' compile ("org.springframework:spring-core:$springVersion") { @@ -29,8 +33,17 @@ dependencies { 'org.hamcrest:hamcrest-core:1.1', 'org.hamcrest:hamcrest-library:1.1', "org.springframework:spring-test:$springVersion" + + // Use slf4j/logback for logging + testRuntime "org.slf4j:slf4j-api:$slf4jVersion", + "org.slf4j:jcl-over-slf4j:$slf4jVersion", + "ch.qos.logback:logback-core:$logbackVersion", + "ch.qos.logback:logback-classic:$logbackVersion" } +// Get rid of commons logging +[configurations.runtime, configurations.default]*.exclude(module: 'commons-logging') + test { onlyIf { !project.hasProperty('skipTests') diff --git a/itest/context/src/test/resources/log4j.properties b/itest/context/src/test/resources/log4j.properties deleted file mode 100644 index 8dee55e627..0000000000 --- a/itest/context/src/test/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -# Logging -# - -log4j.rootLogger=WARN, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%p,%c{1}] %m%n - -log4j.logger.org.springframework.security=WARN -log4j.logger.org.springframework.ldap=WARN -log4j.logger.org.apache.directory=ERROR diff --git a/itest/context/src/test/resources/logback-test.xml b/itest/context/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..a53fe39b00 --- /dev/null +++ b/itest/context/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/ldap/ldap.gradle b/ldap/ldap.gradle index 4bd8091054..d2066ab725 100644 --- a/ldap/ldap.gradle +++ b/ldap/ldap.gradle @@ -2,24 +2,32 @@ test.exclude('**/OpenLDAPIntegrationTestSuite.class') +apacheds_libs = [ + "org.apache.directory.server:apacheds-core:$apacheDsVersion", + "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion", + "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion", + "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion", + "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion", + 'org.apache.directory.shared:shared-ldap:0.9.15' +] + dependencies { compile project(':spring-security-core'), "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context:$springVersion", "org.springframework:spring-tx:$springVersion", - "org.apache.directory.server:apacheds-core:$apacheDsVersion", - "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion", - "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion", - "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion", - "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion", - 'org.apache.directory.shared:shared-ldap:0.9.15', 'ldapsdk:ldapsdk:4.1' + apacheds_libs.collect { + compile (it) { + exclude group: 'org.slf4j' + } + } + compile ("org.springframework.ldap:spring-ldap-core:$springLdapVersion") { exclude(group: 'commons-logging', module: 'commons-logging') exclude(group: 'org.springframework', module: 'spring-core') exclude(group: 'org.springframework', module: 'spring-tx') exclude(group: 'org.springframework', module: 'spring-beans') } +} - runtime 'org.slf4j:slf4j-log4j12:1.4.3' -} \ No newline at end of file diff --git a/ldap/src/test/resources/log4j.properties b/ldap/src/test/resources/log4j.properties deleted file mode 100644 index 8f1d974a4d..0000000000 --- a/ldap/src/test/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Logging -# - -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%p %c{1} - %m%n - -log4j.logger.org.springframework.security=DEBUG -log4j.logger.org.springframework.ldap=DEBUG - -log4j.logger.org.apache.directory=INFO diff --git a/ldap/src/test/resources/logback-test.xml b/ldap/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..a53fe39b00 --- /dev/null +++ b/ldap/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/web/web.gradle b/web/web.gradle index a47e5531d7..ce7febcab7 100644 --- a/web/web.gradle +++ b/web/web.gradle @@ -10,11 +10,11 @@ dependencies { "org.springframework:spring-expression:$springVersion", "org.springframework:spring-jdbc:$springVersion", "org.springframework:spring-tx:$springVersion", - "org.springframework:spring-web:$springVersion", - "org.springframework:spring-test:$springVersion" + "org.springframework:spring-web:$springVersion" provided 'javax.servlet:servlet-api:2.5' - testCompile 'commons-codec:commons-codec:1.3' + testCompile 'commons-codec:commons-codec:1.3', + "org.springframework:spring-test:$springVersion" testRuntime "hsqldb:hsqldb:$hsqlVersion" }