Change all Java EE 8 javax imports to Jakarta EE 9 jakarta imports.

Note, some javax imports (such as javax.annotation.*) are part of the Java SE framework and do not change.

Resolves spring-projectsgh-2464.

src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.domain.jaxb;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;

src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java

@@ -18,7 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto;

src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java

@@ -17,7 +17,7 @@
 
 import java.util.Collections;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;

src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.domain.jaxb;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.jaxb.SpringDataJaxb.SortDto;

src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java

@@ -20,14 +20,14 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

src/main/java/org/springframework/data/domain/jaxb/package-info.java

@@ -13,10 +13,10 @@
 @org.springframework.lang.NonNullApi
 package org.springframework.data.domain.jaxb;
 
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

@@ -28,14 +28,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -155,7 +155,7 @@ private String createPassivationId(Set<Annotation> qualifiers, Class<?> reposito
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getTypes()
+	 * @see jakarta.enterprise.inject.spi.Bean#getTypes()
 	 */
 	@SuppressWarnings("rawtypes")
 	public Set<Type> getTypes() {
@@ -204,7 +204,7 @@ public final void initialize() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.context.spi.Contextual#create(javax.enterprise.context.spi.CreationalContext)
+	 * @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise.context.spi.CreationalContext)
 	 */
 	public final T create(@SuppressWarnings("null") CreationalContext<T> creationalContext) {
 
@@ -224,7 +224,7 @@ public final T create(@SuppressWarnings("null") CreationalContext<T> creationalC
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.context.spi.Contextual#destroy(java.lang.Object, javax.enterprise.context.spi.CreationalContext)
+	 * @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext)
 	 */
 	public void destroy(@SuppressWarnings("null") T instance,
 			@SuppressWarnings("null") CreationalContext<T> creationalContext) {
@@ -239,23 +239,23 @@ public void destroy(@SuppressWarnings("null") T instance,
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getQualifiers()
+	 * @see jakarta.enterprise.inject.spi.Bean#getQualifiers()
 	 */
 	public Set<Annotation> getQualifiers() {
 		return qualifiers;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getName()
+	 * @see jakarta.enterprise.inject.spi.Bean#getName()
 	 */
 	public String getName() {
 		return repositoryType.getName();
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getStereotypes()
+	 * @see jakarta.enterprise.inject.spi.Bean#getStereotypes()
 	 */
 	public Set<Class<? extends Annotation>> getStereotypes() {
 
@@ -267,47 +267,47 @@ public Set<Class<? extends Annotation>> getStereotypes() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getBeanClass()
+	 * @see jakarta.enterprise.inject.spi.Bean#getBeanClass()
 	 */
 	public Class<?> getBeanClass() {
 		return repositoryType;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#isAlternative()
+	 * @see jakarta.enterprise.inject.spi.Bean#isAlternative()
 	 */
 	public boolean isAlternative() {
 		return repositoryType.isAnnotationPresent(Alternative.class);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#isNullable()
+	 * @see jakarta.enterprise.inject.spi.Bean#isNullable()
 	 */
 	public boolean isNullable() {
 		return false;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getInjectionPoints()
+	 * @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints()
 	 */
 	public Set<InjectionPoint> getInjectionPoints() {
 		return Collections.emptySet();
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getScope()
+	 * @see jakarta.enterprise.inject.spi.Bean#getScope()
 	 */
 	public Class<? extends Annotation> getScope() {
 		return ApplicationScoped.class;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.PassivationCapable#getId()
+	 * @see jakarta.enterprise.inject.spi.PassivationCapable#getId()
 	 */
 	public String getId() {
 		return passivationId;

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java

@@ -18,7 +18,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.core.env.StandardEnvironment;

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java

@@ -22,16 +22,16 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java

@@ -24,15 +24,15 @@
 import java.util.List;
 import java.util.Scanner;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.custommonkey.xmlunit.Diff;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java

@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Reference;

src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java

@@ -17,8 +17,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java

@@ -26,11 +26,11 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java

@@ -23,11 +23,11 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.NormalScope;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.webbeans.context.AbstractContext;
 import org.mockito.Mockito;

src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.repository.cdi;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  *

src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java

@@ -19,8 +19,8 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java

@@ -18,7 +18,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Stereotype;
 
 @Stereotype
 @Retention(RetentionPolicy.RUNTIME)

src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.repository.cdi;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java

@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java

@@ -115,7 +115,7 @@ interface SampleRepository extends Repository<Sample, Serializable> {
 
 		Sample save(Sample object);
 
-		@javax.transaction.Transactional
+		@jakarta.transaction.Transactional
 		void methodWithJtaOneDotTwoAtTransactional();
 	}
 

src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java

@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.web.SortDefaultUnitTests.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.Test;
 

src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java

@@ -20,7 +20,7 @@
 
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;