@@ -36,7 +36,7 @@ configure(allprojects) { project ->
36
36
ext. slf4jVersion = " 1.7.7"
37
37
ext. tiles2Version = " 2.2.2"
38
38
ext. tiles3Version = " 3.0.5"
39
- ext. tomcatVersion = " 8.0.9 "
39
+ ext. tomcatVersion = " 8.0.15 "
40
40
ext. xstreamVersion = " 1.4.7"
41
41
42
42
ext. gradleScriptDir = " ${ rootProject.projectDir} /gradle"
@@ -383,7 +383,7 @@ project("spring-context") {
383
383
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
384
384
optional(" org.codehaus.groovy:groovy-all:${ groovyVersion} " )
385
385
optional(" org.beanshell:bsh:2.0b4" )
386
- optional(" org.jruby:jruby:1.7.16" )
386
+ optional(" org.jruby:jruby:1.7.16.1 " )
387
387
testCompile(" javax.inject:javax.inject-tck:1" )
388
388
testCompile(" commons-dbcp:commons-dbcp:1.4" )
389
389
testCompile(" org.slf4j:slf4j-api:${ slf4jVersion} " )
@@ -880,6 +880,7 @@ project("spring-test") {
880
880
}
881
881
882
882
task testNG(type : Test ) {
883
+ description = ' Runs TestNG tests.'
883
884
useTestNG()
884
885
scanForTestClasses = false
885
886
include([" **/testng/**/*Tests.class" , " **/testng/**/*Test.class" ])
@@ -889,12 +890,14 @@ project("spring-test") {
889
890
}
890
891
891
892
test {
893
+ description = ' Runs JUnit tests.'
892
894
dependsOn testNG
893
895
useJUnit()
894
896
exclude " **/testng/**/*.*"
895
897
}
896
898
897
899
task aggregateTestReports(type : TestReport ) {
900
+ description = ' Aggregates JUnit and TestNG test reports.'
898
901
destinationDir = test. reports. html. destination
899
902
reportOn test, testNG
900
903
}
0 commit comments