From 3118e39de8ee9262fc64d1193eb8d2801e721c6e Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 2 Apr 2014 08:48:55 -0500 Subject: [PATCH] SEC-2542: Use exclusions to remove duplicate dependencies A number of projects had duplicate dependencies on their classpaths as a result of the same classes being available in more than one artifact, each with different Maven coordinates. Typically this only affected the tests, but meant that the actual classes that were loaded was somewhat unpredictable and had the potential to vary between an IDE and the command line depending on the order in which the aritfacts appeared on the classpath. This commit adds a number of exclusions to remove such duplicates. In addition to the new exclusions, notable other changes are: - Spring Data JPA has been updated to 1.4.1. This brings its transitive dependency upon spring-data-commons into line with Spring LDAP's and prevents both spring-data-commons-core and spring-data-commons from being on the classpath - All Servlet API dependencies have been updated to use the official artifact with all transitive dependencies on unofficial servlet API artifacts being excluded. - In places, groovy has been replaced with groovy-all. This removes some duplicates caused by groovy's transitive dependencies. - JUnit has been updated to 4.11 which brings its transitive Hamcrest dependency into line with other components. There appears to be a bug in Gradle which means that some exclusions applied to an artifact do not work reliably. To work around this problem it has been necessary to apply some exclusions at the configuration level Conflicts: samples/messages-jc/pom.xml --- acl/pom.xml | 2 +- aspects/pom.xml | 2 +- cas/cas.gradle | 2 +- cas/pom.xml | 8 +- config/config.gradle | 13 +- config/pom.xml | 498 ++++++++++++++++++++++- core/core.gradle | 2 + core/pom.xml | 74 +++- crypto/pom.xml | 2 +- gradle/javaprojects.gradle | 6 +- itest/context/itest-context.gradle | 2 +- itest/context/pom.xml | 12 +- itest/web/itest-web.gradle | 15 +- itest/web/pom.xml | 30 +- ldap/pom.xml | 2 +- openid/openid.gradle | 2 +- openid/pom.xml | 8 +- remoting/pom.xml | 2 +- samples/aspectj-xml/pom.xml | 2 +- samples/cas/sample-xml/cassample.gradle | 5 +- samples/cas/sample-xml/pom.xml | 8 +- samples/cas/server/pom.xml | 2 +- samples/concurrency-jc/pom.xml | 2 +- samples/contacts-xml/contacts.gradle | 2 +- samples/contacts-xml/pom.xml | 8 +- samples/dms-xml/pom.xml | 2 +- samples/form-jc/pom.xml | 2 +- samples/gae-xml/gae.gradle | 2 +- samples/gae-xml/pom.xml | 8 +- samples/hellojs-jc/pom.xml | 2 +- samples/hellomvc-jc/pom.xml | 2 +- samples/helloworld-jc/pom.xml | 2 +- samples/inmemory-jc/pom.xml | 2 +- samples/insecure/pom.xml | 2 +- samples/insecuremvc/pom.xml | 2 +- samples/jaas-xml/jaas.gradle | 2 +- samples/jaas-xml/pom.xml | 8 +- samples/jdbc-jc/pom.xml | 2 +- samples/ldap-jc/pom.xml | 2 +- samples/ldap-xml/pom.xml | 2 +- samples/messages-jc/build.gradle | 8 +- samples/messages-jc/pom.xml | 14 +- samples/openid-jc/pom.xml | 2 +- samples/openid-xml/openid.gradle | 2 +- samples/openid-xml/pom.xml | 8 +- samples/preauth-jc/pom.xml | 2 +- samples/preauth-xml/pom.xml | 2 +- samples/rememberme-jc/pom.xml | 2 +- samples/servletapi-xml/pom.xml | 8 +- samples/servletapi-xml/servletapi.gradle | 2 +- samples/tutorial-xml/pom.xml | 8 +- samples/tutorial-xml/tutorial.gradle | 2 +- samples/x509-jc/pom.xml | 2 +- sandbox/heavyduty/build.gradle | 2 +- taglibs/pom.xml | 20 +- taglibs/taglibs.gradle | 11 +- web/pom.xml | 150 ++++++- web/web.gradle | 9 +- 58 files changed, 887 insertions(+), 120 deletions(-) diff --git a/acl/pom.xml b/acl/pom.xml index 7a2dce7d5e..8e7a080f1d 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -120,7 +120,7 @@ junit junit - 4.10 + 4.11 test diff --git a/aspects/pom.xml b/aspects/pom.xml index c16ffb6cec..de279fc98f 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -108,7 +108,7 @@ junit junit - 4.10 + 4.11 test diff --git a/cas/cas.gradle b/cas/cas.gradle index d6262ff5c3..d5996a8b4c 100644 --- a/cas/cas.gradle +++ b/cas/cas.gradle @@ -9,5 +9,5 @@ dependencies { optional "net.sf.ehcache:ehcache:$ehcacheVersion" - provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided "javax.servlet:javax.servlet-api:$servletApiVersion" } diff --git a/cas/pom.xml b/cas/pom.xml index fe720ed26e..a7125cfd72 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -112,9 +112,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -126,7 +126,7 @@ junit junit - 4.10 + 4.11 test diff --git a/config/config.gradle b/config/config.gradle index 579972d887..6b7cc36c1c 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -7,6 +7,12 @@ apply plugin: 'trang' compileTestJava.dependsOn(':spring-security-core:compileTestJava') +configurations { + testCompile.exclude group: 'org.mockito', module: 'mockito-all' + testCompile.exclude group: 'junit', module: 'junit-dep' + testCompile.exclude group: 'org.aspectj', module: 'aspectjrt' // Weaver is a superset of RT +} + dependencies { // NB: Don't add other compile time dependencies to the config module as this breaks tooling compile project(':spring-security-core'), @@ -24,7 +30,7 @@ dependencies { "org.springframework:spring-jdbc:$springVersion", "org.springframework:spring-tx:$springVersion" - provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided "javax.servlet:javax.servlet-api:$servletApiVersion" testCompile project(':spring-security-cas'), project(':spring-security-core').sourceSets.test.output, @@ -34,6 +40,7 @@ dependencies { "org.springframework:spring-jdbc:$springVersion", "org.springframework:spring-orm:$springVersion", "org.springframework:spring-tx:$springVersion", + 'org.springframework.data:spring-data-jpa:1.4.1.RELEASE', "org.spockframework:spock-core:$spockVersion", "org.spockframework:spock-spring:$spockVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion", @@ -48,14 +55,12 @@ dependencies { 'org.apache.directory.shared:shared-ldap:0.9.15', 'ldapsdk:ldapsdk:4.1', powerMockDependencies, - "org.springframework.data:spring-data-jpa:1.2.0.RELEASE", "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final", "org.hibernate:hibernate-entitymanager:3.6.10.Final", "org.hsqldb:hsqldb:2.2.8" testCompile('org.openid4java:openid4java-nodeps:0.9.6') { - exclude group: 'com.google.code.guice', module: 'guice' + exclude group: 'com.google.code.guice', module: 'guice' } - testRuntime "org.hsqldb:hsqldb:$hsqlVersion", "cglib:cglib-nodep:2.2" } diff --git a/config/pom.xml b/config/pom.xml index 1e130ba531..d8421fe120 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -131,6 +131,20 @@ spring-jdbc 4.0.2.RELEASE compile + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + true @@ -138,6 +152,20 @@ spring-tx 4.0.2.RELEASE compile + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + true @@ -155,9 +183,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -177,96 +205,320 @@ jsr250-api 1.0 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + junit junit - 4.10 + 4.11 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + ldapsdk ldapsdk 4.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.server apacheds-core 1.5.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.server apacheds-core-entry 1.5.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.server apacheds-protocol-ldap 1.5.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.server apacheds-protocol-shared 1.5.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.server apacheds-server-jndi 1.5.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.apache.directory.shared shared-ldap 0.9.15 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.codehaus.groovy groovy-all 2.0.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.easytesting fest-assert 1.4 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.0.Final test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hibernate hibernate-entitymanager 4.1.0.Final test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hibernate hibernate-entitymanager 3.6.10.Final test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hsqldb hsqldb 2.2.8 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.hsqldb @@ -279,6 +531,20 @@ mockito-core 1.9.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.openid4java @@ -286,10 +552,22 @@ 0.9.6 test + + mockito-all + org.mockito + + + junit-dep + junit + guice com.google.code.guice + + aspectjrt + org.aspectj + @@ -297,90 +575,300 @@ powermock-api-mockito 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.powermock powermock-api-support 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.powermock powermock-core 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.powermock powermock-module-junit4 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.powermock powermock-module-junit4-common 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.powermock powermock-reflect 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.slf4j jcl-over-slf4j 1.7.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.spockframework spock-core 0.7-groovy-2.0 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.spockframework spock-spring 0.7-groovy-2.0 test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework.data spring-data-jpa - 1.2.0.RELEASE + 1.4.1.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework.ldap spring-ldap-core 2.0.1.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework.security spring-security-cas 4.0.0.CI-SNAPSHOT test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework spring-expression 4.0.2.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework spring-orm 4.0.2.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + org.springframework spring-test 4.0.2.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + + aspectjrt + org.aspectj + + diff --git a/core/core.gradle b/core/core.gradle index 4e7a4f9948..be30605705 100644 --- a/core/core.gradle +++ b/core/core.gradle @@ -8,6 +8,8 @@ configurations { included compile.extendsFrom included + + testCompile.exclude group: 'org.mockito', module: 'mockito-all' } dependencies { diff --git a/core/pom.xml b/core/pom.xml index fbf28a5fad..655f2bd1d3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -150,18 +150,36 @@ commons-collections 3.2 test + + + mockito-all + org.mockito + + junit junit - 4.10 + 4.11 test + + + mockito-all + org.mockito + + org.easytesting fest-assert 1.4 test + + + mockito-all + org.mockito + + org.hsqldb @@ -174,54 +192,108 @@ mockito-core 1.9.5 test + + + mockito-all + org.mockito + + org.powermock powermock-api-mockito 1.5.1 test + + + mockito-all + org.mockito + + org.powermock powermock-api-support 1.5.1 test + + + mockito-all + org.mockito + + org.powermock powermock-core 1.5.1 test + + + mockito-all + org.mockito + + org.powermock powermock-module-junit4 1.5.1 test + + + mockito-all + org.mockito + + org.powermock powermock-module-junit4-common 1.5.1 test + + + mockito-all + org.mockito + + org.powermock powermock-reflect 1.5.1 test + + + mockito-all + org.mockito + + org.slf4j jcl-over-slf4j 1.7.5 test + + + mockito-all + org.mockito + + org.springframework spring-test 4.0.2.RELEASE test + + + mockito-all + org.mockito + + diff --git a/crypto/pom.xml b/crypto/pom.xml index 2c321a24e1..0217c3d953 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.10 + 4.11 test diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 203eaf1b3c..3a673375ff 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -21,7 +21,7 @@ ext.slf4jVersion = '1.7.5' ext.logbackVersion = '0.9.29' ext.cglibVersion = '2.2' ext.powerMockVersion = '1.5.1' -ext.servletApiVersion = '7.0.33' +ext.servletApiVersion = '3.0.1' ext.seleniumVersion = '2.33.0' ext.groovyVersion = '2.0.5' ext.spockVersion = '0.7-groovy-2.0' @@ -82,7 +82,7 @@ dependencies { exclude(group: 'commons-logging', module: 'commons-logging') } - testCompile 'junit:junit:4.10', + testCompile 'junit:junit:4.11', 'org.mockito:mockito-core:1.9.5', "org.springframework:spring-test:$springVersion", 'org.easytesting:fest-assert:1.4' @@ -92,7 +92,7 @@ dependencies { "ch.qos.logback:logback-classic:$logbackVersion" } -[configurations.runtime, configurations.default]*.exclude(module: 'commons-logging') +[configurations.runtime, configurations.default, configurations.testCompile]*.exclude(module: 'commons-logging') configurations.all { resolutionStrategy.eachDependency { DependencyResolveDetails details -> diff --git a/itest/context/itest-context.gradle b/itest/context/itest-context.gradle index 5676fd47e4..c61cd812b0 100644 --- a/itest/context/itest-context.gradle +++ b/itest/context/itest-context.gradle @@ -10,7 +10,7 @@ dependencies { "org.springframework:spring-beans:$springVersion" testCompile project(':spring-security-web'), - "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion", + "javax.servlet:javax.servlet-api:$servletApiVersion", "org.springframework:spring-web:$springVersion" testRuntime project(':spring-security-config'), "org.aspectj:aspectjweaver:$aspectjVersion" diff --git a/itest/context/pom.xml b/itest/context/pom.xml index 30c6f6911e..3b96571829 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -117,15 +117,15 @@ test - junit - junit - 4.10 + javax.servlet + javax.servlet-api + 3.0.1 test - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + junit + junit + 4.11 test diff --git a/itest/web/itest-web.gradle b/itest/web/itest-web.gradle index 44680193ff..995c470b2f 100644 --- a/itest/web/itest-web.gradle +++ b/itest/web/itest-web.gradle @@ -3,22 +3,29 @@ dependencies { compile "org.springframework:spring-context:$springVersion", "org.springframework:spring-web:$springVersion" - provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided "javax.servlet:javax.servlet-api:$servletApiVersion" testCompile project(':spring-security-core'), project(':spring-security-web'), project(':spring-security-taglibs'), "org.springframework:spring-beans:$springVersion", "org.springframework:spring-webmvc:$springVersion", - "org.mortbay.jetty:jetty:$jettyVersion", "org.mortbay.jetty:jetty-util:$jettyVersion", - 'net.sourceforge.jwebunit:jwebunit-core:2.2', "org.testng:testng:5.11:jdk15" + testCompile ("org.mortbay.jetty:jetty:$jettyVersion") { + exclude group: 'org.mortbay.jetty', module: 'servlet-api' + } + testCompile ('net.sourceforge.jwebunit:jwebunit-core:2.2') { + exclude group: 'javax.servlet', module: 'servlet-api' + exclude group: 'regexp', module: 'regexp' + } testRuntime project(':spring-security-config'), project(':spring-security-ldap'), "org.mortbay.jetty:jsp-2.1-jetty:$jettyVersion", - 'net.sourceforge.jwebunit:jwebunit-htmlunit-plugin:2.2' + testRuntime ('net.sourceforge.jwebunit:jwebunit-htmlunit-plugin:2.2') { + exclude group: 'javax.servlet', module: 'servlet-api' + } } integrationTest { diff --git a/itest/web/pom.xml b/itest/web/pom.xml index a7b6fe39e5..a4072808f4 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -81,9 +81,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -95,7 +95,7 @@ junit junit - 4.10 + 4.11 test @@ -103,12 +103,28 @@ jwebunit-core 2.2 test + + + regexp + regexp + + + servlet-api + javax.servlet + + net.sourceforge.jwebunit jwebunit-htmlunit-plugin 2.2 test + + + servlet-api + javax.servlet + + org.easytesting @@ -127,6 +143,12 @@ jetty 6.1.26 test + + + servlet-api + org.mortbay.jetty + + org.mortbay.jetty diff --git a/ldap/pom.xml b/ldap/pom.xml index 232c816314..575f499775 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -174,7 +174,7 @@ junit junit - 4.10 + 4.11 test diff --git a/openid/openid.gradle b/openid/openid.gradle index 360563b2a7..f735168a35 100644 --- a/openid/openid.gradle +++ b/openid/openid.gradle @@ -16,7 +16,7 @@ dependencies { } compile 'com.google.inject:guice:2.0' - provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided "javax.servlet:javax.servlet-api:$servletApiVersion" runtime 'org.apache.httpcomponents:httpclient:4.2.3' } diff --git a/openid/pom.xml b/openid/pom.xml index 8d581605b5..72b8254d2e 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -123,9 +123,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -143,7 +143,7 @@ junit junit - 4.10 + 4.11 test diff --git a/remoting/pom.xml b/remoting/pom.xml index 67165887c1..c643ed0b12 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -107,7 +107,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 1a93a1f677..65695cd4ed 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/cas/sample-xml/cassample.gradle index 0fe83ea348..ea4fbd8e2f 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/cas/sample-xml/cassample.gradle @@ -26,7 +26,7 @@ sourceSets { eclipse.classpath.plusConfigurations += configurations.integrationTestRuntime dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), project(':spring-security-cas'), @@ -46,7 +46,8 @@ dependencies { 'commons-httpclient:commons-httpclient:3.1', "org.eclipse.jetty:jetty-server:$jettyVersion", "org.eclipse.jetty:jetty-servlet:$jettyVersion", - "org.codehaus.groovy:groovy:$groovyVersion" + "org.codehaus.groovy:groovy:$groovyVersion", + "org.slf4j:jcl-over-slf4j:$slf4jVersion" } [jettyRun, jettyRunWar]*.configure { diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index a8fcc6d43d..526b612462 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -95,9 +95,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -145,7 +145,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index 09d57618cc..206b11f9cc 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -85,7 +85,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index e139a4ba69..fe7da1f421 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/contacts-xml/contacts.gradle b/samples/contacts-xml/contacts.gradle index 5b24ab7dc3..0d548a609c 100644 --- a/samples/contacts-xml/contacts.gradle +++ b/samples/contacts-xml/contacts.gradle @@ -3,7 +3,7 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), project(':spring-security-acl'), diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index c583f3e267..8fde30751a 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -131,9 +131,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index ed8c6a5fea..faa130a889 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -132,7 +132,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index 0ba29c3bdd..5f784afc36 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/gae-xml/gae.gradle b/samples/gae-xml/gae.gradle index 927614935a..e2d80eb3a3 100644 --- a/samples/gae-xml/gae.gradle +++ b/samples/gae-xml/gae.gradle @@ -21,7 +21,7 @@ repositories { configurations.runtime.exclude(group: 'ch.qos.logback') dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), project(':spring-security-web'), diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index 225333f07f..b4199b42d9 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -143,9 +143,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -199,7 +199,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index b2bc5fbf34..a506261a2d 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -199,7 +199,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index 8b6cd586ad..76d2a6ba2f 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 95a9aa68bc..75367dacc2 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -121,7 +121,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 13ea3e0a40..f2a3edf432 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 806b52f96a..dd7fe308a3 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -109,7 +109,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 54a430baca..9a0bdf1ee7 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -175,7 +175,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/jaas-xml/jaas.gradle b/samples/jaas-xml/jaas.gradle index ff1429c682..1c115ed0ac 100644 --- a/samples/jaas-xml/jaas.gradle +++ b/samples/jaas-xml/jaas.gradle @@ -12,7 +12,7 @@ configurations { } dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), "org.springframework:spring-beans:$springVersion", diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 1fce106b77..ab37b6b369 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -101,9 +101,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -151,7 +151,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index 0138143130..7a25d8e9b2 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index d4c4926872..32f598e6fc 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -235,7 +235,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index 5e9402ee81..dfa4e2fdbe 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -109,7 +109,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/messages-jc/build.gradle b/samples/messages-jc/build.gradle index 9f494aeb45..b70f363c3c 100644 --- a/samples/messages-jc/build.gradle +++ b/samples/messages-jc/build.gradle @@ -7,7 +7,6 @@ dependencies { compile project(":spring-security-web"), project(":spring-security-config"), "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final", - "org.hibernate:hibernate-entitymanager:3.6.10.Final", "org.hsqldb:hsqldb:2.2.8", "javax.validation:validation-api:1.0.0.GA", "org.hibernate:hibernate-validator:4.2.0.Final", @@ -20,7 +19,12 @@ dependencies { "org.springframework:spring-instrument:$springVersion", "org.springframework:spring-core:$springVersion", "org.springframework:spring-aspects:$springVersion", - "org.springframework.data:spring-data-jpa:1.3.4.RELEASE", "org.thymeleaf:thymeleaf-spring3:$thymeleafVersion", "org.thymeleaf.extras:thymeleaf-extras-tiles2:2.1.0.RELEASE" + compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') { + exclude group:'javassist', module: 'javassist' + } + compile('org.springframework.data:spring-data-jpa:1.3.4.RELEASE') { + exclude group:'org.aspectj', module:'aspectjrt' + } } diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index c5689d7250..ab135a0606 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -66,6 +66,12 @@ hibernate-entitymanager 3.6.10.Final compile + + + javassist + javassist + + org.hibernate @@ -84,6 +90,12 @@ spring-data-jpa 1.3.4.RELEASE compile + + + aspectjrt + org.aspectj + + org.springframework.security @@ -197,7 +209,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 79fa7ea1f6..8c550eb451 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -205,7 +205,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/openid-xml/openid.gradle b/samples/openid-xml/openid.gradle index 2a7b1842e7..24e36dfecd 100644 --- a/samples/openid-xml/openid.gradle +++ b/samples/openid-xml/openid.gradle @@ -7,7 +7,7 @@ dependencies { compile project(':spring-security-core'), project(':spring-security-openid') - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" runtime project(':spring-security-config'), project(':spring-security-taglibs'), diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index b10e6fd8dc..07e2148cd9 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -89,9 +89,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -127,7 +127,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index cd95244890..af82bab52b 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index 0f79ff700f..31090c19b6 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -103,7 +103,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 83ee1ad127..562cf31a2b 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 642bc029e0..3e7032f378 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -119,9 +119,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -157,7 +157,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/servletapi-xml/servletapi.gradle b/samples/servletapi-xml/servletapi.gradle index 5161c79ab1..7ba353b046 100644 --- a/samples/servletapi-xml/servletapi.gradle +++ b/samples/servletapi-xml/servletapi.gradle @@ -13,7 +13,7 @@ configurations { } dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), project(':spring-security-web'), diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index f14de3b837..e01ae878c1 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -107,9 +107,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -157,7 +157,7 @@ junit junit - 4.10 + 4.11 test diff --git a/samples/tutorial-xml/tutorial.gradle b/samples/tutorial-xml/tutorial.gradle index ca17f8f4de..61fac07389 100644 --- a/samples/tutorial-xml/tutorial.gradle +++ b/samples/tutorial-xml/tutorial.gradle @@ -16,7 +16,7 @@ configurations { } dependencies { - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" compile project(':spring-security-core'), "org.springframework:spring-beans:$springVersion", diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index 3affbfb177..ff120e17ba 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -193,7 +193,7 @@ junit junit - 4.10 + 4.11 test diff --git a/sandbox/heavyduty/build.gradle b/sandbox/heavyduty/build.gradle index 0fef98de5a..f20488c814 100644 --- a/sandbox/heavyduty/build.gradle +++ b/sandbox/heavyduty/build.gradle @@ -26,7 +26,7 @@ dependencies { 'javax.persistence:persistence-api:1.0', 'org.slf4j:jcl-over-slf4j:1.5.11' - providedCompile "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" runtime 'org.hibernate:hibernate-entitymanager:3.4.0.GA', "org.springframework:spring-context-support:$springVersion", diff --git a/taglibs/pom.xml b/taglibs/pom.xml index 44fd491e83..0da5c30175 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -117,15 +117,15 @@ true - javax.servlet - jsp-api - 2.0 + javax.servlet.jsp + javax.servlet.jsp-api + 2.2.1 provided - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -143,7 +143,7 @@ junit junit - 4.10 + 4.11 test @@ -175,6 +175,12 @@ spock-core 0.7-groovy-2.0 test + + + junit-dep + junit + + org.springframework diff --git a/taglibs/taglibs.gradle b/taglibs/taglibs.gradle index 20d9f19d52..7363a8e900 100644 --- a/taglibs/taglibs.gradle +++ b/taglibs/taglibs.gradle @@ -11,11 +11,14 @@ dependencies { "org.springframework:spring-expression:$springVersion", "org.springframework:spring-web:$springVersion" - provided 'javax.servlet:jsp-api:2.0', - "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided 'javax.servlet.jsp:javax.servlet.jsp-api:2.2.1', + "javax.servlet:javax.servlet-api:$servletApiVersion" - testCompile "org.codehaus.groovy:groovy-all:$groovyVersion", - "org.spockframework:spock-core:$spockVersion" + testCompile "org.codehaus.groovy:groovy-all:$groovyVersion" + + testCompile("org.spockframework:spock-core:$spockVersion") { + exclude group:'junit', module:'junit-dep' + } testRuntime "javax.servlet:jstl:$jstlVersion" } diff --git a/web/pom.xml b/web/pom.xml index ea26bf2b27..679eda8840 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -126,9 +126,9 @@ true - org.apache.tomcat - tomcat-servlet-api - 7.0.33 + javax.servlet + javax.servlet-api + 3.0.1 provided @@ -142,24 +142,64 @@ commons-codec 1.3 test + + + mockito-all + org.mockito + + + junit-dep + junit + + junit junit - 4.10 + 4.11 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.codehaus.groovy - groovy + groovy-all 2.0.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.easytesting fest-assert 1.4 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.hsqldb @@ -172,60 +212,160 @@ mockito-core 1.9.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-api-mockito 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-api-support 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-core 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-module-junit4 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-module-junit4-common 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.powermock powermock-reflect 1.5.1 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.slf4j jcl-over-slf4j 1.7.5 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.spockframework spock-core 0.7-groovy-2.0 test + + + mockito-all + org.mockito + + + junit-dep + junit + + org.springframework spring-test 4.0.2.RELEASE test + + + mockito-all + org.mockito + + + junit-dep + junit + + diff --git a/web/web.gradle b/web/web.gradle index 8cd750d33b..444e505393 100644 --- a/web/web.gradle +++ b/web/web.gradle @@ -1,5 +1,10 @@ apply plugin: 'groovy' +configurations { + testCompile.exclude group: 'org.mockito', module: 'mockito-all' + testCompile.exclude group: 'junit', module: 'junit-dep' +} + dependencies { compile project(':spring-security-core'), 'aopalliance:aopalliance:1.0', @@ -12,14 +17,14 @@ dependencies { "org.springframework:spring-jdbc:$springVersion", "org.springframework:spring-tx:$springVersion" - provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion" + provided "javax.servlet:javax.servlet-api:$servletApiVersion" testCompile project(':spring-security-core').sourceSets.test.output, 'commons-codec:commons-codec:1.3', "org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.spockframework:spock-core:$spockVersion", "org.springframework:spring-test:$springVersion", - "org.codehaus.groovy:groovy:$groovyVersion", + "org.codehaus.groovy:groovy-all:$groovyVersion", powerMockDependencies testRuntime "org.hsqldb:hsqldb:$hsqlVersion"