feat: Jakarta EE 9

Fixes: vaadin/flow#14784

pom.xml

@@ -35,8 +35,8 @@
         <Implementation-Version>${project.version}</Implementation-Version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <selenium.version>4.5.0</selenium.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <license.checker.version>1.9.0</license.checker.version>
     </properties>
     <modules>
@@ -63,6 +63,10 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>spring milestones</id>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>

vaadin-testbench-unit/pom.xml

@@ -31,7 +31,7 @@
     <properties>
         <kotlin.version>1.6.21</kotlin.version>
         <dokka.version>1.6.21</dokka.version>
-        <vaadin.version>23.2-SNAPSHOT</vaadin.version>
+        <vaadin.version>24.0-SNAPSHOT</vaadin.version>
         <junit5.version>5.8.2</junit5.version>
     </properties>
 
@@ -380,30 +380,30 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.3.19</version>
+            <version>6.0.0-M6</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.6.4</version>
+            <version>6.0.0-M7</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>5.6.3</version>
+            <version>6.0.0-M7</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/UITestSpringLookupInitializer.java

@@ -10,8 +10,8 @@
 
 package com.vaadin.testbench.unit;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.util.Collection;
 import java.util.Map;
 

vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServlet.java

@@ -10,8 +10,8 @@
 
 package com.vaadin.testbench.unit.mocks;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.lang.reflect.Constructor;
 import java.security.Principal;

vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/mocks/MockWebApplicationContext.java

@@ -10,7 +10,7 @@
 
 package com.vaadin.testbench.unit.mocks;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.Locale;

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/internal/MockVaadin.kt

@@ -12,7 +12,7 @@ package com.vaadin.testbench.unit.internal
 import java.lang.reflect.Field
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.locks.ReentrantLock
-import javax.servlet.ServletContext
+import jakarta.servlet.ServletContext
 import com.vaadin.flow.component.ComponentUtil
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.page.Page

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/internal/Utils.kt

@@ -13,8 +13,8 @@ import java.io.ByteArrayOutputStream
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.io.Serializable
-import javax.servlet.Servlet
-import javax.servlet.ServletContext
+import jakarta.servlet.Servlet
+import jakarta.servlet.ServletContext
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.internal.ReflectTools
 import com.vaadin.flow.router.HasErrorParameter

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockContext.kt

@@ -19,15 +19,15 @@ import java.util.Collections
 import java.util.Enumeration
 import java.util.EventListener
 import java.util.concurrent.ConcurrentHashMap
