Skip to content

Commit

Permalink
Fix spring-test-mvc Eclipse classpath
Browse files Browse the repository at this point in the history
  • Loading branch information
rwinch authored and cbeams committed Nov 27, 2012
1 parent 2ef99cd commit e7b8cd5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,17 @@ project('spring-webmvc-tiles3') {
compile("javax.servlet:jstl:1.1.2", provided)
compile("javax.servlet.jsp:jsp-api:2.1", provided)
compile("org.apache.tiles:tiles-request-api:1.0.1", optional)
compile("org.apache.tiles:tiles-request-servlet-wildcard:1.0.1", optional)
compile("org.apache.tiles:tiles-request-servlet-wildcard:1.0.1") { dep->
optional dep
exclude group: 'org.springframework', module: 'spring-web'
}
compile("org.apache.tiles:tiles-api:3.0.1", optional)
compile("org.apache.tiles:tiles-core:3.0.1", optional)
compile("org.apache.tiles:tiles-servlet:3.0.1", optional)
compile("org.apache.tiles:tiles-jsp:3.0.1", optional)
compile("org.apache.tiles:tiles-el:3.0.1", optional)
compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
testCompile project(":spring-web").sourceSets*.output // mock request & response
compile project(":spring-web").sourceSets*.output // mock request & response
}
}

Expand Down Expand Up @@ -593,6 +596,7 @@ project('spring-test-mvc') {
description = 'Spring Test MVC Framework'
ext.mergeIntoProject = project(':spring-test')
apply from: "${gradleScriptDir}/merge-artifacts.gradle"
apply from: "ide.gradle"
dependencies {
compile project(":spring-context")
compile project(":spring-webmvc")
Expand Down
7 changes: 7 additions & 0 deletions spring-test-mvc/ide.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import org.gradle.plugins.ide.eclipse.model.ProjectDependency

// SPR-10042
eclipse.classpath.file.whenMerged { classpath ->
def projectName = 'spring-webmvc-tiles3'
classpath.entries.add(0, new ProjectDependency("/${projectName}", project(":${projectName}").path))
}

0 comments on commit e7b8cd5

Please sign in to comment.