From 88f41cdf621255609511f39423d4b6a22a18fb06 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 24 Sep 2013 15:35:51 -0500 Subject: [PATCH] SEC-2341: Update to Gradle 1.8 Some dependencies were necessary to update due to issues with JUnit integration. --- acl/acl.gradle | 2 +- acl/pom.xml | 16 ++++++++-------- aspects/pom.xml | 4 ++-- build.gradle | 2 +- cas/pom.xml | 4 ++-- config/pom.xml | 16 ++++++++-------- core/pom.xml | 16 ++++++++-------- crypto/pom.xml | 4 ++-- gradle/javaprojects.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- itest/context/pom.xml | 4 ++-- itest/web/pom.xml | 4 ++-- ldap/pom.xml | 4 ++-- openid/pom.xml | 4 ++-- remoting/pom.xml | 4 ++-- samples/aspectj-xml/pom.xml | 4 ++-- samples/cas/sample-xml/pom.xml | 4 ++-- samples/cas/server/pom.xml | 4 ++-- samples/concurrency-jc/pom.xml | 4 ++-- samples/contacts-xml/pom.xml | 4 ++-- samples/dms-xml/pom.xml | 4 ++-- samples/form-jc/pom.xml | 4 ++-- samples/gae-xml/pom.xml | 4 ++-- samples/hellomvc-jc/pom.xml | 4 ++-- samples/helloworld-jc/pom.xml | 4 ++-- samples/inmemory-jc/pom.xml | 4 ++-- samples/insecure/pom.xml | 4 ++-- samples/insecuremvc/pom.xml | 4 ++-- samples/jaas-xml/pom.xml | 4 ++-- samples/jdbc-jc/pom.xml | 4 ++-- samples/ldap-jc/pom.xml | 4 ++-- samples/ldap-xml/pom.xml | 4 ++-- samples/messages-jc/pom.xml | 4 ++-- samples/openid-jc/pom.xml | 4 ++-- samples/openid-xml/pom.xml | 4 ++-- samples/preauth-jc/pom.xml | 4 ++-- samples/preauth-xml/pom.xml | 4 ++-- samples/rememberme-jc/pom.xml | 4 ++-- samples/servletapi-xml/pom.xml | 4 ++-- samples/tutorial-xml/pom.xml | 4 ++-- samples/x509-jc/pom.xml | 4 ++-- taglibs/pom.xml | 16 ++++++++++++++-- web/pom.xml | 16 ++++++++-------- 43 files changed, 126 insertions(+), 114 deletions(-) diff --git a/acl/acl.gradle b/acl/acl.gradle index 2ac40b1258..016eed6fcc 100644 --- a/acl/acl.gradle +++ b/acl/acl.gradle @@ -14,5 +14,5 @@ dependencies { "org.springframework:spring-context-support:$springVersion", "org.springframework:spring-test:$springVersion" - testRuntime "hsqldb:hsqldb:$hsqlVersion" + testRuntime "org.hsqldb:hsqldb:$hsqlVersion" } \ No newline at end of file diff --git a/acl/pom.xml b/acl/pom.xml index 6cbe267375..56b614c21b 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -117,16 +117,10 @@ 0.9.29 test - - hsqldb - hsqldb - 1.8.0.10 - test - junit junit - 4.7 + 4.10 test @@ -135,10 +129,16 @@ 1.4 test + + org.hsqldb + hsqldb + 1.8.0.10 + test + org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/aspects/pom.xml b/aspects/pom.xml index 4d0f8f63b5..99f7dab2bc 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -108,7 +108,7 @@ junit junit - 4.7 + 4.10 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/build.gradle b/build.gradle index 2a127ba151..166e52d3eb 100644 --- a/build.gradle +++ b/build.gradle @@ -188,5 +188,5 @@ artifacts { } task wrapper(type: Wrapper) { - gradleVersion = '1.7' + gradleVersion = '1.8' } diff --git a/cas/pom.xml b/cas/pom.xml index 5ad40ccb40..e7eac52701 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -126,7 +126,7 @@ junit junit - 4.7 + 4.10 test @@ -138,7 +138,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/config/pom.xml b/config/pom.xml index 7cc66a4202..8f1f659992 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -187,7 +187,7 @@ junit junit - 4.7 + 4.10 test @@ -259,7 +259,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test @@ -277,37 +277,37 @@ org.powermock powermock-api-mockito - 1.4.12 + 1.5.1 test org.powermock powermock-api-support - 1.4.12 + 1.5.1 test org.powermock powermock-core - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4 - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4-common - 1.4.12 + 1.5.1 test org.powermock powermock-reflect - 1.4.12 + 1.5.1 test diff --git a/core/pom.xml b/core/pom.xml index 132d075e2f..c9a31a157a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -160,7 +160,7 @@ junit junit - 4.7 + 4.10 test @@ -172,43 +172,43 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test org.powermock powermock-api-mockito - 1.4.12 + 1.5.1 test org.powermock powermock-api-support - 1.4.12 + 1.5.1 test org.powermock powermock-core - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4 - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4-common - 1.4.12 + 1.5.1 test org.powermock powermock-reflect - 1.4.12 + 1.5.1 test diff --git a/crypto/pom.xml b/crypto/pom.xml index 6eb7bcc99e..9fb4f41904 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.7 + 4.10 test @@ -89,7 +89,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 3243532de4..666871d545 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -22,7 +22,7 @@ ext.hsqlVersion = '1.8.0.10' ext.slf4jVersion = '1.7.5' ext.logbackVersion = '0.9.29' ext.cglibVersion = '2.2' -ext.powerMockVersion = '1.4.12' +ext.powerMockVersion = '1.5.1' ext.servletApiVersion = '7.0.33' ext.seleniumVersion = '2.33.0' ext.groovyVersion = '2.0.5' @@ -99,8 +99,8 @@ dependencies { exclude(group: 'commons-logging', module: 'commons-logging') } - testCompile 'junit:junit:4.7', - 'org.mockito:mockito-core:1.8.5', + testCompile 'junit:junit:4.10', + 'org.mockito:mockito-core:1.9.5', "org.springframework:spring-test:$springVersion", 'org.easytesting:fest-assert:1.4' @@ -112,11 +112,11 @@ dependencies { [configurations.runtime, configurations.default]*.exclude(module: 'commons-logging') configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.slf4j') { - details.useVersion slf4jVersion - } - } + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.slf4j') { + details.useVersion slf4jVersion + } + } } [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5a42cb0e47..81395e115f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 08 16:30:20 CDT 2013 +#Tue Sep 24 11:43:41 CDT 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip diff --git a/itest/context/pom.xml b/itest/context/pom.xml index fa41cfe779..a5b1385c24 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -119,7 +119,7 @@ junit junit - 4.7 + 4.10 test @@ -143,7 +143,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/itest/web/pom.xml b/itest/web/pom.xml index a90e0f20b2..14d3a80e1f 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -95,7 +95,7 @@ junit junit - 4.7 + 4.10 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/ldap/pom.xml b/ldap/pom.xml index c4d89e5276..adac52692f 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -174,7 +174,7 @@ junit junit - 4.7 + 4.10 test @@ -186,7 +186,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/openid/pom.xml b/openid/pom.xml index acf483814e..74e9fda7d1 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -143,7 +143,7 @@ junit junit - 4.7 + 4.10 test @@ -155,7 +155,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/remoting/pom.xml b/remoting/pom.xml index ac38f7a6bc..7a84f1210a 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -107,7 +107,7 @@ junit junit - 4.7 + 4.10 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 0bfb76084b..3b035f9ce9 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.7 + 4.10 test @@ -114,7 +114,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 5c09fea3c6..17420d6501 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -132,7 +132,7 @@ junit junit - 4.7 + 4.10 test @@ -168,7 +168,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index 67932a0214..7cbbb6da6b 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -78,7 +78,7 @@ junit junit - 4.7 + 4.10 test @@ -90,7 +90,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index 3e1e48e7bd..659bd645bd 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index bcb36af4ff..1ba6a27fee 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index 0583f30536..25f3f92adb 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -132,7 +132,7 @@ junit junit - 4.7 + 4.10 test @@ -144,7 +144,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index a6e4267a2e..aef058f2bb 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index 198fa527a7..caf913ac9d 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -192,7 +192,7 @@ junit junit - 4.7 + 4.10 test @@ -204,7 +204,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index c2e9dafaf1..d1272de4db 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index d433aa43f8..837dfdc657 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -114,7 +114,7 @@ junit junit - 4.7 + 4.10 test @@ -126,7 +126,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 26ee6d0ec6..16442531dd 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 33ec2d12dd..872480633a 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.7 + 4.10 test @@ -114,7 +114,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index bb51041049..05dc27fdab 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -168,7 +168,7 @@ junit junit - 4.7 + 4.10 test @@ -180,7 +180,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index fd35c9c3fa..85d9742ec0 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -144,7 +144,7 @@ junit junit - 4.7 + 4.10 test @@ -156,7 +156,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index 35b8c3a743..d181af1cb3 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index 8a324300b3..a44c3358b3 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -228,7 +228,7 @@ junit junit - 4.7 + 4.10 test @@ -240,7 +240,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index a03511ce1f..c16dd9a9cd 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.7 + 4.10 test @@ -114,7 +114,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index 697f7fe42b..368c232525 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -191,7 +191,7 @@ junit junit - 4.7 + 4.10 test @@ -203,7 +203,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index da1823334b..74de143840 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -198,7 +198,7 @@ junit junit - 4.7 + 4.10 test @@ -210,7 +210,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 33517ab8a3..537c5676e9 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -120,7 +120,7 @@ junit junit - 4.7 + 4.10 test @@ -132,7 +132,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 71a10ad590..7df1bfdeb7 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index d8286e9d5b..1e6a210430 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -96,7 +96,7 @@ junit junit - 4.7 + 4.10 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 2d2eee7b58..36f17b2e2f 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 86bf9884fd..0e2d65fac7 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -150,7 +150,7 @@ junit junit - 4.7 + 4.10 test @@ -162,7 +162,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index d6a247c297..ded08d5364 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -150,7 +150,7 @@ junit junit - 4.7 + 4.10 test @@ -162,7 +162,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index e3e0ef230d..b499ad3272 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -186,7 +186,7 @@ junit junit - 4.7 + 4.10 test @@ -198,7 +198,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test diff --git a/taglibs/pom.xml b/taglibs/pom.xml index 086ae20ce0..5f0e146629 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -143,7 +143,13 @@ junit junit - 4.7 + 4.10 + test + + + org.codehaus.groovy + groovy-all + 2.0.5 test @@ -155,7 +161,7 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test @@ -164,6 +170,12 @@ 1.7.5 test + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + org.springframework spring-test diff --git a/web/pom.xml b/web/pom.xml index 23fb26b340..e2a1ae2123 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -152,7 +152,7 @@ junit junit - 4.7 + 4.10 test @@ -170,43 +170,43 @@ org.mockito mockito-core - 1.8.5 + 1.9.5 test org.powermock powermock-api-mockito - 1.4.12 + 1.5.1 test org.powermock powermock-api-support - 1.4.12 + 1.5.1 test org.powermock powermock-core - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4 - 1.4.12 + 1.5.1 test org.powermock powermock-module-junit4-common - 1.4.12 + 1.5.1 test org.powermock powermock-reflect - 1.4.12 + 1.5.1 test