From c9e9cc16e572e6e6200855f0308b60a71b055d5d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Dec 2023 18:08:54 +0900
Subject: [PATCH] [DROOLS-7598] Upgrade tomcat version (#2413) (#2415)

Co-authored-by: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
---
 narayana-integration-bom/pom.xml | 2 +-
 pom.xml                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/narayana-integration-bom/pom.xml b/narayana-integration-bom/pom.xml
index 93f935d9aa0..238320f2386 100644
--- a/narayana-integration-bom/pom.xml
+++ b/narayana-integration-bom/pom.xml
@@ -24,7 +24,7 @@
     <!-- narayana dependencies for tomcat and kie server -->
     <version.org.jboss.narayana.tomcat>5.9.0.Final</version.org.jboss.narayana.tomcat>
     <!-- DBCP connection pooling for Narayana -->
-    <version.org.apache.tomcat.tomcat-dbcp>9.0.21</version.org.apache.tomcat.tomcat-dbcp>
+    <version.org.apache.tomcat.tomcat-dbcp>9.0.62</version.org.apache.tomcat.tomcat-dbcp>
 
     <version.org.jboss.transaction.spi>7.6.1.Final</version.org.jboss.transaction.spi>
     <version.jakarta.transaction-api>1.3.3</version.jakarta.transaction-api>
diff --git a/pom.xml b/pom.xml
index 5eb47207a43..a03a3cd8a02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
     <version.org.apache.neethi>3.1.1</version.org.apache.neethi>
     <version.org.apache.poi>4.1.2</version.org.apache.poi>
     <version.org.apache.sshd>2.9.2</version.org.apache.sshd>
-    <version.org.apache.tomcat>6.0.32</version.org.apache.tomcat>
+    <version.org.apache.tomcat>9.0.62</version.org.apache.tomcat>
     <version.org.apache.velocity>1.7</version.org.apache.velocity>
     <version.org.apache.xmlbeans>3.1.0</version.org.apache.xmlbeans>
     <version.org.apache.ws.xmlschema>2.2.5</version.org.apache.ws.xmlschema>
@@ -279,7 +279,7 @@
     <version.org.yaml.snakeyaml>2.0</version.org.yaml.snakeyaml>
     <version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
     <version.rome>1.0</version.rome>
-    <version.tomcat>9.0.22</version.tomcat>
+    <version.tomcat>${version.org.apache.tomcat}</version.tomcat>
     <version.wsdl4j>1.6.3</version.wsdl4j>
     <version.xerces>2.12.0.SP04</version.xerces>
     <version.xalan>2.7.3</version.xalan>
@@ -4012,7 +4012,7 @@
 
       <dependency>
         <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina</artifactId>
+        <artifactId>tomcat-catalina</artifactId>
         <version>${version.org.apache.tomcat}</version>
         <exclusions>
           <exclusion>