@@ -236,7 +236,7 @@ project("spring-core") {
236
236
compile(files(asmRepackJar))
237
237
compile(" commons-logging:commons-logging:1.1.1" )
238
238
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
239
- optional(" net.sf.jopt-simple:jopt-simple:4.4 " )
239
+ optional(" net.sf.jopt-simple:jopt-simple:3.3 " )
240
240
optional(" log4j:log4j:1.2.17" )
241
241
testCompile(" xmlunit:xmlunit:1.3" )
242
242
testCompile(" org.codehaus.woodstox:wstx-asl:3.2.7" ) {
@@ -849,23 +849,23 @@ configure(rootProject) {
849
849
configurations. archives. artifacts. clear()
850
850
851
851
dependencies { // for integration tests
852
- testCompile(project(" :spring-core" ))
853
- testCompile(project(" :spring-beans" ))
854
852
testCompile(project(" :spring-aop" ))
855
- testCompile(project(" :spring-expression " ))
853
+ testCompile(project(" :spring-beans " ))
856
854
testCompile(project(" :spring-context" ))
857
- testCompile(project(" :spring-tx" ))
855
+ testCompile(project(" :spring-core" ))
856
+ testCompile(project(" :spring-expression" ))
858
857
testCompile(project(" :spring-jdbc" ))
858
+ testCompile(project(" :spring-orm" ))
859
859
testCompile(project(" :spring-test" ))
860
+ testCompile(project(" :spring-tx" ))
860
861
testCompile(project(" :spring-web" ))
861
862
testCompile(project(" :spring-webmvc-portlet" ))
862
- testCompile(project(" :spring-orm" ))
863
- testCompile(" org.hibernate:hibernate-core:4.1.9.Final" )
864
863
testCompile(" javax.servlet:servlet-api:2.5" )
865
864
testCompile(" javax.portlet:portlet-api:2.0" )
866
865
testCompile(" javax.inject:javax.inject:1" )
867
866
testCompile(" javax.resource:connector-api:1.5" )
868
867
testCompile(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
868
+ testCompile(" org.hibernate:hibernate-core:4.1.9.Final" )
869
869
testCompile(" hsqldb:hsqldb:${ hsqldbVersion} " )
870
870
}
871
871
@@ -886,7 +886,7 @@ configure(rootProject) {
886
886
options. stylesheetFile = file(" src/api/stylesheet.css" )
887
887
options. splitIndex = true
888
888
options. links(project. ext. javadocLinks)
889
- if (JavaVersion . current(). isJava8Compatible()) {
889
+ if (JavaVersion . current(). isJava8Compatible()) {
890
890
options. addStringOption(' Xdoclint:none' , ' -quiet' )
891
891
}
892
892
0 commit comments