Skip to content

Commit 9499e41

Browse files
wilkinsonajhoeller
authored andcommitted
Fix Animal Sniffer
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)
1 parent bf442c0 commit 9499e41

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ configure(allprojects) { project ->
143143

144144
inputs.dir sourceSets.main.output.classesDir
145145
inputs.dir copyJavaApiSignature.to
146-
outputs.upToDateWhen { true }
147146

148147
doLast {
149148
ant.taskdef(
@@ -625,6 +624,7 @@ project("spring-context-support") {
625624
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
626625
exclude group: "org.olap4j", module: "olap4j"
627626
exclude group: "xml-apis", module: "xml-apis"
627+
exclude group: "org.springframework", module: "spring-context"
628628
}
629629
testCompile(project(":spring-context"))
630630
testCompile("org.apache.poi:poi:3.11")
@@ -839,6 +839,7 @@ project("spring-webmvc") {
839839
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
840840
exclude group: "org.olap4j", module: "olap4j"
841841
exclude group: "xml-apis", module: "xml-apis"
842+
exclude group: "org.springframework", module: "spring-context"
842843
}
843844
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
844845
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")

0 commit comments

Comments
 (0)