From 9499e4166c3bb0fd3774966ae2042f0b20be7cc8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Feb 2015 17:53:49 +0100 Subject: [PATCH] Fix Animal Sniffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jasper Reports’ transitive dependency on spring-context (via castor-xml which is a new dependency in 6.0.3) was being mapped by Gradle to a dependency on the spring-context project. For reasons that I do not fully understand this was causing -source and -javadoc jars to be added to the project's compile classpath which is used by the Animal Sniffer Ant task. When the task runs these jars do not exist which causes it to fail. This commit fixes the problem by adding an exclusion of org.springframework:spring-context to the Jasper Reports dependencies in spring-context-support and spring-webmvc. (cherry picked from commit 7a6a132) --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 869f9b2ffa1..c55d014e386 100644 --- a/build.gradle +++ b/build.gradle @@ -143,7 +143,6 @@ configure(allprojects) { project -> inputs.dir sourceSets.main.output.classesDir inputs.dir copyJavaApiSignature.to - outputs.upToDateWhen { true } doLast { ant.taskdef( @@ -625,6 +624,7 @@ project("spring-context-support") { exclude group: "com.fasterxml.jackson.core", module: "jackson-databind" exclude group: "org.olap4j", module: "olap4j" exclude group: "xml-apis", module: "xml-apis" + exclude group: "org.springframework", module: "spring-context" } testCompile(project(":spring-context")) testCompile("org.apache.poi:poi:3.11") @@ -839,6 +839,7 @@ project("spring-webmvc") { exclude group: "com.fasterxml.jackson.core", module: "jackson-databind" exclude group: "org.olap4j", module: "olap4j" exclude group: "xml-apis", module: "xml-apis" + exclude group: "org.springframework", module: "spring-context" } optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")