From 43a8113901f823ec961e36821f7facfaccc6150f Mon Sep 17 00:00:00 2001
From: Arunan Sugunakumar <arunans23@gmail.com>
Date: Tue, 13 Feb 2024 11:43:56 +0530
Subject: [PATCH] Upgrade httpcore-nio to use forked version

---
 .../org.apache.synapse.transport.nhttp.feature/pom.xml    | 4 ++--
 modules/transports/core/nhttp/pom.xml                     | 2 +-
 pom.xml                                                   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml
index 676ea6ae5e..c35f6e5c7f 100644
--- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml
+++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml
@@ -44,7 +44,7 @@
             <artifactId>httpcore</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents.wso2</groupId>
+            <groupId>org.wso2.orbit.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>
         </dependency>
         <dependency>
@@ -78,7 +78,7 @@
                                 <bundleDef>org.apache.synapse:synapse-commons</bundleDef>
                                 <bundleDef>org.apache.synapse:synapse-nhttp-transport</bundleDef>
                                 <bundleDef>org.apache.httpcomponents.wso2:httpcore</bundleDef>
-                                <bundleDef>org.apache.httpcomponents.wso2:httpcore-nio</bundleDef>
+                                <bundleDef>org.wso2.orbit.httpcomponents:httpcore-nio</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.apache.httpcomponents:httpclient</bundleDef>
                             </bundles>
                         </configuration>
diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml
index 62af97332e..f4fde36557 100644
--- a/modules/transports/core/nhttp/pom.xml
+++ b/modules/transports/core/nhttp/pom.xml
@@ -176,7 +176,7 @@
             <artifactId>httpcore</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.wso2.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index f5afb39f48..3efa7ce6b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -667,9 +667,9 @@
              <version>${httpcore.version}</version>
          </dependency>
          <dependency>
-             <groupId>org.apache.httpcomponents</groupId>
+             <groupId>org.wso2.httpcomponents</groupId>
              <artifactId>httpcore-nio</artifactId>
-             <version>${httpcore-nio.version}</version>
+             <version>${httpcore-nio.wso2.version}</version>
          </dependency>
          <dependency>
              <groupId>org.apache.httpcomponents</groupId>
@@ -682,7 +682,7 @@
              <version>${httpcore.wso2.version}</version>
          </dependency>
          <dependency>
-             <groupId>org.apache.httpcomponents.wso2</groupId>
+             <groupId>org.wso2.orbit.httpcomponents</groupId>
              <artifactId>httpcore-nio</artifactId>
              <version>${httpcore-nio.wso2.version}</version>
          </dependency>
@@ -1476,7 +1476,7 @@
        <httpcore.version>4.4.16</httpcore.version>
       <httpcore.wso2.version>${httpcore.version}.wso2v1</httpcore.wso2.version>
        <httpcore-nio.version>4.4.16</httpcore-nio.version>
-       <httpcore-nio.wso2.version>${httpcore-nio.version}.wso2v1</httpcore-nio.wso2.version>
+       <httpcore-nio.wso2.version>${httpcore-nio.version}-wso2v4</httpcore-nio.wso2.version>
        <hc.httpclient.version>4.5.13</hc.httpclient.version>
        <httpclient.wso2.version>${hc.httpclient.version}.wso2v1</httpclient.wso2.version>
       <aspectj.version>1.8.5</aspectj.version>