Browse Source

Remove superfluous exclusions from Gradle build

Remove several dependency exclusions from the Gradle build that are
no longer required and were not present in Spring 3.1.
pull/199/head
Phillip Webb 13 years ago
parent
commit
4551cfcdfc
  1. 41
      build.gradle

41
build.gradle

@ -39,11 +39,9 @@ configure(allprojects) { @@ -39,11 +39,9 @@ configure(allprojects) {
}
dependencies {
testCompile("junit:junit:${junitVersion}")
testCompile("org.hamcrest:hamcrest-all:1.3")
testCompile("org.easymock:easymock:${easymockVersion}")
testCompile("junit:junit:${junitVersion}") {
exclude group: "org.hamcrest", module: "hamcrest-core"
}
}
}
@ -157,9 +155,7 @@ project("spring-core") { @@ -157,9 +155,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:3.0") {
exclude group: "org.apache.ant", module: "ant"
}
optional("net.sf.jopt-simple:jopt-simple:3.0")
optional("log4j:log4j:1.2.17")
testCompile("xmlunit:xmlunit:1.2")
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7")
@ -247,9 +243,7 @@ project("spring-context") { @@ -247,9 +243,7 @@ project("spring-context") {
optional("org.jruby:jruby:1.6.5.1")
optional("joda-time:joda-time:2.1")
optional("org.slf4j:slf4j-api:${slf4jVersion}")
optional("org.hibernate:hibernate-validator:4.3.0.Final") {
exclude group: "org.slf4j", module: "slf4j-api"
}
optional("org.hibernate:hibernate-validator:4.3.0.Final")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
testCompile("commons-dbcp:commons-dbcp:1.2.2")
@ -350,15 +344,10 @@ project("spring-context-support") { @@ -350,15 +344,10 @@ project("spring-context-support") {
optional("velocity:velocity:1.5")
optional("org.freemarker:freemarker:2.3.15")
optional("com.lowagie:itext:2.1.7")
optional("jasperreports:jasperreports:2.0.5") {
transitive = false
exclude group: "bouncycastle", module: "bctsp-jdk14"
}
optional("jasperreports:jasperreports:2.0.5")
optional("org.slf4j:slf4j-api:${slf4jVersion}")
provided("javax.activation:activation:1.1")
testCompile("org.apache.poi:poi:3.0.2-FINAL") {
exclude group: "log4j", module: "log4j"
}
testCompile("org.apache.poi:poi:3.0.2-FINAL")
testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
testCompile("hsqldb:hsqldb:${hsqldbVersion}")
@ -437,9 +426,7 @@ project("spring-orm") { @@ -437,9 +426,7 @@ project("spring-orm") {
optional(project(":spring-context"))
compile(project(":spring-tx"))
compile(project(":spring-jdbc"))
optional(project(":spring-web")) {
exclude group: "javax.persistence", module: "persistence-api"
}
optional(project(":spring-web"))
}
}
@ -453,9 +440,7 @@ project("spring-orm-hibernate4") { @@ -453,9 +440,7 @@ project("spring-orm-hibernate4") {
compile(project(":spring-jdbc"))
optional("org.hibernate:hibernate-core:4.1.0.Final")
optional("org.hibernate:hibernate-entitymanager:4.1.0.Final")
optional(project(":spring-web")) {
exclude group: "javax.persistence", module: "persistence-api"
}
optional(project(":spring-web"))
optional("javax.servlet:servlet-api:2.5")
}
}
@ -479,7 +464,6 @@ project("spring-webmvc") { @@ -479,7 +464,6 @@ project("spring-webmvc") {
optional("org.apache.poi:poi:3.0.2-FINAL")
optional("com.lowagie:itext:2.1.7")
optional("jasperreports:jasperreports:2.0.5") {
transitive = false
exclude group: "xml-apis", module: "xml-apis"
}
optional("rome:rome:1.0")
@ -579,15 +563,8 @@ project("spring-test") { @@ -579,15 +563,8 @@ project("spring-test") {
optional(project(":spring-web"))
optional(project(":spring-webmvc"))
optional(project(":spring-webmvc-portlet"), )
optional("junit:junit:${junitVersion}") {
// We already have hamcrest-all as a global testCompile dependency.
exclude group: "org.hamcrest", module: "hamcrest-core"
}
optional("org.testng:testng:6.5.2") {
exclude group: "junit", module: "junit"
// We already have hamcrest-all as a global testCompile dependency.
exclude group: "org.hamcrest", module: "hamcrest-core"
}
optional("junit:junit:${junitVersion}")
optional("org.testng:testng:6.5.2")
optional("javax.servlet:servlet-api:2.5")
optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.portlet:portlet-api:2.0")

Loading…
Cancel
Save