[felix-dev] branch master updated: FELIX-6626 : Support jakarta servlet registration

[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 03743a376d FELIX-6626 : Support jakarta servlet registration
03743a376d is described below

commit 03743a376d8097bee31566622e9f56d976dc1966
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Aug 24 07:38:43 2023 +0200

    FELIX-6626 : Support jakarta servlet registration
---
 webconsole/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 81aec2e835..68bc1d4808 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -45,13 +45,13 @@
             org.apache.felix.webconsole.servlet,
             org.apache.felix.webconsole.spi
        </webconsole.exports>
+       <servlet.api>5.0.0</servlet.api>
     </properties>
 
     <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>org.apache.felix.webconsole-4.8.0</tag>
     </scm>
 
     <build>
@@ -144,8 +144,8 @@
                             org.osgi.service.permissionadmin;version="[1.2,2)",
                             org.osgi.service.prefs;version="[1.1,2)",
                             org.osgi.service.wireadmin;version="[1.0,2)",
-                            jakarta.servlet;version="[5,6)",
-                            jakarta.servlet.http;version="[5,6)",
+                            jakarta.servlet;version="[5,7)",
+                            jakarta.servlet.http;version="[5,7)",
                             
org.apache.felix.http.javaxwrappers;version="[1,2)",
                             
org.apache.felix.http.jakartawrappers;version="[1,2)"
                         </DynamicImport-Package>
@@ -366,13 +366,13 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+           <version>${servlet.api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.wrappers</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>