Migrate to Jakarta EE 9.

Closes #2305

Author: schauder

pom.xml

@@ -23,7 +23,7 @@
 
 		<dist.key>DATAJPA</dist.key>
 
-		<eclipselink>2.7.9</eclipselink>
+		<eclipselink>3.0.2</eclipselink>
 		<hibernate>5.6.0.Final</hibernate>
 		<mysql-connector-java>8.0.23</mysql-connector-java>
 		<postgresql>42.2.19</postgresql>
@@ -293,30 +293,37 @@
 
 		<dependency>
 			<groupId>${hibernate.groupId}</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<artifactId>hibernate-core-jakarta</artifactId>
 			<version>${hibernate}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
 			<groupId>${hibernate.groupId}</groupId>
-			<artifactId>hibernate-jpamodelgen</artifactId>
+			<artifactId>hibernate-jpamodelgen-jakarta</artifactId>
 			<version>${hibernate}</version>
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>${jakarta-annotation-api}</version>
+		</dependency>
+
 		<!-- QueryDsl -->
 		<dependency>
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
 			<version>${querydsl}</version>
-			<classifier>jpa</classifier>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
+			<classifier>jakarta</classifier>
 			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>
@@ -339,31 +346,58 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
+			<groupId>jakarta.interceptor</groupId>
+			<artifactId>jakarta.interceptor-api</artifactId>
+			<version>2.0.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
 			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
+		<!--
+		Apache Open Web beans offers a jakarta based version using maven classifiers.
+		Unfortunately the dependencies are broken, so one has to exclude the broken ones and add the proper ones
+		explicitly.
+
+		This can be simpliefied once https://issues.apache.org/jira/browse/OWB-1368 is fixed.
+
+		See: https://stackoverflow.com/questions/66610586/openwebbeans-gives-error-java-lang-noclassdeffounderror-when-using-with-tomcat-1
+		-->
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-se</artifactId>
+			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.openwebbeans</groupId>
+					<artifactId>openwebbeans-impl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.openwebbeans</groupId>
+					<artifactId>openwebbeans-spi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-spi</artifactId>
 			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
 			<scope>test</scope>
 		</dependency>
 

src/main/asciidoc/jpa.adoc

@@ -573,7 +573,7 @@ int setFixedFirstnameFor(String firstname, String lastname);
 ----
 ====
 
-Doing so triggers the query annotated to the method as an updating query instead of a selecting one. As the `EntityManager` might contain outdated entities after the execution of the modifying query, we do not automatically clear it (see the https://docs.oracle.com/javaee/7/api/javax/persistence/EntityManager.html[JavaDoc] of `EntityManager.clear()` for details), since this effectively drops all non-flushed changes still pending in the `EntityManager`.
+Doing so triggers the query annotated to the method as an updating query instead of a selecting one. As the `EntityManager` might contain outdated entities after the execution of the modifying query, we do not automatically clear it (see the https://jakarta.ee/specifications/persistence/2.2/apidocs/javax/persistence/entitymanager[JavaDoc] of `EntityManager.clear()` for details), since this effectively drops all non-flushed changes still pending in the `EntityManager`.
 If you wish the `EntityManager` to be cleared automatically, you can set the `@Modifying` annotation's `clearAutomatically` attribute to `true`.
 
 The `@Modifying` annotation is only relevant in combination with the `@Query` annotation.

src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java

@@ -21,16 +21,16 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Example;

src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java

@@ -22,8 +22,8 @@
 import java.time.ZoneId;
 import java.util.Date;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 
 import org.springframework.data.convert.Jsr310Converters.DateToInstantConverter;
 import org.springframework.data.convert.Jsr310Converters.DateToLocalDateConverter;

src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java

@@ -21,10 +21,10 @@
 import java.util.Date;
 import java.util.Optional;
 
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.springframework.data.domain.Auditable;
 import org.springframework.lang.Nullable;

src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java

@@ -17,10 +17,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
 
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.util.ProxyUtils;

src/main/java/org/springframework/data/jpa/domain/JpaSort.java

@@ -21,8 +21,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.PluralAttribute;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.lang.Nullable;

src/main/java/org/springframework/data/jpa/domain/Specification.java

@@ -17,10 +17,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 import org.springframework.lang.Nullable;
 

src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java

@@ -17,10 +17,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 import org.springframework.lang.Nullable;
 

src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java

@@ -26,7 +26,7 @@
 
 /**
  * {@link BeanFactoryPostProcessor} that ensures that the {@link AnnotationBeanConfigurerAspect} aspect is up and
- * running <em>before</em> the {@link javax.persistence.EntityManagerFactory} gets created as this already instantiates
+ * running <em>before</em> the {@link jakarta.persistence.EntityManagerFactory} gets created as this already instantiates
  * entity listeners and we need to get injection into {@link org.springframework.beans.factory.annotation.Configurable}
  * to work in them.
  *