From b4115f3202a10151f4eed4c28bb9e74538a59d84 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 27 Jan 2014 22:15:54 +0100 Subject: [PATCH] Downgraded JOpt build dependency to 3.3 Avoiding accidental use of OptionSet.specs(), as introduced in the JOpt 4.x line. --- build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index b1749d98c8..c9e01207c5 100644 --- a/build.gradle +++ b/build.gradle @@ -236,7 +236,7 @@ project("spring-core") { compile(files(asmRepackJar)) compile("commons-logging:commons-logging:1.1.1") optional("org.aspectj:aspectjweaver:${aspectjVersion}") - optional("net.sf.jopt-simple:jopt-simple:4.4") + optional("net.sf.jopt-simple:jopt-simple:3.3") optional("log4j:log4j:1.2.17") testCompile("xmlunit:xmlunit:1.3") testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") { @@ -849,23 +849,23 @@ configure(rootProject) { configurations.archives.artifacts.clear() dependencies { // for integration tests - testCompile(project(":spring-core")) - testCompile(project(":spring-beans")) testCompile(project(":spring-aop")) - testCompile(project(":spring-expression")) + testCompile(project(":spring-beans")) testCompile(project(":spring-context")) - testCompile(project(":spring-tx")) + testCompile(project(":spring-core")) + testCompile(project(":spring-expression")) testCompile(project(":spring-jdbc")) + testCompile(project(":spring-orm")) testCompile(project(":spring-test")) + testCompile(project(":spring-tx")) testCompile(project(":spring-web")) testCompile(project(":spring-webmvc-portlet")) - testCompile(project(":spring-orm")) - testCompile("org.hibernate:hibernate-core:4.1.9.Final") testCompile("javax.servlet:servlet-api:2.5") testCompile("javax.portlet:portlet-api:2.0") testCompile("javax.inject:javax.inject:1") testCompile("javax.resource:connector-api:1.5") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") + testCompile("org.hibernate:hibernate-core:4.1.9.Final") testCompile("hsqldb:hsqldb:${hsqldbVersion}") } @@ -886,7 +886,7 @@ configure(rootProject) { options.stylesheetFile = file("src/api/stylesheet.css") options.splitIndex = true options.links(project.ext.javadocLinks) - if(JavaVersion.current().isJava8Compatible()) { + if (JavaVersion.current().isJava8Compatible()) { options.addStringOption('Xdoclint:none', '-quiet') }