root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Further reordering of dependencies

This commit is contained in:
Juergen Hoeller 2014-01-25 17:13:34 +01:00
parent 9154871a45
commit 4b282a965c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@ -541,11 +541,11 @@ project("spring-web") {
compile(project(":spring-beans")) // for MultiPartFilter compile(project(":spring-beans")) // for MultiPartFilter
compile(project(":spring-context")) compile(project(":spring-context"))
compile(project(":spring-core")) compile(project(":spring-core"))
provided("javax.el:javax.el-api:2.2.4")
provided("javax.faces:javax.faces-api:2.2")
provided("javax.portlet:portlet-api:2.0")
provided("javax.servlet:javax.servlet-api:3.0.1") provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.servlet.jsp:jsp-api:2.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(project(":spring-oxm")) // for MarshallingHttpMessageConverter
optional("aopalliance:aopalliance:1.0") optional("aopalliance:aopalliance:1.0")
optional("com.caucho:hessian:4.0.7") optional("com.caucho:hessian:4.0.7")
@ -566,7 +566,6 @@ project("spring-web") {
testCompile(project(":spring-context-support")) // for JafMediaTypeFactory testCompile(project(":spring-context-support")) // for JafMediaTypeFactory
testCompile("xmlunit:xmlunit:1.3") testCompile("xmlunit:xmlunit:1.3")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("log4j:log4j:1.2.17")
} }
// pick up ContextLoader.properties in src/main // pick up ContextLoader.properties in src/main
@ -644,8 +643,8 @@ project("spring-orm-hibernate4") {
merge.into = project(":spring-orm") merge.into = project(":spring-orm")
dependencies { dependencies {
provided(project(":spring-tx"))
provided(project(":spring-jdbc")) provided(project(":spring-jdbc"))
provided(project(":spring-tx"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("org.hibernate:hibernate-core:${hibernate4Version}") optional("org.hibernate:hibernate-core:${hibernate4Version}")
optional("org.hibernate:hibernate-entitymanager:${hibernate4Version}") optional("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
@ -734,10 +733,10 @@ project("spring-webmvc-tiles3") {
dependencies { dependencies {
provided(project(":spring-context")) provided(project(":spring-context"))
provided(project(":spring-web")) provided(project(":spring-web"))
provided("javax.el:javax.el-api:2.2.4")
provided("javax.servlet:javax.servlet-api:3.0.1") provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.servlet.jsp:jsp-api:2.1") provided("javax.servlet.jsp:jsp-api:2.1")
provided("javax.servlet:jstl:1.2") provided("javax.servlet:jstl:1.2")
provided("javax.el:javax.el-api:2.2.4")
optional("org.apache.tiles:tiles-request-api:1.0.1") optional("org.apache.tiles:tiles-request-api:1.0.1")
optional("org.apache.tiles:tiles-api:3.0.1") optional("org.apache.tiles:tiles-api:3.0.1")
optional("org.apache.tiles:tiles-core:3.0.1") { optional("org.apache.tiles:tiles-core:3.0.1") {
@ -795,9 +794,9 @@ project("spring-test") {
optional(project(":spring-webmvc-portlet")) optional(project(":spring-webmvc-portlet"))
optional("junit:junit:${junitVersion}") optional("junit:junit:${junitVersion}")
optional("org.testng:testng:6.8.7") optional("org.testng:testng:6.8.7")
optional("javax.portlet:portlet-api:2.0")
optional("javax.servlet:javax.servlet-api:3.0.1") optional("javax.servlet:javax.servlet-api:3.0.1")
optional("javax.servlet.jsp:jsp-api:2.1") optional("javax.servlet.jsp:jsp-api:2.1")
optional("javax.portlet:portlet-api:2.0")
optional("org.eclipse.persistence:javax.persistence:2.0.0") optional("org.eclipse.persistence:javax.persistence:2.0.0")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.hamcrest:hamcrest-core:1.3") optional("org.hamcrest:hamcrest-core:1.3")