[felix-dev] branch master updated: FELIX-6655 : Include Servlet API 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 3287699dd5 FELIX-6655 : Include Servlet API 6
3287699dd5 is described below

commit 3287699dd5eef46f2f50bda7f8008fa4fe776bda
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Sep 16 10:32:42 2023 +0200

    FELIX-6655 : Include Servlet API 6
---
 http/servlet-api/pom.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/http/servlet-api/pom.xml b/http/servlet-api/pom.xml
index 1a14e810ee..56bf7d9a49 100644
--- a/http/servlet-api/pom.xml
+++ b/http/servlet-api/pom.xml
@@ -31,12 +31,17 @@
       <tag>HEAD</tag>
   </scm>
 
+    <properties>
+        <!-- Skip baselining -->
+        <baseline.skip>true</baseline.skip>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.3</version>
+                <version>5.1.9</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -60,19 +65,21 @@
                             
jakarta.servlet;version=5.0;uses:="jakarta.servlet.annotation,jakarta.servlet.descriptor",
                             
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.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"
                         </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";
+                            
osgi.contract;osgi.contract="JakartaServlet";version:List&lt;Version&gt;="5.0,6.0";
                             
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>
                     </instructions>
-                    <!-- Skip baselining -->
-                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
@@ -82,12 +89,12 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-servlet-api</artifactId>
-            <version>9.0.56</version>
+            <version>9.0.80</version>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+            <version>6.0.0</version>
         </dependency>
     </dependencies>