From 7cc406ffc7a1b5baf9222478c833fb3be5812978 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Thu, 6 Dec 2012 12:06:34 -0800
Subject: [PATCH] Depend on javax.servlet for version 3.0 API

Replace tomcat servlet-api 3.0 dependencies with the javax.servlet
versions that are now available in the Maven central repository.
---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index c0a024449a..143acc3e14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -378,7 +378,7 @@ project("spring-web") {
 		compile("javax.el:el-api:1.0", optional)
 		compile("javax.faces:jsf-api:1.2_08", optional)
 		compile("javax.portlet:portlet-api:2.0", provided)
-		compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
+		compile("javax.servlet:javax.servlet-api:3.0.1", provided)
 		compile("javax.servlet.jsp:jsp-api:2.1", provided)
 		compile("javax.xml:jaxrpc-api:1.1")
 		compile("javax.xml.soap:saaj-api:1.3", provided)
@@ -488,7 +488,7 @@ project("spring-webmvc") {
 			exclude group: "log4j", module: "log4j"
 		}
 		compile("javax.servlet:jstl:1.1.2", provided)
-		compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
+		compile("javax.servlet:javax.servlet-api:3.0.1", provided)
 		testCompile(project(":spring-aop"))
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("rhino:js:1.7R1")
@@ -536,7 +536,7 @@ project("spring-webmvc-tiles3") {
 			optional dep
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
+		compile("javax.servlet:javax.servlet-api:3.0.1", provided)
 		compile(project(":spring-web").sourceSets*.output) // mock request & response
 	}
 }
@@ -596,7 +596,7 @@ project("spring-test-mvc") {
 		compile(project(":spring-context"))
 		compile(project(":spring-webmvc"))
 		compile(project(":spring-test").sourceSets.main.output)
-		compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided)
+		compile("javax.servlet:javax.servlet-api:3.0.1", provided)
 		compile("org.hamcrest:hamcrest-core:1.3", optional)
 		compile("com.jayway.jsonpath:json-path:0.8.1", optional)
 		compile("xmlunit:xmlunit:1.2", optional)