From 264c5284feff93a246e522372d144ec4e77a2e67 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sat, 30 Aug 2025 15:58:00 +0200
Subject: [PATCH] Use felix.http.servlet-api 1.2.0 (#4963)

* Use felix.http.servlet-api 1.2.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Exclude conflicting dependency on tomcat

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

---------

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index c30444fae..88ff5e6db 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -326,8 +326,14 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.http.servlet-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.2.0</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.spec</groupId>