GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Consistently switched optional dependencies to scope 'optional'

pull/452/head
Juergen Hoeller 12 years ago
parent
4b282a965c
commit
98e890aae3
1 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      build.gradle

30
build.gradle
Unescape View File

@ -267,8 +267,8 @@ project("spring-beans") { @@ -267,8 +267,8 @@ project("spring-beans") {
dependencies {
compile(project(":spring-core"))
compile(files(project(":spring-core").cglibRepackJar))
provided("javax.el:javax.el-api:2.2.4")
provided("javax.inject:javax.inject:1")
optional("javax.el:javax.el-api:2.2.4")
optional("javax.inject:javax.inject:1")
testCompile("log4j:log4j:1.2.17")
}
}
@ -420,13 +420,13 @@ project("spring-tx") { @@ -420,13 +420,13 @@ project("spring-tx") {
dependencies {
compile(project(":spring-beans"))
compile(project(":spring-core"))
provided("com.ibm.websphere:uow:6.0.2.17")
optional(project(":spring-aop"))
optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
optional("aopalliance:aopalliance:1.0")
optional("javax.transaction:javax.transaction-api:1.2")
optional("javax.resource:connector-api:1.5")
optional("javax.ejb:ejb-api:3.0")
optional("com.ibm.websphere:uow:6.0.2.17")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
}
@ -542,11 +542,11 @@ project("spring-web") { @@ -542,11 +542,11 @@ project("spring-web") {
compile(project(":spring-context"))
compile(project(":spring-core"))
provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.servlet.jsp:jsp-api:2.1")
provided("javax.portlet:portlet-api:2.0")
provided("javax.el:javax.el-api:2.2.4")
provided("javax.faces:javax.faces-api:2.2")
optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.portlet:portlet-api:2.0")
optional("javax.el:javax.el-api:2.2.4")
optional("javax.faces:javax.faces-api:2.2")
optional("aopalliance:aopalliance:1.0")
optional("com.caucho:hessian:4.0.7")
optional("commons-fileupload:commons-fileupload:1.3")
@ -620,7 +620,6 @@ project("spring-orm") { @@ -620,7 +620,6 @@ project("spring-orm") {
compile(project(":spring-core"))
compile(project(":spring-jdbc"))
compile(project(":spring-tx"))
provided("javax.servlet:javax.servlet-api:3.0.1")
optional(project(":spring-aop"))
optional(project(":spring-context"))
optional(project(":spring-web"))
@ -632,6 +631,7 @@ project("spring-orm") { @@ -632,6 +631,7 @@ project("spring-orm") {
optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
optional("org.apache.openjpa:openjpa:2.2.1")
optional("javax.jdo:jdo-api:3.0")
optional("javax.servlet:javax.servlet-api:3.0.1")
testCompile("commons-dbcp:commons-dbcp:1.2.2")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
@ -663,10 +663,10 @@ project("spring-webmvc") { @@ -663,10 +663,10 @@ project("spring-webmvc") {
compile(project(":spring-expression"))
compile(project(":spring-web"))
provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.servlet.jsp:jsp-api:2.1")
provided("javax.servlet:jstl:1.2")
optional(project(":spring-context-support")) // for Velocity support
optional(project(":spring-oxm")) // for MarshallingView
optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.servlet:jstl:1.2")
optional("net.sourceforge.jexcelapi:jxl:2.6.12")
optional("org.apache.poi:poi:3.9")
optional("org.apache.velocity:velocity:1.7")
@ -734,9 +734,9 @@ project("spring-webmvc-tiles3") { @@ -734,9 +734,9 @@ project("spring-webmvc-tiles3") {
provided(project(":spring-context"))
provided(project(":spring-web"))
provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.servlet.jsp:jsp-api:2.1")
provided("javax.servlet:jstl:1.2")
provided("javax.el:javax.el-api:2.2.4")
optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.servlet:jstl:1.2")
optional("javax.el:javax.el-api:2.2.4")
optional("org.apache.tiles:tiles-request-api:1.0.1")
optional("org.apache.tiles:tiles-api:3.0.1")
optional("org.apache.tiles:tiles-core:3.0.1") {
@ -782,8 +782,6 @@ project("spring-test") { @@ -782,8 +782,6 @@ project("spring-test") {
dependencies {
compile(project(":spring-core"))
provided("javax.inject:javax.inject:1")
provided("javax.servlet:jstl:1.2")
optional(project(":spring-beans"))
optional(project(":spring-context"))
optional(project(":spring-jdbc"))
@ -794,8 +792,10 @@ project("spring-test") { @@ -794,8 +792,10 @@ project("spring-test") {
optional(project(":spring-webmvc-portlet"))
optional("junit:junit:${junitVersion}")
optional("org.testng:testng:6.8.7")
optional("javax.inject:javax.inject:1")
optional("javax.servlet:javax.servlet-api:3.0.1")
optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.servlet:jstl:1.2")
optional("javax.portlet:portlet-api:2.0")
optional("org.eclipse.persistence:javax.persistence:2.0.0")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")

Write Preview
Loading…
Cancel
Save