Skip to content

Bump com.squareup.okhttp3:okhttp from 4.12.0 to 5.4.0 #3630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nastra wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

Bump com.squareup.okhttp3:okhttp from 4.12.0 to 5.4.0 #3630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions parquet-hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down