General upgrade to Jakarta EE 11 APIs

Includes removal of ManagedBean and javax.annotation legacy support.
Includes AbstractJson(Http)MessageConverter revision for Yasson 3.0.
Includes initial Hibernate ORM 7.0 upgrade.

Closes gh-34011
Closes gh-33750

framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc

@@ -674,9 +674,7 @@ By default, the `AnnotationBeanNameGenerator` is used. For Spring
 xref:core/beans/classpath-scanning.adoc#beans-stereotype-annotations[stereotype annotations],
 if you supply a name via the annotation's `value` attribute that name will be used as
 the name in the corresponding bean definition. This convention also applies when the
-following JSR-250 and JSR-330 annotations are used instead of Spring stereotype
-annotations: `@jakarta.annotation.ManagedBean`, `@javax.annotation.ManagedBean`,
-`@jakarta.inject.Named`, and `@javax.inject.Named`.
+`@jakarta.inject.Named` annotation is used instead of Spring stereotype annotations.
 
 As of Spring Framework 6.1, the name of the annotation attribute that is used to specify
 the bean name is no longer required to be `value`. Custom stereotype annotations can

framework-docs/modules/ROOT/pages/integration/email.adoc

@@ -11,9 +11,7 @@ Spring Framework's email support:
 * The https://jakartaee.github.io/mail-api/[Jakarta Mail] library
 
 This library is freely available on the web -- for example, in Maven Central as
-`com.sun.mail:jakarta.mail`. Please make sure to use the latest 2.x version (which uses
-the `jakarta.mail` package namespace) rather than Jakarta Mail 1.6.x (which uses the
-`javax.mail` package namespace).
+`org.eclipse.angus:angus-mail`.
 ****
 
 The Spring Framework provides a helpful utility library for sending email that shields

framework-docs/modules/ROOT/pages/testing/annotations/integration-junit-jupiter.adoc

@@ -171,9 +171,9 @@ the parameters of a test class constructor are autowired from components in the
 
 If `@TestConstructor` is not present or meta-present on a test class, the default _test
 constructor autowire mode_ will be used. See the tip below for details on how to change
-the default mode. Note, however, that a local declaration of `@Autowired`,
-`@jakarta.inject.Inject`, or `@javax.inject.Inject` on a constructor takes precedence
-over both `@TestConstructor` and the default mode.
+the default mode. Note, however, that a local declaration of `@Autowired` or
+`@jakarta.inject.Inject` on a constructor takes precedence over both `@TestConstructor`
+and the default mode.
 
 .Changing the default test constructor autowire mode
 [TIP]

framework-platform/framework-platform.gradle

