From c570cf49ca655b6c6c05eb0571769917e1139b87 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Thu, 21 Dec 2023 16:49:49 +0900
Subject: [PATCH 1/2] [DROOLS-7598] Upgrade tomcat version

---
 kie-tomcat-integration/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kie-tomcat-integration/pom.xml b/kie-tomcat-integration/pom.xml
index 4366658a4a..7c9e0c65f2 100755
--- a/kie-tomcat-integration/pom.xml
+++ b/kie-tomcat-integration/pom.xml
@@ -18,7 +18,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

From 330c9611923407e7d579045b6c4d8a1bc113b546 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Thu, 21 Dec 2023 19:05:12 +0900
Subject: [PATCH 2/2] excluded servlet-api to avoid BanDuplicateClasses

---
 kie-tomcat-integration/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kie-tomcat-integration/pom.xml b/kie-tomcat-integration/pom.xml
index 7c9e0c65f2..8820ff7f8d 100755
--- a/kie-tomcat-integration/pom.xml
+++ b/kie-tomcat-integration/pom.xml
@@ -25,6 +25,12 @@
       <groupId>jakarta.security.jacc</groupId>
       <artifactId>jakarta.security.jacc-api</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>