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 e93b4e43f6 FELIX-6825 : Allow bridge to be used with Servlet API 6
e93b4e43f6 is described below
commit e93b4e43f6d15ae0158d78b4db0ab8208dbaad25
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Mar 12 15:20:29 2026 +0100
FELIX-6825 : Allow bridge to be used with Servlet API 6
---
http/bridge/pom.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index b4b48a42d7..39eb01b473 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -75,8 +75,6 @@
org.apache.felix.http.bridge.internal.*
</Private-Package>
<Import-Package>
- jakarta.servlet,
- jakarta.servlet.http,
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
sun.misc;resolution:=optional,
sun.nio.ch;resolution:=optional,
@@ -105,14 +103,12 @@
<goal>bundle</goal>
</goals>
</execution>
-<!--
<execution>
<id>baseline</id>
<goals>
<goal>baseline</goal>
</goals>
</execution>
--->
<execution>
<id>light-bundle</id>
<goals>
@@ -141,7 +137,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
+ <version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -170,16 +166,17 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>5.1.14</version>
+ <version>5.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.wrappers</artifactId>
<version>6.1.0</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
