Jakarta EE 9 migration

Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).

Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424

Author: jhoeller

build.gradle

@@ -32,7 +32,7 @@ configure(allprojects) { project ->
 			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
+			mavenBom "org.eclipse.jetty:jetty-bom:11.0.6"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
@@ -83,14 +83,10 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
+			dependency "org.eclipse:yasson:2.0.2"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependencySet(group: 'org.jibx', version: '1.3.3') {
-				entry 'jibx-bind'
-				entry 'jibx-run'
-			}
 			dependency "org.ogce:xpp3:1.1.6"
 			dependency "org.yaml:snakeyaml:1.29"
 
@@ -108,7 +104,6 @@ configure(allprojects) { project ->
 				}
 				entry 'activemq-stomp'
 			}
-			dependency "org.apache.bcel:bcel:6.0"
 			dependency "org.apache.commons:commons-pool2:2.9.0"
 			dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
 				entry 'derby'
@@ -119,35 +114,28 @@ configure(allprojects) { project ->
 			dependency "org.freemarker:freemarker:2.3.31"
 			dependency "org.hsqldb:hsqldb:2.5.2"
 			dependency "org.quartz-scheduler:quartz:2.3.2"
-			dependency "org.codehaus.fabric3.api:commonj:1.1.0"
-			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.5.7.Final"
-			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.5.7.Final"
+			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.52') {
+			dependencySet(group: 'org.apache.tomcat', version: '10.0.11') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.52') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.11') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
 			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
 				entry 'undertow-core'
-				entry('undertow-websockets-jsr') {
-					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
-				}
-				entry('undertow-servlet') {
-					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
-				}
+				entry('undertow-servlet-jakartaee9')
+				entry('undertow-websockets-jsr-jakartaee9')
 			}
 
 			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
@@ -162,15 +150,12 @@ configure(allprojects) { project ->
 			}
 			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1'
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
 
 			dependency "org.jruby:jruby:9.2.19.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 
