Skip to content

Commit b4115f3

Browse files
committed
Downgraded JOpt build dependency to 3.3
Avoiding accidental use of OptionSet.specs(), as introduced in the JOpt 4.x line.
1 parent 7e2167f commit b4115f3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ project("spring-core") {
236236
compile(files(asmRepackJar))
237237
compile("commons-logging:commons-logging:1.1.1")
238238
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")
240240
optional("log4j:log4j:1.2.17")
241241
testCompile("xmlunit:xmlunit:1.3")
242242
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
@@ -849,23 +849,23 @@ configure(rootProject) {
849849
configurations.archives.artifacts.clear()
850850

851851
dependencies { // for integration tests
852-
testCompile(project(":spring-core"))
853-
testCompile(project(":spring-beans"))
854852
testCompile(project(":spring-aop"))
855-
testCompile(project(":spring-expression"))
853+
testCompile(project(":spring-beans"))
856854
testCompile(project(":spring-context"))
857-
testCompile(project(":spring-tx"))
855+
testCompile(project(":spring-core"))
856+
testCompile(project(":spring-expression"))
858857
testCompile(project(":spring-jdbc"))
858+
testCompile(project(":spring-orm"))
859859
testCompile(project(":spring-test"))
860+
testCompile(project(":spring-tx"))
860861
testCompile(project(":spring-web"))
861862
testCompile(project(":spring-webmvc-portlet"))
862-
testCompile(project(":spring-orm"))
863-
testCompile("org.hibernate:hibernate-core:4.1.9.Final")
864863
testCompile("javax.servlet:servlet-api:2.5")
865864
testCompile("javax.portlet:portlet-api:2.0")
866865
testCompile("javax.inject:javax.inject:1")
867866
testCompile("javax.resource:connector-api:1.5")
868867
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
868+
testCompile("org.hibernate:hibernate-core:4.1.9.Final")
869869
testCompile("hsqldb:hsqldb:${hsqldbVersion}")
870870
}
871871

@@ -886,7 +886,7 @@ configure(rootProject) {
886886
options.stylesheetFile = file("src/api/stylesheet.css")
887887
options.splitIndex = true
888888
options.links(project.ext.javadocLinks)
889-
if(JavaVersion.current().isJava8Compatible()) {
889+
if (JavaVersion.current().isJava8Compatible()) {
890890
options.addStringOption('Xdoclint:none', '-quiet')
891891
}
892892

0 commit comments

Comments
 (0)