From 79fa1c70eb7d55806067a432a1bb9aaeef470dc4 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 1 Apr 2014 13:42:21 -0500 Subject: [PATCH] SEC-2542: Polish dependency exclusions This cleans up exclusions so the pom.xml are not as cluttered. --- config/config.gradle | 17 +- config/pom.xml | 464 ------------------------ gradle/javaprojects.gradle | 13 +- samples/cas/sample-xml/cassample.gradle | 4 +- samples/cas/sample-xml/pom.xml | 18 + taglibs/pom.xml | 12 + taglibs/taglibs.gradle | 7 +- web/pom.xml | 136 +------ web/web.gradle | 10 +- 9 files changed, 65 insertions(+), 616 deletions(-) diff --git a/config/config.gradle b/config/config.gradle index 6b7cc36c1c..7699502b29 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -7,12 +7,6 @@ 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'), @@ -40,9 +34,6 @@ 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", "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final", "org.hibernate:hibernate-entitymanager:4.1.0.Final", @@ -57,10 +48,16 @@ dependencies { powerMockDependencies, "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" + "org.hsqldb:hsqldb:2.2.8", + spockDependencies + testCompile('org.openid4java:openid4java-nodeps:0.9.6') { exclude group: 'com.google.code.guice', module: 'guice' } + testCompile('org.springframework.data:spring-data-jpa:1.4.1.RELEASE') { + exclude group: 'org.aspectj', module: 'aspectjrt' + } + testRuntime "org.hsqldb:hsqldb:$hsqlVersion", "cglib:cglib-nodep:2.2" } diff --git a/config/pom.xml b/config/pom.xml index 32dfc0174c..424cf31a51 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -131,20 +131,6 @@ spring-jdbc 3.2.8.RELEASE compile - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - true @@ -152,20 +138,6 @@ spring-tx 3.2.8.RELEASE compile - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - true @@ -205,320 +177,96 @@ jsr250-api 1.0 test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - junit junit 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 @@ -531,20 +279,6 @@ mockito-core 1.9.5 test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - org.openid4java @@ -552,22 +286,10 @@ 0.9.6 test - - mockito-all - org.mockito - - - junit-dep - junit - guice com.google.code.guice - - aspectjrt - org.aspectj - @@ -580,14 +302,6 @@ mockito-all org.mockito - - junit-dep - junit - - - aspectjrt - org.aspectj - @@ -595,120 +309,36 @@ 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 @@ -716,18 +346,10 @@ 0.7-groovy-2.0 test - - mockito-all - org.mockito - junit-dep junit - - aspectjrt - org.aspectj - @@ -736,18 +358,10 @@ 0.7-groovy-2.0 test - - mockito-all - org.mockito - junit-dep junit - - aspectjrt - org.aspectj - @@ -756,14 +370,6 @@ 1.4.1.RELEASE test - - mockito-all - org.mockito - - - junit-dep - junit - aspectjrt org.aspectj @@ -775,100 +381,30 @@ spring-ldap-core 1.3.2.RELEASE test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - org.springframework.security spring-security-cas 3.2.4.CI-SNAPSHOT test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - org.springframework spring-expression 3.2.8.RELEASE test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - org.springframework spring-orm 3.2.8.RELEASE test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - org.springframework spring-test 3.2.8.RELEASE test - - - mockito-all - org.mockito - - - junit-dep - junit - - - aspectjrt - org.aspectj - - diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 43b2268835..0b5c031ccc 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -28,12 +28,23 @@ ext.spockVersion = '0.7-groovy-2.0' ext.gebVersion = '0.9.0' ext.thymeleafVersion = '2.1.2.RELEASE' +ext.spockDependencies = [ + dependencies.create("org.spockframework:spock-spring:$spockVersion") { + exclude group: 'junit', module: 'junit-dep' + }, + dependencies.create("org.spockframework:spock-core:$spockVersion") { + exclude group: 'junit', module: 'junit-dep' + } +] + ext.powerMockDependencies = [ "org.powermock:powermock-core:$powerMockVersion", "org.powermock:powermock-api-support:$powerMockVersion", "org.powermock:powermock-module-junit4-common:$powerMockVersion", "org.powermock:powermock-module-junit4:$powerMockVersion", - "org.powermock:powermock-api-mockito:$powerMockVersion", + dependencies.create("org.powermock:powermock-api-mockito:$powerMockVersion") { + exclude group: 'org.mockito', module: 'mockito-all' + }, "org.powermock:powermock-reflect:$powerMockVersion" ] diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/cas/sample-xml/cassample.gradle index 608e17fb70..bf2bdc0f32 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/cas/sample-xml/cassample.gradle @@ -40,13 +40,13 @@ dependencies { integrationTestCompile project(':spring-security-cas'), "org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion", - "org.spockframework:spock-core:$spockVersion", "org.gebish:geb-spock:$gebVersion", 'commons-httpclient:commons-httpclient:3.1', "org.eclipse.jetty:jetty-server:$jettyVersion", "org.eclipse.jetty:jetty-servlet:$jettyVersion", "org.codehaus.groovy:groovy:$groovyVersion", - "org.slf4j:jcl-over-slf4j:$slf4jVersion" + "org.slf4j:jcl-over-slf4j:$slf4jVersion", + spockDependencies } [jettyRun, jettyRunWar]*.configure { diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index d66cdb1cb3..9fe76d6f0e 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -189,6 +189,24 @@ spock-core 0.7-groovy-2.0 test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + org.springframework diff --git a/taglibs/pom.xml b/taglibs/pom.xml index b8c25586d1..696374a036 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -182,6 +182,18 @@ + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + org.springframework spring-test diff --git a/taglibs/taglibs.gradle b/taglibs/taglibs.gradle index a98f47f503..683bd503c5 100644 --- a/taglibs/taglibs.gradle +++ b/taglibs/taglibs.gradle @@ -14,11 +14,8 @@ dependencies { provided 'javax.servlet.jsp:javax.servlet.jsp-api:2.2.1', "javax.servlet:javax.servlet-api:$servletApiVersion" - testCompile "org.codehaus.groovy:groovy-all:$groovyVersion" - - testCompile("org.spockframework:spock-core:$spockVersion") { - exclude group:'junit', module:'junit-dep' - } + testCompile "org.codehaus.groovy:groovy-all:$groovyVersion", + spockDependencies testRuntime "javax.servlet:jstl:$jstlVersion" } diff --git a/web/pom.xml b/web/pom.xml index 56c08c9c5b..e3adfd5b9f 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -142,64 +142,24 @@ commons-codec 1.3 test - - - mockito-all - org.mockito - - - junit-dep - junit - - junit junit 4.11 test - - - mockito-all - org.mockito - - - junit-dep - junit - - org.codehaus.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 @@ -212,16 +172,6 @@ mockito-core 1.9.5 test - - - mockito-all - org.mockito - - - junit-dep - junit - - org.powermock @@ -233,10 +183,6 @@ mockito-all org.mockito - - junit-dep - junit - @@ -244,96 +190,36 @@ 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 @@ -342,9 +228,17 @@ test - mockito-all - org.mockito + junit-dep + junit + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + junit-dep junit @@ -356,16 +250,6 @@ spring-test 3.2.8.RELEASE test - - - mockito-all - org.mockito - - - junit-dep - junit - - diff --git a/web/web.gradle b/web/web.gradle index 444e505393..f9bc35a163 100644 --- a/web/web.gradle +++ b/web/web.gradle @@ -1,10 +1,5 @@ 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', @@ -22,10 +17,9 @@ dependencies { 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-all:$groovyVersion", - powerMockDependencies + powerMockDependencies, + spockDependencies testRuntime "org.hsqldb:hsqldb:$hsqlVersion" } \ No newline at end of file