-			dependency "commons-fileupload:commons-fileupload:1.4"
-			dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
-
 			dependency("org.dom4j:dom4j:2.1.3") {
 				exclude group: "jaxen", name: "jaxen"
 				exclude group: "net.java.dev.msv", name: "xsdlib"
@@ -218,69 +203,50 @@ configure(allprojects) { project ->
 			dependency "org.skyscreamer:jsonassert:1.5.0"
 			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
-
-			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
-				entry 'tiles-api'
-				entry('tiles-core', withoutJclOverSlf4j)
-				entry('tiles-servlet', withoutJclOverSlf4j)
-				entry('tiles-jsp', withoutJclOverSlf4j)
-				entry('tiles-el', withoutJclOverSlf4j)
-				entry('tiles-extras') {
-					exclude group: "org.springframework", name: "spring-web"
-					exclude group: "org.slf4j", name: "jcl-over-slf4j"
-				}
-			}
-			dependency("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
-				exclude group: "org.apache.taglibs", name: "taglibs-standard-spec"
-			}
-
-			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.82"
-			dependency "joda-time:joda-time:2.10.10"
-			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
-			dependency "org.javamoney:moneta:1.3"
 
-			dependency "com.sun.activation:javax.activation:1.2.0"
-			dependency "com.sun.mail:javax.mail:1.6.2"
-			dependencySet(group: 'com.sun.xml.bind', version: '2.3.0.1') {
+			dependency "javax.cache:cache-api:1.1.1"
+			dependency "javax.money:money-api:1.1"
+			dependency "org.javamoney:moneta:1.4.2"
+
+			dependency "jakarta.activation:jakarta.activation-api:2.0.1"
+			dependency "jakarta.annotation:jakarta.annotation-api:2.0.0"
+			dependency "jakarta.ejb:jakarta.ejb-api:4.0.0"
+			dependency "jakarta.el:jakarta.el-api:4.0.0"
+			dependency "jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0"
+			dependency "jakarta.faces:jakarta.faces-api:3.0.0"
+			dependency "jakarta.inject:jakarta.inject-api:2.0.0"
+			dependency "jakarta.inject:jakarta.inject-tck:2.0.1"
+			dependency "jakarta.interceptor:jakarta.interceptor-api:2.0.0"
+			dependency "jakarta.jms:jakarta.jms-api:3.0.0"
+			dependency "jakarta.json:jakarta.json-api:2.0.1"
+			dependency "jakarta.json.bind:jakarta.json.bind-api:2.0.0"
+			dependency "jakarta.mail:jakarta.mail-api:2.0.1"
+			dependency "jakarta.persistence:jakarta.persistence-api:3.0.0"
+			dependency "jakarta.resource:jakarta.resource-api:2.0.0"
+			dependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
+			dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0"
+			dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0"
+			dependency "jakarta.transaction:jakarta.transaction-api:2.0.0"
+			dependency "jakarta.validation:jakarta.validation-api:3.0.0"
+			dependency "jakarta.websocket:jakarta.websocket-api:2.0.0"
+			dependency "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
+			dependency "jakarta.xml.ws:jakarta.xml.ws-api:3.0.1"
+
+			dependency "com.sun.activation:jakarta.activation:2.0.1"
+			dependency "com.sun.mail:jakarta.mail:2.0.1"
+			dependencySet(group: 'com.sun.xml.bind', version: '3.0.2') {
 				entry 'jaxb-core'
 				entry 'jaxb-impl'
 				entry 'jaxb-xjc'
 			}
 
-			dependency "javax.activation:javax.activation-api:1.2.0"
-			dependency "javax.annotation:javax.annotation-api:1.3.2"
-			dependency "javax.cache:cache-api:1.1.0"
-			dependency "javax.ejb:javax.ejb-api:3.2"
-			dependency "javax.el:javax.el-api:3.0.1-b04"
-			dependency "javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0"
-			dependency "javax.faces:javax.faces-api:2.2"
-			dependency "javax.inject:javax.inject:1"
-			dependency "javax.inject:javax.inject-tck:1"
-			dependency "javax.interceptor:javax.interceptor-api:1.2.2"
-			dependency "javax.jms:javax.jms-api:2.0.1"
-			dependency "javax.json:javax.json-api:1.1.4"
-			dependency "javax.json.bind:javax.json.bind-api:1.0"
-			dependency "javax.mail:javax.mail-api:1.6.2"
-			dependency "javax.money:money-api:1.0.3"
-			dependency "javax.resource:javax.resource-api:1.7.1"
-			dependency "javax.servlet:javax.servlet-api:4.0.1"
-			dependency "javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02"
-			dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1"
-			dependency "javax.transaction:javax.transaction-api:1.3"
-			dependency "javax.validation:validation-api:2.0.1.Final"
-			dependency "javax.websocket:javax.websocket-api:1.1"
-			dependency "javax.xml.bind:jaxb-api:2.3.1"
-			dependency "javax.xml.ws:jaxws-api:2.3.1"
-
-			dependency "org.eclipse.persistence:javax.persistence:2.2.0"
-
 			// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
 			// is not available on Maven Central
 			dependency "org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea"
-			dependency "org.glassfish:javax.el:3.0.1-b08"
-			dependency "org.glassfish.main:javax.jws:4.0-b33"
-			dependency "org.glassfish.tyrus:tyrus-container-servlet:1.13.1"
+			dependency "org.glassfish:jakarta.el:4.0.2"
+			dependency "org.glassfish.tyrus:tyrus-container-servlet:2.0.1"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.2"
 		}
 		generatedPomCustomization {
 			enabled = false

integration-tests/integration-tests.gradle

@@ -15,12 +15,12 @@ dependencies {
 	testImplementation(project(":spring-test"))
 	testImplementation(project(":spring-tx"))
 	testImplementation(project(":spring-web"))
-	testImplementation("javax.inject:javax.inject")
-	testImplementation("javax.resource:javax.resource-api")
-	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("jakarta.inject:jakarta.inject-api")
+	testImplementation("jakarta.resource:jakarta.resource-api")
+	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("org.aspectj:aspectjweaver")
 	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-core")
+	testImplementation("org.hibernate:hibernate-core-jakarta")
 }
 
 normalization {

integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

@@ -20,8 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;

integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java

@@ -21,9 +21,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -314,16 +313,16 @@ public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 				if (definition instanceof AnnotatedBeanDefinition) {
 					AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
 					for (String type : annDef.getMetadata().getAnnotationTypes()) {
-						if (type.equals(javax.inject.Singleton.class.getName())) {
+						if (type.equals(jakarta.inject.Singleton.class.getName())) {
 							metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
 							break;
 						}
-						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
+						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(jakarta.inject.Scope.class.getName())) {
 							metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
 							metadata.setScopedProxyMode(scopedProxyMode);
 							break;
 						}
-						else if (type.startsWith("javax.inject")) {
+						else if (type.startsWith("jakarta.inject")) {
 							metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
 						}
 					}
@@ -391,14 +390,14 @@ public static class SessionScopedTestBean extends ScopedTestBean implements Anot
 
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
-	@javax.inject.Scope
+	@jakarta.inject.Scope
 	public @interface RequestScoped {
 	}
 
 
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
-	@javax.inject.Scope
+	@jakarta.inject.Scope
 	public @interface SessionScoped {
 	}
 

integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java

@@ -41,9 +41,6 @@
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.jca.context.ResourceAdapterApplicationContext;
-import org.springframework.jca.support.SimpleBootstrapContext;
-import org.springframework.jca.work.SimpleTaskWorkManager;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.env.MockPropertySource;
 import org.springframework.mock.web.MockServletConfig;
@@ -535,22 +532,6 @@ void registerServletParamPropertySources_StaticWebApplicationContext() {
 		assertThat(environment.getProperty("pSysProps1")).isEqualTo("pSysProps1Value");
 	}
 
-	@Test
-	void resourceAdapterApplicationContext() {
-		ResourceAdapterApplicationContext ctx = new ResourceAdapterApplicationContext(new SimpleBootstrapContext(new SimpleTaskWorkManager()));
-
-		assertHasStandardEnvironment(ctx);
-
-		registerEnvironmentBeanDefinition(ctx);
-
-		ctx.setEnvironment(prodEnv);
-		ctx.refresh();
-
-		assertHasEnvironment(ctx, prodEnv);
-		assertEnvironmentBeanRegistered(ctx);
-		assertEnvironmentAwareInvoked(ctx, prodEnv);
-	}
-
 	@Test
 	void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 		{

integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml

@@ -41,7 +41,7 @@
 			<props>
 				<prop key="setA*">PROPAGATION_REQUIRED</prop>
 				<prop key="rollbackOnly">PROPAGATION_REQUIRED</prop>
-				<prop key="echoException">PROPAGATION_REQUIRED,+javax.servlet.ServletException,-java.lang.Exception</prop>
+				<prop key="echoException">PROPAGATION_REQUIRED,+jakarta.servlet.ServletException,-java.lang.Exception</prop>
 			</props>
 		</property>
 	</bean>

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -47,7 +47,7 @@
  * target method needs to implement the same signature, it will have to return
  * a temporary Future handle that just passes the return value through
  * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
- * or EJB 3.1's {@code javax.ejb.AsyncResult}).
+ * or EJB's {@code jakarta.ejb.AsyncResult}).
  *
  * <p>When the return type is {@code java.util.concurrent.Future}, any exception thrown
  * during the execution can be accessed and managed by the caller. With {@code void}

spring-aspects/spring-aspects.gradle

@@ -29,14 +29,14 @@ dependencies {
 	optional(project(":spring-orm"))  // for JPA exception translation support
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
-	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
+	optional("jakarta.transaction:jakarta.transaction-api")  // for @javax.transaction.Transactional support
 	testImplementation(project(":spring-core"))  // for CodeStyleAspect
 	testImplementation(project(":spring-test"))
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-context-support")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation("javax.mail:javax.mail-api")
+	testImplementation("jakarta.mail:jakarta.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }
 

spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJJtaTransactionManagementConfiguration.java

@@ -27,7 +27,7 @@
 /**
  * {@code @Configuration} class that registers the Spring infrastructure beans necessary
  * to enable AspectJ-based annotation-driven transaction management for the JTA 1.2
- * {@link javax.transaction.Transactional} annotation in addition to Spring's own
+ * {@link jakarta.transaction.Transactional} annotation in addition to Spring's own
  * {@link org.springframework.transaction.annotation.Transactional} annotation.
  *
  * @author Juergen Hoeller

spring-aspects/src/main/java/org/springframework/transaction/aspectj/JtaAnnotationTransactionAspect.aj

@@ -16,15 +16,15 @@
 
 package org.springframework.transaction.aspectj;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.aspectj.lang.annotation.RequiredTypes;
 
 import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 
 /**
  * Concrete AspectJ transaction aspect using the JTA 1.2
- * {@link javax.transaction.Transactional} annotation.
+ * {@link jakarta.transaction.Transactional} annotation.
  *
  * <p>When using this aspect, you <i>must</i> annotate the implementation class
  * (and/or methods within that class), <i>not</i> the interface (if any) that
@@ -42,10 +42,10 @@ import org.springframework.transaction.annotation.AnnotationTransactionAttribute
  *
  * @author Stephane Nicoll
  * @since 4.2
- * @see javax.transaction.Transactional
+ * @see jakarta.transaction.Transactional
  * @see AnnotationTransactionAspect
  */
-@RequiredTypes("javax.transaction.Transactional")
+@RequiredTypes("jakarta.transaction.Transactional")
 public aspect JtaAnnotationTransactionAspect extends AbstractTransactionAspect {
 
 	public JtaAnnotationTransactionAspect() {

spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java

@@ -18,8 +18,7 @@
 
 import java.io.IOException;
 
-import javax.transaction.Transactional;
-
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;