|
|
@ -587,7 +587,6 @@ project("spring-webmvc") { |
|
|
|
testCompile("commons-io:commons-io:1.3") |
|
|
|
testCompile("commons-io:commons-io:1.3") |
|
|
|
testCompile("org.hibernate:hibernate-validator:4.3.0.Final") |
|
|
|
testCompile("org.hibernate:hibernate-validator:4.3.0.Final") |
|
|
|
testCompile("org.apache.httpcomponents:httpclient:4.2") |
|
|
|
testCompile("org.apache.httpcomponents:httpclient:4.2") |
|
|
|
testCompile(project(":spring-web").sourceSets.test.output) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// pick up DispatcherServlet.properties in src/main |
|
|
|
// pick up DispatcherServlet.properties in src/main |
|
|
@ -599,6 +598,7 @@ project("spring-webmvc-tiles3") { |
|
|
|
merge.into = project(":spring-webmvc") |
|
|
|
merge.into = project(":spring-webmvc") |
|
|
|
dependencies { |
|
|
|
dependencies { |
|
|
|
compile(project(":spring-context")) |
|
|
|
compile(project(":spring-context")) |
|
|
|
|
|
|
|
compile(project(":spring-web")) |
|
|
|
provided("javax.el:el-api:1.0") |
|
|
|
provided("javax.el:el-api:1.0") |
|
|
|
provided("javax.servlet:jstl:1.2") |
|
|
|
provided("javax.servlet:jstl:1.2") |
|
|
|
provided("javax.servlet.jsp:jsp-api:2.1") |
|
|
|
provided("javax.servlet.jsp:jsp-api:2.1") |
|
|
@ -617,7 +617,6 @@ project("spring-webmvc-tiles3") { |
|
|
|
exclude group: "org.slf4j", module: "jcl-over-slf4j" |
|
|
|
exclude group: "org.slf4j", module: "jcl-over-slf4j" |
|
|
|
} |
|
|
|
} |
|
|
|
provided("javax.servlet:javax.servlet-api:3.0.1") |
|
|
|
provided("javax.servlet:javax.servlet-api:3.0.1") |
|
|
|
compile(project(":spring-web").sourceSets*.output) // mock request & response |
|
|
|
|
|
|
|
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") |
|
|
|
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -765,7 +764,6 @@ configure(rootProject) { |
|
|
|
|
|
|
|
|
|
|
|
dependencies { // for integration tests |
|
|
|
dependencies { // for integration tests |
|
|
|
testCompile(project(":spring-core")) |
|
|
|
testCompile(project(":spring-core")) |
|
|
|
testCompile(project(":spring-core").sourceSets.test.output) |
|
|
|
|
|
|
|
testCompile(project(":spring-beans")) |
|
|
|
testCompile(project(":spring-beans")) |
|
|
|
testCompile(project(":spring-aop")) |
|
|
|
testCompile(project(":spring-aop")) |
|
|
|
testCompile(project(":spring-expression")) |
|
|
|
testCompile(project(":spring-expression")) |
|
|
@ -801,6 +799,10 @@ configure(rootProject) { |
|
|
|
project.sourceSets.main.allJava |
|
|
|
project.sourceSets.main.allJava |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
maxMemory = "1024m" |
|
|
|
|
|
|
|
destinationDir = new File(buildDir, "api") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
doFirst { |
|
|
|
classpath = files( |
|
|
|
classpath = files( |
|
|
|
// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc |
|
|
|
// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc |
|
|
|
// classpath over their respective 2.5 and 3.x variants |
|
|
|
// classpath over their respective 2.5 and 3.x variants |
|
|
@ -810,9 +812,7 @@ configure(rootProject) { |
|
|
|
project(":spring-aspects").sourceSets.main.output |
|
|
|
project(":spring-aspects").sourceSets.main.output |
|
|
|
) |
|
|
|
) |
|
|
|
classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath }) |
|
|
|
classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath }) |
|
|
|
|
|
|
|
} |
|
|
|
maxMemory = "1024m" |
|
|
|
|
|
|
|
destinationDir = new File(buildDir, "api") |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
task docsZip(type: Zip) { |
|
|
|
task docsZip(type: Zip) { |
|
|
|