@@ -40,7 +40,6 @@ dependencies {
 		api("com.squareup.okhttp3:mockwebserver:3.14.9")
 		api("com.squareup.okhttp3:okhttp:3.14.9")
 		api("com.sun.activation:jakarta.activation:2.0.1")
-		api("com.sun.mail:jakarta.mail:2.0.1")
 		api("com.sun.xml.bind:jaxb-core:3.0.2")
 		api("com.sun.xml.bind:jaxb-impl:3.0.2")
 		api("com.sun.xml.bind:jaxb-xjc:3.0.2")
@@ -61,32 +60,30 @@ dependencies {
 		api("io.undertow:undertow-servlet:2.3.18.Final")
 		api("io.undertow:undertow-websockets-jsr:2.3.18.Final")
 		api("io.vavr:vavr:0.10.4")
-		api("jakarta.activation:jakarta.activation-api:2.0.1")
-		api("jakarta.annotation:jakarta.annotation-api:2.0.0")
+		api("jakarta.activation:jakarta.activation-api:2.1.3")
+		api("jakarta.annotation:jakarta.annotation-api:3.0.0")
 		api("jakarta.ejb:jakarta.ejb-api:4.0.1")
-		api("jakarta.el:jakarta.el-api:4.0.0")
-		api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0")
-		api("jakarta.faces:jakarta.faces-api:3.0.0")
+		api("jakarta.el:jakarta.el-api:6.0.1")
+		api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:3.1.1")
+		api("jakarta.faces:jakarta.faces-api:4.1.2")
 		api("jakarta.inject:jakarta.inject-api:2.0.1")
 		api("jakarta.inject:jakarta.inject-tck:2.0.1")
-		api("jakarta.interceptor:jakarta.interceptor-api:2.0.0")
-		api("jakarta.jms:jakarta.jms-api:3.0.0")
-		api("jakarta.json.bind:jakarta.json.bind-api:2.0.0")
-		api("jakarta.json:jakarta.json-api:2.0.1")
-		api("jakarta.mail:jakarta.mail-api:2.0.1")
-		api("jakarta.persistence:jakarta.persistence-api:3.0.0")
-		api("jakarta.resource:jakarta.resource-api:2.0.0")
+		api("jakarta.interceptor:jakarta.interceptor-api:2.2.0")
+		api("jakarta.jms:jakarta.jms-api:3.1.0")
+		api("jakarta.json.bind:jakarta.json.bind-api:3.0.1")
+		api("jakarta.json:jakarta.json-api:2.1.3")
+		api("jakarta.mail:jakarta.mail-api:2.1.3")
+		api("jakarta.persistence:jakarta.persistence-api:3.2.0")
+		api("jakarta.resource:jakarta.resource-api:2.1.0")
 		api("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2")
 		api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0")
 		api("jakarta.servlet:jakarta.servlet-api:6.1.0")
 		api("jakarta.transaction:jakarta.transaction-api:2.0.1")
-		api("jakarta.validation:jakarta.validation-api:3.0.2")
+		api("jakarta.validation:jakarta.validation-api:3.1.0")
 		api("jakarta.websocket:jakarta.websocket-api:2.2.0")
 		api("jakarta.websocket:jakarta.websocket-client-api:2.2.0")
 		api("jakarta.xml.bind:jakarta.xml.bind-api:3.0.1")
-		api("javax.annotation:javax.annotation-api:1.3.2")
 		api("javax.cache:cache-api:1.1.1")
-		api("javax.inject:javax.inject:1")
 		api("javax.money:money-api:1.1")
 		api("jaxen:jaxen:1.2.0")
 		api("junit:junit:4.13.2")
@@ -117,9 +114,10 @@ dependencies {
 		api("org.crac:crac:1.4.0")
 		api("org.dom4j:dom4j:2.1.4")
 		api("org.easymock:easymock:5.4.0")
+		api("org.eclipse.angus:angus-mail:2.0.3")
 		api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.8")
-		api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
-		api("org.eclipse:yasson:2.0.4")
+		api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B04")
+		api("org.eclipse:yasson:3.0.4")
 		api("org.ehcache:ehcache:3.10.8")
 		api("org.ehcache:jcache:1.0.1")
 		api("org.freemarker:freemarker:2.3.33")
@@ -128,8 +126,8 @@ dependencies {
 		api("org.glassfish.tyrus:tyrus-container-servlet:2.1.3")
 		api("org.graalvm.sdk:graal-sdk:22.3.1")
 		api("org.hamcrest:hamcrest:2.2")
-		api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
-		api("org.hibernate:hibernate-validator:7.0.5.Final")
+		api("org.hibernate:hibernate-core:7.0.0.Beta2")
+		api("org.hibernate:hibernate-validator:9.0.0.Beta3")
 		api("org.hsqldb:hsqldb:2.7.4")
 		api("org.htmlunit:htmlunit:4.6.0")
 		api("org.javamoney:moneta:1.4.4")

integration-tests/integration-tests.gradle

@@ -26,7 +26,7 @@ dependencies {
 	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("org.aspectj:aspectjweaver")
 	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-core-jakarta")
+	testImplementation("org.hibernate:hibernate-core")
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 }
 

spring-beans/spring-beans.gradle

@@ -16,5 +16,4 @@ dependencies {
 	testImplementation(project(":spring-core-test"))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("jakarta.annotation:jakarta.annotation-api")
-	testImplementation("javax.inject:javax.inject")
 }

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -103,8 +103,6 @@
  *
  * <p>Also supports the common {@link jakarta.inject.Inject @Inject} annotation,
  * if available, as a direct alternative to Spring's own {@code @Autowired}.
- * Additionally, it retains support for the {@code javax.inject.Inject} variant
- * dating back to the original JSR-330 specification (as known from Java EE 6-8).
  *
  * <h3>Autowired Constructors</h3>
  * <p>Only one constructor of any given bean class may declare this annotation with
@@ -189,8 +187,8 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	/**
 	 * Create a new {@code AutowiredAnnotationBeanPostProcessor} for Spring's
 	 * standard {@link Autowired @Autowired} and {@link Value @Value} annotations.
-	 * <p>Also supports the common {@link jakarta.inject.Inject @Inject} annotation,
-	 * if available, as well as the original {@code javax.inject.Inject} variant.
+	 * <p>Also supports the common {@link jakarta.inject.Inject @Inject} annotation
+	 * if available.
 	 */
 	@SuppressWarnings("unchecked")
 	public AutowiredAnnotationBeanPostProcessor() {
@@ -206,15 +204,6 @@ public AutowiredAnnotationBeanPostProcessor() {
 		catch (ClassNotFoundException ex) {
 			// jakarta.inject API not available - simply skip.
 		}
-
-		try {
-			this.autowiredAnnotationTypes.add((Class<? extends Annotation>)
-					ClassUtils.forName("javax.inject.Inject", classLoader));
-			logger.trace("'javax.inject.Inject' annotation found and supported for autowiring");
-		}
-		catch (ClassNotFoundException ex) {
-			// javax.inject API not available - simply skip.
-		}
 	}
 
 

spring-beans/src/main/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHints.java

@@ -33,14 +33,10 @@ class JakartaAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
-		// javax.inject.Provider is omitted from the list, since we do not currently load
-		// it via reflection.
 		Stream.of(
 				"jakarta.inject.Inject",
 				"jakarta.inject.Provider",
-				"jakarta.inject.Qualifier",
-				"javax.inject.Inject",
-				"javax.inject.Qualifier"
+				"jakarta.inject.Qualifier"
 			).forEach(typeName -> hints.reflection().registerType(TypeReference.of(typeName)));
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java

@@ -47,8 +47,7 @@
  * against {@link Qualifier qualifier annotations} on the field or parameter to be autowired.
  * Also supports suggested expression values through a {@link Value value} annotation.
  *
- * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation (as well as its
- * pre-Jakarta {@code javax.inject.Qualifier} equivalent), if available.
+ * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation if available.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -69,8 +68,7 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 	/**
 	 * Create a new {@code QualifierAnnotationAutowireCandidateResolver} for Spring's
 	 * standard {@link Qualifier} annotation.
-	 * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation (as well as
-	 * its pre-Jakarta {@code javax.inject.Qualifier} equivalent), if available.
+	 * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation if available.
 	 */
 	@SuppressWarnings("unchecked")
 	public QualifierAnnotationAutowireCandidateResolver() {
@@ -82,13 +80,6 @@ public QualifierAnnotationAutowireCandidateResolver() {
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API (as included in Jakarta EE) not available - simply skip.
 		}
-		try {
-			this.qualifierTypes.add((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Qualifier",
-							QualifierAnnotationAutowireCandidateResolver.class.getClassLoader()));
-		}
-		catch (ClassNotFoundException ex) {
-			// JSR-330 API not available - simply skip.
-		}
 	}
 
 	/**

spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

@@ -508,8 +508,8 @@ public Set<Member> getExternallyManagedConfigMembers() {
 
 	/**
 	 * Register an externally managed configuration initialization method &mdash;
-	 * for example, a method annotated with JSR-250's {@code javax.annotation.PostConstruct}
-	 * or Jakarta's {@link jakarta.annotation.PostConstruct} annotation.
+	 * for example, a method annotated with Jakarta's
+	 * {@link jakarta.annotation.PostConstruct} annotation.
 	 * <p>The supplied {@code initMethod} may be a
 	 * {@linkplain Method#getName() simple method name} or a
 	 * {@linkplain org.springframework.util.ClassUtils#getQualifiedMethodName(Method)

spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsTests.java

@@ -63,14 +63,4 @@ void jakartaQualifierAnnotationHasHints() {
 		assertThat(RuntimeHintsPredicates.reflection().onType(Qualifier.class)).accepts(this.hints);
 	}
 
-	@Test  // gh-33345
-	void javaxInjectAnnotationHasHints() {
-		assertThat(RuntimeHintsPredicates.reflection().onType(javax.inject.Inject.class)).accepts(this.hints);
-	}
-
-	@Test  // gh-33345
-	void javaxQualifierAnnotationHasHints() {
-		assertThat(RuntimeHintsPredicates.reflection().onType(javax.inject.Qualifier.class)).accepts(this.hints);
-	}
-
 }

spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java

@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.inject.Named;
 import jakarta.persistence.Converter;
 import jakarta.persistence.Embeddable;
@@ -43,7 +42,6 @@
 import org.springframework.context.index.sample.SampleNone;
 import org.springframework.context.index.sample.SampleRepository;
 import org.springframework.context.index.sample.SampleService;
-import org.springframework.context.index.sample.cdi.SampleManagedBean;
 import org.springframework.context.index.sample.cdi.SampleNamed;
 import org.springframework.context.index.sample.cdi.SampleTransactional;
 import org.springframework.context.index.sample.jpa.SampleConverter;
@@ -126,11 +124,6 @@ void stereotypeOnAbstractClass() {
 		testComponent(AbstractController.class);
 	}
 
-	@Test
-	void cdiManagedBean() {
-		testSingleComponent(SampleManagedBean.class, ManagedBean.class);
-	}
-
 	@Test
 	void cdiNamed() {
 		testSingleComponent(SampleNamed.class, Named.class);

spring-context-support/spring-context-support.gradle

@@ -23,7 +23,7 @@ dependencies {
 	testImplementation("io.projectreactor:reactor-core")
 	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testImplementation("org.hsqldb:hsqldb")
-	testRuntimeOnly("com.sun.mail:jakarta.mail")
+	testRuntimeOnly("org.eclipse.angus:angus-mail")
 	testRuntimeOnly("org.ehcache:ehcache")
 	testRuntimeOnly("org.ehcache:jcache")
 	testRuntimeOnly("org.glassfish:jakarta.el")

spring-context/spring-context.gradle

@@ -21,8 +21,6 @@ dependencies {
 	optional("jakarta.inject:jakarta.inject-api")
 	optional("jakarta.interceptor:jakarta.interceptor-api")
 	optional("jakarta.validation:jakarta.validation-api")
-	optional("javax.annotation:javax.annotation-api")
-	optional("javax.inject:javax.inject")
 	optional("javax.money:money-api")
 	optional("org.apache.groovy:groovy")
 	optional("org.apache-extras.beanshell:bsh")

spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,11 +51,8 @@
  * {@link org.springframework.stereotype.Repository @Repository}) are
  * themselves annotated with {@code @Component}.
  *
- * <p>Also supports Jakarta EE's {@link jakarta.annotation.ManagedBean} and
- * JSR-330's {@link jakarta.inject.Named} annotations (as well as their pre-Jakarta
- * {@code javax.annotation.ManagedBean} and {@code javax.inject.Named} equivalents),
- * if available. Note that Spring component annotations always override such
- * standard annotations.
+ * <p>Also supports JSR-330's {@link jakarta.inject.Named} annotation if available.
+ * Note that Spring component annotations always override such standard annotations.
  *
  * <p>If the annotation's value doesn't indicate a bean name, an appropriate
  * name will be built based on the short name of the class (with the first
@@ -219,10 +216,7 @@ protected boolean isStereotypeWithNameValue(String annotationType,
 			Set<String> metaAnnotationTypes, Map<String, Object> attributes) {
 
 		boolean isStereotype = metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) ||
-				annotationType.equals("jakarta.annotation.ManagedBean") ||
-				annotationType.equals("javax.annotation.ManagedBean") ||
-				annotationType.equals("jakarta.inject.Named") ||
-				annotationType.equals("javax.inject.Named");
+				annotationType.equals("jakarta.inject.Named");
 
 		return (isStereotype && attributes.containsKey("value"));
 	}

spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java

@@ -117,9 +117,6 @@ public abstract class AnnotationConfigUtils {
 	private static final boolean jakartaAnnotationsPresent =
 			ClassUtils.isPresent("jakarta.annotation.PostConstruct", classLoader);
 
-	private static final boolean jsr250Present =
-			ClassUtils.isPresent("javax.annotation.PostConstruct", classLoader);
-
 	private static final boolean jpaPresent =
 			ClassUtils.isPresent("jakarta.persistence.EntityManagerFactory", classLoader) &&
 					ClassUtils.isPresent(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME, classLoader);
@@ -169,8 +166,7 @@ public static Set<BeanDefinitionHolder> registerAnnotationConfigProcessors(
 		}
 
 		// Check for Jakarta Annotations support, and if present add the CommonAnnotationBeanPostProcessor.
-		if ((jakartaAnnotationsPresent || jsr250Present) &&
-				!registry.containsBeanDefinition(COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+		if (jakartaAnnotationsPresent && !registry.containsBeanDefinition(COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class);
 			def.setSource(source);
 			beanDefs.add(registerPostProcessor(registry, def, COMMON_ANNOTATION_PROCESSOR_BEAN_NAME));

spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,7 @@
  * {@link org.springframework.stereotype.Service @Service}, or
  * {@link org.springframework.stereotype.Controller @Controller} stereotype.
  *
- * <p>Also supports Jakarta EE's {@link jakarta.annotation.ManagedBean} and
- * JSR-330's {@link jakarta.inject.Named} annotations, if available.
+ * <p>Also supports JSR-330's {@link jakarta.inject.Named} annotations, if available.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller