(felix-dev) branch master updated: FELIX-6762 : Support Jakarta Servlet 6.1

[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 5d4fa76b68 FELIX-6762 : Support Jakarta Servlet 6.1
5d4fa76b68 is described below

commit 5d4fa76b687f9c208930fdd068a697df86b6336f
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Apr 3 06:45:45 2025 +0200

    FELIX-6762 : Support Jakarta Servlet 6.1
---
 http/servlet-api/pom.xml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/http/servlet-api/pom.xml b/http/servlet-api/pom.xml
index bfbb4de269..b2de8f7593 100644
--- a/http/servlet-api/pom.xml
+++ b/http/servlet-api/pom.xml
@@ -21,21 +21,24 @@
     <name>Apache Felix Servlet API</name>
     <description>Provides the Servlet API for use by applications</description>
     <artifactId>org.apache.felix.http.servlet-api</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
         
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
         
<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>
+        <baseline.skip>true</baseline.skip>
+    </properties>
 
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.1</version>
                 <executions>
                     <execution>
                         <id>process-servlet-5</id>
@@ -101,16 +104,16 @@
                             
jakarta.servlet.annotation;version=5.0;uses:="jakarta.servlet",
                             jakarta.servlet.descriptor;version=5.0,
                             
jakarta.servlet.http;version=5.0;uses:="jakarta.servlet",
-                            
jakarta.servlet;version=6.0;uses:="jakarta.servlet.annotation,jakarta.servlet.descriptor",
-                            
jakarta.servlet.annotation;version=6.0;uses:="jakarta.servlet",
-                            jakarta.servlet.descriptor;version=6.0,
-                            
jakarta.servlet.http;version=6.0;uses:="jakarta.servlet"
+                            
jakarta.servlet;version=6.1;uses:="jakarta.servlet.annotation,jakarta.servlet.descriptor",
+                            
jakarta.servlet.annotation;version=6.1;uses:="jakarta.servlet",
+                            jakarta.servlet.descriptor;version=6.1,
+                            
jakarta.servlet.http;version=6.1;uses:="jakarta.servlet"
                         </Export-Package>
                         <Import-Package>!*</Import-Package>
                         <Provide-Capability>
                             
osgi.contract;osgi.contract="JavaServlet";version:List&lt;Version&gt;="2.6,3.0,3.1,4.0";
                             
uses:="javax.servlet,javax.servlet.http,javax.servlet.descriptor,javax.servlet.annotation",
-                            
osgi.contract;osgi.contract="JakartaServlet";version:List&lt;Version&gt;="5.0,6.0";
+                            
osgi.contract;osgi.contract="JakartaServlet";version:List&lt;Version&gt;="5.0,6.0,6.1";
                             
uses:="jakarta.servlet,jakarta.servlet.http,jakarta.servlet.descriptor,jakarta.servlet.annotation"
                         </Provide-Capability>
                         
<Embed-Dependency>tomcat-servlet-api;inline=true,jakarta.servlet-api;inline=true</Embed-Dependency>
@@ -124,12 +127,12 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-servlet-api</artifactId>
-            <version>9.0.80</version>
+            <version>9.0.102</version>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0</version>
         </dependency>
     </dependencies>