Cleanup after rebase on 2.6 release.

See #2316, #2305, #2294 and #2269

Author: schauder

src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java

@@ -17,9 +17,9 @@
 
 import java.util.Set;
 
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.Subgraph;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Subgraph;
 
 import org.springframework.data.mapping.PropertyPath;
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java

@@ -23,7 +23,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.Page;

src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java

@@ -20,9 +20,9 @@
 
 import java.util.HashSet;
 
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.Subgraph;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Subgraph;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;