From d52615ae541cde662b29a70c39702cba53fa2b57 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:13:03 +0100
Subject: [PATCH] HDDS-11733. Remove okio versioning and unused okhttp
 dependency (#7447)

---
 hadoop-ozone/dist/src/main/license/bin/LICENSE.txt |  3 +++
 pom.xml                                            | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 9cb9202be0b..1c70fa0401b 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -300,6 +300,7 @@ Apache License 2.0
    com.nimbusds:nimbus-jose-jwt
    com.squareup.okhttp3:okhttp
    com.squareup.okio:okio
+   com.squareup.okio:okio-jvm
    commons-beanutils:commons-beanutils
    commons-cli:commons-cli
    commons-codec:commons-codec
@@ -431,6 +432,8 @@ Apache License 2.0
    org.jetbrains:annotations
    org.jetbrains.kotlin:kotlin-stdlib
    org.jetbrains.kotlin:kotlin-stdlib-common
+   org.jetbrains.kotlin:kotlin-stdlib-jdk7
+   org.jetbrains.kotlin:kotlin-stdlib-jdk8
    org.jboss.weld.servlet:weld-servlet-shaded
    org.jheaps:jheaps
    org.jooq:jooq
diff --git a/pom.xml b/pom.xml
index 8f175d2959f..5dde16810fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,8 +219,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <guice.version>6.0.0</guice.version>
     <gson.version>2.10.1</gson.version>
 
-    <okhttp.version>2.7.5</okhttp.version>
-    <okio.version>3.6.0</okio.version>
     <mockito.version>4.11.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <junit5.version>5.11.3</junit5.version>
@@ -320,16 +318,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.squareup.okio</groupId>
-        <artifactId>okio</artifactId>
-        <version>${okio.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.okhttp</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>${okhttp.version}</version>
-      </dependency>
       <dependency>
         <groupId>info.picocli</groupId>
         <artifactId>picocli</artifactId>