-import javax.servlet.Filter
-import javax.servlet.FilterRegistration
-import javax.servlet.RequestDispatcher
-import javax.servlet.Servlet
-import javax.servlet.ServletContext
-import javax.servlet.ServletRegistration
-import javax.servlet.SessionCookieConfig
-import javax.servlet.SessionTrackingMode
-import javax.servlet.descriptor.JspConfigDescriptor
+import jakarta.servlet.Filter
+import jakarta.servlet.FilterRegistration
+import jakarta.servlet.RequestDispatcher
+import jakarta.servlet.Servlet
+import jakarta.servlet.ServletContext
+import jakarta.servlet.ServletRegistration
+import jakarta.servlet.SessionCookieConfig
+import jakarta.servlet.SessionTrackingMode
+import jakarta.servlet.descriptor.JspConfigDescriptor
 import org.slf4j.LoggerFactory
 
 open class MockContext : ServletContext, Serializable {
@@ -206,7 +206,6 @@ open class MockContext : ServletContext, Serializable {
 
     override fun getVirtualServerName(): String = "mock/localhost" // Tomcat returns "Catalina/localhost"
 
-    /* TODO: Servlet 4 API
     private var sessionTimeout: Int = 30
 
     override fun getSessionTimeout(): Int = sessionTimeout
@@ -230,7 +229,6 @@ open class MockContext : ServletContext, Serializable {
     override fun setResponseCharacterEncoding(encoding: String?) {
         responseCharacterEncoding = encoding
     }
-     */
 
     override fun getContext(uripath: String): ServletContext {
         throw UnsupportedOperationException("not implemented")
@@ -266,11 +264,9 @@ open class MockContext : ServletContext, Serializable {
         throw UnsupportedOperationException("not implemented")
     }
 
-    /* TODO: Servlet 4 API
     override fun addJspFile(servletName: String, jspFile: String): ServletRegistration.Dynamic {
         throw UnsupportedOperationException("not implemented")
     }
-     */
 
     override fun getServlets(): Enumeration<Servlet> = Collections.emptyEnumeration()
 

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpEnvironment.kt

@@ -11,8 +11,8 @@ package com.vaadin.testbench.unit.mocks
 
 import java.util.Collections
 import java.util.Enumeration
-import javax.servlet.ServletConfig
-import javax.servlet.ServletContext
+import jakarta.servlet.ServletConfig
+import jakarta.servlet.ServletContext
 
 
 open class MockServletConfig(val context: ServletContext) : ServletConfig {

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSession.kt

@@ -17,9 +17,9 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
 
-import javax.servlet.ServletContext
-import javax.servlet.http.HttpSession
-import javax.servlet.http.HttpSessionContext
+import jakarta.servlet.ServletContext
+import jakarta.servlet.http.HttpSession
+import jakarta.servlet.http.HttpSessionContext
 
 /**
  * A standalone implementation of the [HttpSession] interface.

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockRequest.kt

@@ -15,19 +15,19 @@ import java.util.Collections
 import java.util.Enumeration
 import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
-import javax.servlet.AsyncContext
-import javax.servlet.DispatcherType
-import javax.servlet.RequestDispatcher
-import javax.servlet.ServletContext
-import javax.servlet.ServletInputStream
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-import javax.servlet.http.Cookie
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-import javax.servlet.http.HttpSession
-import javax.servlet.http.HttpUpgradeHandler
-import javax.servlet.http.Part
+import jakarta.servlet.AsyncContext
+import jakarta.servlet.DispatcherType
+import jakarta.servlet.RequestDispatcher
+import jakarta.servlet.ServletContext
+import jakarta.servlet.ServletInputStream
+import jakarta.servlet.ServletRequest
+import jakarta.servlet.ServletResponse
+import jakarta.servlet.http.Cookie
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpSession
+import jakarta.servlet.http.HttpUpgradeHandler
+import jakarta.servlet.http.Part
 
 open class MockRequest(private var session: HttpSession) : HttpServletRequest {
 

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockResponse.kt

@@ -14,9 +14,9 @@ import java.io.PrintWriter
 import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
-import javax.servlet.ServletOutputStream
-import javax.servlet.http.Cookie
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.ServletOutputStream
+import jakarta.servlet.http.Cookie
+import jakarta.servlet.http.HttpServletResponse
 
 open class MockResponse : HttpServletResponse {
     override fun encodeURL(url: String): String = url

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinHelper.kt

@@ -10,7 +10,7 @@
 package com.vaadin.testbench.unit.mocks
 
 import java.io.File
-import javax.servlet.ServletContext
+import jakarta.servlet.ServletContext
 import com.vaadin.flow.di.Lookup
 import com.vaadin.flow.di.LookupInitializer
 import com.vaadin.flow.server.VaadinContext

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinServlet.kt

@@ -11,8 +11,8 @@ package com.vaadin.testbench.unit.mocks
 
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.function.DeploymentConfiguration
 import com.vaadin.flow.server.*

vaadin-testbench-unit/src/main/kotlin/com/vaadin/testbench/unit/mocks/SessionAttributeMap.kt

@@ -10,7 +10,7 @@
 package com.vaadin.testbench.unit.mocks
 
 import java.util.AbstractMap
-import javax.servlet.http.HttpSession
+import jakarta.servlet.http.HttpSession
 
 /**
  * A live map of all attributes in this session. Modifications to the map will be

vaadin-testbench-unit/src/test/java/com/testapp/security/ProtectedView.java

@@ -10,13 +10,12 @@
 
 package com.testapp.security;
 
-import javax.annotation.security.PermitAll;
+import jakarta.annotation.security.PermitAll;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.router.Route;
-import com.vaadin.flow.router.RouteAlias;
 
 @Tag("div")
 @Route(value = "", registerAtStartup = false)

vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt

@@ -65,13 +65,13 @@ fun DynaNodeGroup.componentUtilsTests() {
 
     test("tooltip") {
         val b = Button()
-        expect(null) { b.tooltip }
-        b.tooltip = ""
-        expect<String?>("") { b.tooltip } // https://youtrack.jetbrains.com/issue/KT-32501
-        b.tooltip = "foo"
-        expect<String?>("foo") { b.tooltip } // https://youtrack.jetbrains.com/issue/KT-32501
-        b.tooltip = null
-        expect(null) { b.tooltip }
+        expect(null) { b.tooltip.text }
+        b.setTooltipText("")
+        expect<String?>("") { b.tooltip.text } // https://youtrack.jetbrains.com/issue/KT-32501
+        b.setTooltipText("foo")
+        expect<String?>("foo") { b.tooltip.text } // https://youtrack.jetbrains.com/issue/KT-32501
+        b.setTooltipText(null)
+        expect(null) { b.tooltip.text }
     }
 
     test("addContextMenuListener smoke") {

vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/MockVaadinTest.kt

@@ -12,7 +12,7 @@
 package com.vaadin.testbench.unit.internal
 
 import java.util.concurrent.atomic.AtomicReference
-import javax.servlet.http.Cookie
+import jakarta.servlet.http.Cookie
 import kotlin.concurrent.thread
 import kotlin.test.expect
 import com.vaadin.flow.component.AttachEvent

vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSessionTest.kt

@@ -10,7 +10,7 @@
 package com.vaadin.testbench.unit.mocks
 
 import java.io.Serializable
-import javax.servlet.http.HttpSession
+import jakarta.servlet.http.HttpSession
 import kotlin.test.expect
 import com.github.mvysny.dynatest.DynaTest
 import com.github.mvysny.dynatest.cloneBySerialization

vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/mocks/MockResponseTest.kt

@@ -9,7 +9,7 @@
  */
 package com.vaadin.testbench.unit.mocks
 
-import javax.servlet.http.Cookie
+import jakarta.servlet.http.Cookie
 import kotlin.test.expect
 import com.github.mvysny.dynatest.DynaTest
 import com.github.mvysny.dynatest.expectList