From f58ea84c4333711fd0191769b2743a10ada33342 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 11 Jan 2021 08:58:37 +0100
Subject: [PATCH] Upgrade to Servlet API 4.0.1.

We now build against a newer Servlet API version to align with Spring Framework.

Also, introduce a version property servlet.version for centralized version management.

Closes #1951
---
 pom.xml                                                    | 1 +
 spring-data-rest-hal-explorer/pom.xml                      | 2 +-
 spring-data-rest-tests/pom.xml                             | 2 +-
 spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 2 +-
 spring-data-rest-webmvc/pom.xml                            | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5150b60f1..5183cb137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
 		<springdata.solr>4.4.0-SNAPSHOT</springdata.solr>
 		<springdata.cassandra>3.2.0-SNAPSHOT</springdata.cassandra>
 		<springdata.keyvalue>2.5.0-SNAPSHOT</springdata.keyvalue>
+		<servlet.version>4.0.1</servlet.version>
 
 		<hibernate.version>5.4.8.Final</hibernate.version>
 		<jsonpath>1.1.0</jsonpath>
diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml
index ff2b10def..609c503c3 100644
--- a/spring-data-rest-hal-explorer/pom.xml
+++ b/spring-data-rest-hal-explorer/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml
index 80696e0da..89a628619 100644
--- a/spring-data-rest-tests/pom.xml
+++ b/spring-data-rest-tests/pom.xml
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
index 11f4890ca..ad551034d 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml
index 350f58e71..da4c7f128 100644
--- a/spring-data-rest-webmvc/pom.xml
+++ b/spring-data-rest-webmvc/pom.xml
@@ -39,7 +39,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>