From 30282f6b59c93f0b37ea36892ef7c572274cd9dd Mon Sep 17 00:00:00 2001
From: tcdlpds <tcdlpds@gmail.com>
Date: Thu, 7 Mar 2024 16:07:39 +0530
Subject: [PATCH] Upgrade dependencies

---
 .../io.entgra.device.mgt.plugins.mobile.android/pom.xml  | 2 +-
 pom.xml                                                  | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
index 8e80f98e1..a12bbb446 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
@@ -181,7 +181,7 @@
             <artifactId>testng</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat.wso2</groupId>
+            <groupId>org.wso2.orbit.org.apache.tomcat</groupId>
             <artifactId>jdbc-pool</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index a25f05d2e..e19dbb1c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -492,15 +492,10 @@
                 <version>${orbit.h2.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.tomcat.wso2</groupId>
+                <groupId>org.wso2.orbit.org.apache.tomcat</groupId>
                 <artifactId>jdbc-pool</artifactId>
                 <version>${orbit.tomcat.jdbc.pooling.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.tomcat</groupId>
-                <artifactId>tomcat-servlet-api</artifactId>
-                <version>${orbit.version.tomcat-servlet-api}</version>
-            </dependency>
 
             <!-- Governance dependencies -->
             <dependency>
@@ -980,7 +975,7 @@
 
         <!--Orbit versions-->
         <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
-        <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
+        <orbit.tomcat.jdbc.pooling.version>9.0.71.wso2v1</orbit.tomcat.jdbc.pooling.version>
 
         <!-- CXF version -->
         <cxf.version>3.5.5</cxf.version>