Use servlet 6

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

Hide file tree

Showing 6 changed files with 6 additions and 3 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-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>