Upgrade to Spring Framework 6.

Author: odrotbohm

pom.xml

@@ -28,16 +28,21 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-rest</dist.id>
 
+		<!-- Temporarily here -->
+		<spring>6.0.0-SNAPSHOT</spring>
+		<spring-hateoas>2.0.0-SNAPSHOT</spring-hateoas>
+		<validation>3.0.0</validation>
+
 		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
 		<springdata.jpa>2.6.0-SNAPSHOT</springdata.jpa>
 		<springdata.mongodb>3.3.0-SNAPSHOT</springdata.mongodb>
 		<springdata.geode>2.6.0-SNAPSHOT</springdata.geode>
 		<springdata.solr>4.4.0-SNAPSHOT</springdata.solr>
 		<springdata.cassandra>3.3.0-SNAPSHOT</springdata.cassandra>
 		<springdata.keyvalue>2.6.0-SNAPSHOT</springdata.keyvalue>
-		<servlet.version>4.0.1</servlet.version>
+		<servlet.version>5.0.0</servlet.version>
 
-		<hibernate.version>5.4.8.Final</hibernate.version>
+		<hibernate.version>5.5.7.Final</hibernate.version>
 		<bundlor.enabled>false</bundlor.enabled>
 	</properties>
 
@@ -119,8 +124,8 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
@@ -144,7 +149,7 @@
 	<repositories>
 		<repository>
 			<id>spring-libs-snapshot</id>
-			<url>https://repo.spring.io/libs-snapshot</url>
+			<url>https://repo.spring.io/snapshot</url>
 		</repository>
 	</repositories>
 

spring-data-rest-hal-explorer/pom.xml

@@ -32,8 +32,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>

spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.rest.webmvc.halexplorer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.data.rest.webmvc.BasePathAwareController;
 import org.springframework.http.MediaType;

spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java

@@ -17,12 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.io.IOException;
 import java.util.Collections;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.mock.web.MockHttpServletRequest;

spring-data-rest-tests/pom.xml

@@ -9,16 +9,16 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-    <name>Spring Data REST Tests</name>
+	<name>Spring Data REST Tests</name>
 	<artifactId>spring-data-rest-tests</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
 		<module>spring-data-rest-tests-core</module>
 		<module>spring-data-rest-tests-geode</module>
-		<module>spring-data-rest-tests-jpa</module>
+		<!--<module>spring-data-rest-tests-jpa</module>-->
 		<module>spring-data-rest-tests-mongodb</module>
-		<module>spring-data-rest-tests-security</module>
+		<!--<module>spring-data-rest-tests-security</module>-->
 		<module>spring-data-rest-tests-shop</module>
 	</modules>
 
@@ -30,8 +30,8 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>

spring-data-rest-tests/spring-data-rest-tests-core/pom.xml

@@ -24,13 +24,6 @@
 			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>${servlet.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>

spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml

@@ -36,15 +36,8 @@
 
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
+			<artifactId>hibernate-core-jakarta</artifactId>
 			<version>${hibernate.version}</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>net.bytebuddy</groupId>
-					<artifactId>byte-buddy</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -61,12 +54,6 @@
 			<artifactId>jackson-datatype-hibernate5</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-
 	</dependencies>
 
 </project>

spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.data.rest.webmvc.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Version;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
 
 /**
  * @author Oliver Gierke

spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java

@@ -15,25 +15,25 @@
  */
 package org.springframework.data.rest.webmvc.jpa;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-
 /**
  * @author Oliver Gierke
  */
 @Entity
 public class Author {
 
-	@Id @GeneratedValue//
+	@Id @GeneratedValue //
 	Long id;
 	public String name;
 
-	@ManyToMany(mappedBy = "authors")//
+	@ManyToMany(mappedBy = "authors") //
 	public Set<Book> books = new HashSet<Book>();
 
 	protected Author() {}

spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java

@@ -15,20 +15,19 @@
  */
 package org.springframework.data.rest.webmvc.jpa;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-
 import org.springframework.data.rest.core.annotation.RestResource;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -43,8 +42,7 @@ public class Book {
 	public @Id @GeneratedValue Long id;
 	public String isbn, title;
 
-	@JsonProperty("sales")
-	public long soldUnits;
+	@JsonProperty("sales") public long soldUnits;
 
 	@ManyToMany(cascade = { CascadeType.MERGE }) //
 	@RestResource(path = "creators") //