From c3c9da67f24fa51d780f68fb4db85c7311b27fff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 7 Nov 2022 15:54:22 +0100
Subject: [PATCH] Upgrade to JPA API 3.1 and Servlet API 6.1.

Closes #2195
---
 pom.xml                               | 1 -
 spring-data-rest-hal-explorer/pom.xml | 1 -
 spring-data-rest-tests/pom.xml        | 1 -
 spring-data-rest-webmvc/pom.xml       | 3 +--
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8403439e1..3bc8b249c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
 		<springdata.jpa>3.0.0-SNAPSHOT</springdata.jpa>
 		<springdata.mongodb>4.0.0-SNAPSHOT</springdata.mongodb>
 		<springdata.keyvalue>3.0.0-SNAPSHOT</springdata.keyvalue>
-		<servlet.version>5.0.0</servlet.version>
 
 		<hibernate.version>6.1.1.Final</hibernate.version>
 	</properties>
diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml
index 74928ac36..5f8679bd3 100644
--- a/spring-data-rest-hal-explorer/pom.xml
+++ b/spring-data-rest-hal-explorer/pom.xml
@@ -34,7 +34,6 @@
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-			<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 b198cd4c5..8d79ec200 100644
--- a/spring-data-rest-tests/pom.xml
+++ b/spring-data-rest-tests/pom.xml
@@ -31,7 +31,6 @@
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-			<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 36fc69429..6b5fa8545 100644
--- a/spring-data-rest-webmvc/pom.xml
+++ b/spring-data-rest-webmvc/pom.xml
@@ -46,7 +46,6 @@
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -111,7 +110,7 @@
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.0.0</version>
+			<version>3.1.0</version>
 			<optional>true</optional>
 		</dependency>