From 134a644d0af2e6e617160b3fefccb108ae36016a Mon Sep 17 00:00:00 2001
From: Eduard Tudenhoefner <etudenhoefner@gmail.com>
Date: Mon, 22 Jun 2026 19:47:30 +0200
Subject: [PATCH] Bump com.squareup.okhttp3:okhttp from 4.12.0 to 5.4.0

---
 parquet-hadoop/pom.xml                          | 17 +++++++++++++++--
 .../crypto/keytools/samples/VaultClient.java    |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 0cc17c819d..0426d9ff63 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -62,6 +62,19 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <!-- hadoop-hdfs-client pulls in the legacy okhttp 2.x / okio 1.x, which
+             clash with okhttp 5.x / okio 3.x used by the interop tests and break
+             okhttp3.internal._UtilCommonKt initialization. -->
+        <exclusion>
+          <groupId>com.squareup.okhttp</groupId>
+          <artifactId>okhttp</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>okio</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -182,8 +195,8 @@
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>4.12.0</version>
+      <artifactId>okhttp-jvm</artifactId>
+      <version>5.4.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
index fcaac1176d..8afa909203 100755
--- a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
@@ -133,7 +133,7 @@ private void refreshToken() {
   private String getContentFromTransitEngine(String endPoint, String jPayload, String masterKeyIdentifier) {
     LOG.info("masterKeyIdentifier: " + masterKeyIdentifier);
 
-    final RequestBody requestBody = RequestBody.create(JSON_MEDIA_TYPE, jPayload);
+    final RequestBody requestBody = RequestBody.create(jPayload, JSON_MEDIA_TYPE);
     Request request = new Request.Builder()
         .url(endPoint + masterKeyIdentifier)
         .header(tokenHeader, kmsToken)