diff --git a/aspects/pom.xml b/aspects/pom.xml index 24743bc8ca..2f454295f2 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -11,10 +11,6 @@ spring-security-aspects Spring Security - Aspects - - commons-logging - commons-logging - org.aspectj aspectjweaver diff --git a/config/pom.xml b/config/pom.xml index 60b9151e50..4131308761 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -41,10 +41,6 @@ ${project.version} test - - commons-logging - commons-logging - org.springframework.security spring-security-ldap @@ -76,7 +72,7 @@ org.slf4j slf4j-log4j12 - 1.5.10 + 1.6.0 test diff --git a/core/pom.xml b/core/pom.xml index 6755513aa1..33ca91b01d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -65,10 +65,6 @@ ehcache true - - commons-logging - commons-logging - commons-collections commons-collections diff --git a/itest/pom.xml b/itest/pom.xml index 32e10bdbde..91015481f1 100644 --- a/itest/pom.xml +++ b/itest/pom.xml @@ -66,19 +66,19 @@ org.slf4j slf4j-api - 1.5.10 + 1.6.0 runtime org.slf4j slf4j-log4j12 - 1.5.10 + 1.6.0 runtime org.slf4j jcl-over-slf4j - 1.5.10 + 1.6.0 runtime diff --git a/ldap/pom.xml b/ldap/pom.xml index 217b7cee27..85316f1e3c 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -19,10 +19,6 @@ org.springframework.ldap spring-ldap-core - - commons-logging - commons-logging - ldapsdk ldapsdk diff --git a/pom.xml b/pom.xml index a81ed0e3ef..3dbe99228b 100644 --- a/pom.xml +++ b/pom.xml @@ -477,12 +477,6 @@ org.springframework spring-core ${spring.version} - - - commons-logging - commons-logging - - org.springframework @@ -591,12 +585,6 @@ hsqldb 1.8.0.10 - - commons-logging - commons-logging - 1.1.1 - true - javax.servlet servlet-api diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml index 8db8b8dbd6..2eab51925a 100644 --- a/samples/cas/client/pom.xml +++ b/samples/cas/client/pom.xml @@ -27,7 +27,13 @@ org.springframework - spring-web + spring-core + + + commons-logging + commons-logging + + org.springframework @@ -43,13 +49,28 @@ spring-aop runtime - + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + runtime + org.slf4j slf4j-log4j12 - 1.4.3 + 1.6.0 + runtime + + + log4j + log4j runtime - true diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml index fe6a5fc302..81c9ecdff8 100644 --- a/samples/contacts/pom.xml +++ b/samples/contacts/pom.xml @@ -30,6 +30,16 @@ spring-security-taglibs ${project.version} + + org.springframework + spring-core + + + commons-logging + commons-logging + + + org.springframework spring-webmvc @@ -75,6 +85,23 @@ hsqldb runtime + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + + + org.slf4j + slf4j-log4j12 + 1.6.0 + runtime + log4j log4j diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml index 320f3ef10b..6bdbc313d5 100644 --- a/samples/ldap/pom.xml +++ b/samples/ldap/pom.xml @@ -27,7 +27,13 @@ org.springframework - spring-web + spring-core + + + commons-logging + commons-logging + + org.springframework @@ -53,10 +59,27 @@ compile true + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + runtime + org.slf4j slf4j-log4j12 - 1.5.8 + 1.6.0 + runtime + + + log4j + log4j runtime diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml index ce7c91ed58..3920b8f294 100644 --- a/samples/openid/pom.xml +++ b/samples/openid/pom.xml @@ -32,10 +32,14 @@ org.springframework - spring-web - runtime - - + spring-core + + + commons-logging + commons-logging + + + org.springframework spring-webmvc runtime @@ -58,6 +62,24 @@ taglibs standard + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + runtime + + + org.slf4j + slf4j-log4j12 + 1.6.0 + runtime + log4j log4j diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml index 9cdba2ae4f..cbd2583f85 100644 --- a/samples/preauth/pom.xml +++ b/samples/preauth/pom.xml @@ -16,6 +16,16 @@ ${project.version} runtime + + org.springframework + spring-core + + + commons-logging + commons-logging + + + org.springframework.security spring-security-web @@ -33,6 +43,29 @@ spring-jdbc runtime + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + runtime + + + org.slf4j + slf4j-log4j12 + 1.6.0 + runtime + + + log4j + log4j + runtime + diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index a7ca203ce3..e9d3b76a90 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -25,6 +25,16 @@ spring-security-taglibs ${project.version} + + org.springframework + spring-core + + + commons-logging + commons-logging + + + org.springframework spring-web @@ -58,6 +68,24 @@ standard runtime + + org.slf4j + slf4j-api + 1.6.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.6.0 + runtime + + + org.slf4j + slf4j-log4j12 + 1.6.0 + runtime + log4j log4j diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml index 91c52215e4..d890d7bb45 100755 --- a/sandbox/heavyduty/pom.xml +++ b/sandbox/heavyduty/pom.xml @@ -26,7 +26,6 @@ spring-security-taglibs ${spring.security.version} - org.springframework spring-context-support @@ -53,22 +52,6 @@ spring-orm ${spring.version} - - org.freemarker freemarker @@ -140,13 +123,13 @@ org.slf4j slf4j-api - 1.5.8 + 1.6.0 runtime org.slf4j slf4j-log4j12 - 1.5.8 + 1.6.0 runtime