From 5fed3bcf1209aa4da78c6288fb986300cbb0300e Mon Sep 17 00:00:00 2001
From: Thilini Shanika <tgtshanika@gmail.com>
Date: Fri, 15 Sep 2023 09:34:04 +0530
Subject: [PATCH] Upgrading guava and netty versions

---
 components/org.wso2.transport.http.netty/pom.xml       | 2 +-
 features/org.wso2.transport.http.netty.feature/pom.xml | 3 +--
 pom.xml                                                | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/org.wso2.transport.http.netty/pom.xml b/components/org.wso2.transport.http.netty/pom.xml
index 9831dec36..f9c573e50 100644
--- a/components/org.wso2.transport.http.netty/pom.xml
+++ b/components/org.wso2.transport.http.netty/pom.xml
@@ -95,7 +95,7 @@
             <artifactId>commons-pool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.org.yaml</groupId>
+            <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
 
diff --git a/features/org.wso2.transport.http.netty.feature/pom.xml b/features/org.wso2.transport.http.netty.feature/pom.xml
index f71b7b86b..084ec3c02 100644
--- a/features/org.wso2.transport.http.netty.feature/pom.xml
+++ b/features/org.wso2.transport.http.netty.feature/pom.xml
@@ -171,9 +171,8 @@
                                     <symbolicName>commons-pool</symbolicName>
                                     <version>${commons.pool.version}</version>
                                 </bundle>
-
                                 <bundle>
-                                    <symbolicName>snakeyaml</symbolicName>
+                                    <symbolicName>org.yaml.snakeyaml</symbolicName>
                                     <version>${org.snakeyaml.version}</version>
                                 </bundle>
                                 <bundle>
diff --git a/pom.xml b/pom.xml
index eceaae1b3..b28da77e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
                 <version>${slf4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.orbit.org.yaml</groupId>
+                <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
                 <version>${org.snakeyaml.version}</version>
             </dependency>
@@ -405,7 +405,7 @@
         <!-- Dependencies -->
         <carbon.kernel.package.import.version.range>[5.0.0, 6.0.0)</carbon.kernel.package.import.version.range>
 
-        <netty.version>4.1.94.Final</netty.version>
+        <netty.version>4.1.97.Final</netty.version>
         <netty.package.import.version.range>[4.0.30, 5.0.0)</netty.package.import.version.range>
         <equinox.osgi.version>3.10.2.v20150203-1939</equinox.osgi.version>
         <equinox.osgi.services.version>3.4.0.v20140312-2051</equinox.osgi.services.version>
@@ -434,8 +434,8 @@
         <slf4j.logging.package.import.version.range>[1.7.1, 2.0.0)</slf4j.logging.package.import.version.range>
 
         <carbon.p2.plugin.version>2.0.1</carbon.p2.plugin.version>
-        <org.snakeyaml.version>2.0.0.wso2v1</org.snakeyaml.version>
-        <org.snakeyaml.package.import.version.range>[1.32.0, 2.0.0)</org.snakeyaml.package.import.version.range>
+        <org.snakeyaml.version>2.0</org.snakeyaml.version>
+        <org.snakeyaml.package.import.version.range>[1.32.0, 3.0.0)</org.snakeyaml.package.import.version.range>
 
         <!-- Package exports -->
         <netty.transport.package.export.version>${project.version}</netty.transport.package.export.version>