[felix-dev] branch master updated: Make sure module works with jakarta servlet 6

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new bb08c8e097 Make sure module works with jakarta servlet 6
bb08c8e097 is described below

commit bb08c8e09762fc94e52ee7a0960999cfcd478b65
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Aug 15 10:28:20 2023 +0200

    Make sure module works with jakarta servlet 6
---
 http/sslfilter/pom.xml                                         | 10 +++++++---
 .../felix/http/sslfilter/internal/SslFilterResponseTest.java   |  6 +-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index 5ac1a66ba5..cb063130f1 100644
--- a/http/sslfilter/pom.xml
+++ b/http/sslfilter/pom.xml
@@ -36,14 +36,18 @@
         
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
       <tag>HEAD</tag>
-  </scm>
+   </scm>
+
+    <properties>
+        <servlet.api>5.0.0</servlet.api>
+    </properties>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.4</version>
+                <version>5.1.9</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>
@@ -81,7 +85,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+            <version>${servlet.api}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Test Dependencies -->
diff --git 
a/http/sslfilter/src/test/java/org/apache/felix/http/sslfilter/internal/SslFilterResponseTest.java
 
b/http/sslfilter/src/test/java/org/apache/felix/http/sslfilter/internal/SslFilterResponseTest.java
index bff83c3906..9f5ec691b7 100644
--- 
a/http/sslfilter/src/test/java/org/apache/felix/http/sslfilter/internal/SslFilterResponseTest.java
+++ 
b/http/sslfilter/src/test/java/org/apache/felix/http/sslfilter/internal/SslFilterResponseTest.java
@@ -515,10 +515,8 @@ public class SslFilterResponseTest
             committed = true;
         }
 
-        @Override
         public void setStatus(int sc, String sm) {
-            status = sc;
-            committed = true;
+            throw new UnsupportedOperationException();
         }
 
         @Override
@@ -577,7 +575,6 @@ public class SslFilterResponseTest
             return headers.get(name);
         }
 
-        @Override
         public String encodeUrl(String url) {
             throw new UnsupportedOperationException();
         }
@@ -587,7 +584,6 @@ public class SslFilterResponseTest
             throw new UnsupportedOperationException();
         }
 
-        @Override
         public String encodeRedirectUrl(String url) {
             throw new UnsupportedOperationException();
         }