Skip to content

Commit ec1b866

Browse files
authored
Bump com.squareup.okhttp3:okhttp from 4.12.0 to 5.4.0 (#3630)
1 parent 6129423 commit ec1b866

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

parquet-hadoop/pom.xml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@
6262
<groupId>org.apache.hadoop</groupId>
6363
<artifactId>hadoop-client</artifactId>
6464
<scope>provided</scope>
65+
<exclusions>
66+
<!-- hadoop-hdfs-client pulls in the legacy okhttp 2.x / okio 1.x, which
67+
clash with okhttp 5.x / okio 3.x used by the interop tests and break
68+
okhttp3.internal._UtilCommonKt initialization. -->
69+
<exclusion>
70+
<groupId>com.squareup.okhttp</groupId>
71+
<artifactId>okhttp</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>com.squareup.okio</groupId>
75+
<artifactId>okio</artifactId>
76+
</exclusion>
77+
</exclusions>
6578
</dependency>
6679
<dependency>
6780
<groupId>org.apache.hadoop</groupId>
@@ -182,8 +195,8 @@
182195
</dependency>
183196
<dependency>
184197
<groupId>com.squareup.okhttp3</groupId>
185-
<artifactId>okhttp</artifactId>
186-
<version>4.12.0</version>
198+
<artifactId>okhttp-jvm</artifactId>
199+
<version>5.4.0</version>
187200
<scope>test</scope>
188201
</dependency>
189202
<dependency>

parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void refreshToken() {
133133
private String getContentFromTransitEngine(String endPoint, String jPayload, String masterKeyIdentifier) {
134134
LOG.info("masterKeyIdentifier: " + masterKeyIdentifier);
135135

136-
final RequestBody requestBody = RequestBody.create(JSON_MEDIA_TYPE, jPayload);
136+
final RequestBody requestBody = RequestBody.create(jPayload, JSON_MEDIA_TYPE);
137137
Request request = new Request.Builder()
138138
.url(endPoint + masterKeyIdentifier)
139139
.header(tokenHeader, kmsToken)

0 commit comments

Comments
 (0)