Use servlet 6

vaadin · Nov 11, 2022 · b331d9c · b331d9c
1 parent 1976968
commit b331d9c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 45 deletions.
diff --git a/flow-commons-upload/pom.xml b/flow-commons-upload/pom.xml
@@ -19,6 +19,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>

diff --git a/flow-lit-template/pom.xml b/flow-lit-template/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/flow-plugins/flow-plugin-base/pom.xml b/flow-plugins/flow-plugin-base/pom.xml
@@ -44,6 +44,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>

diff --git a/flow-polymer-template/pom.xml b/flow-polymer-template/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/MockServletContext.java b/flow-server/src/test/java/com/vaadin/flow/server/MockServletContext.java
@@ -138,38 +138,6 @@ public RequestDispatcher getNamedDispatcher(String name) {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see jakarta.servlet.ServletContext#getServlet(java.lang.String)
-     */
-    @Override
-    public Servlet getServlet(String name) throws ServletException {
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see jakarta.servlet.ServletContext#getServlets()
-     */
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public Enumeration getServlets() {
-        return Collections.enumeration(Collections.EMPTY_SET);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see jakarta.servlet.ServletContext#getServletNames()
-     */
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public Enumeration getServletNames() {
-        return null;
-    }
-
     /*
      * (non-Javadoc)
      *
@@ -179,16 +147,6 @@ public Enumeration getServletNames() {
     public void log(String msg) {
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see jakarta.servlet.ServletContext#log(java.lang.Exception,
-     * java.lang.String)
-     */
-    @Override
-    public void log(Exception exception, String msg) {
-    }
-
     /*
      * (non-Javadoc)
      *

diff --git a/flow-tests/test-memory-leaks/pom.xml b/flow-tests/test-memory-leaks/pom.xml
@@ -56,6 +56,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -235,7 +235,7 @@
             <dependency>
                 <groupId>jakarta.servlet</groupId>
                 <artifactId>jakarta.servlet-api</artifactId>
-                <version>5.0.0</version>
+                <version>6.0.0</version>
             </dependency>
 
             <dependency>