diff --git a/LICENSE-binary b/LICENSE-binary index d838ac1cb6..ffb9657a03 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -241,8 +241,8 @@ com.google.guava:guava:27.0-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.microsoft.azure:azure-storage:7.0.0 com.nimbusds:nimbus-jose-jwt:9.8.1 -com.squareup.okhttp3:okhttp:4.9.3 -com.squareup.okio:okio:1.6.0 +com.squareup.okhttp3:okhttp:4.10.0 +com.squareup.okio:okio:3.2.0 com.zaxxer:HikariCP:4.0.3 commons-beanutils:commons-beanutils:1.9.3 commons-cli:commons-cli:1.2 diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index ddafdab9b1..d5185f0fff 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -157,6 +157,8 @@ org.bouncycastle:* org.xerial.snappy:* + + org.jetbrains.kotlin:* diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 5b5ffe1b00..4391995d20 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -383,6 +383,11 @@ mockwebserver test + + com.squareup.okio + okio-jvm + test + dnsjava dnsjava diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index 9bb0932d32..3337f7d408 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -37,6 +37,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.squareup.okhttp3 okhttp + + + com.squareup.okio + okio-jvm + + + + + com.squareup.okio + okio-jvm org.jetbrains.kotlin diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index f60be75350..6fc731c854 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -132,9 +132,10 @@ 4.0.3 6.2.1.jre7 2.7.5 - 4.9.3 - 1.4.10 - 1.4.10 + 4.10.0 + 3.2.0 + 1.6.20 + 1.6.20 2.0.6.1 5.2.0 2.2.21 @@ -234,8 +235,17 @@ org.jetbrains.kotlin kotlin-stdlib-common + + com.squareup.okio + okio-jvm + + + com.squareup.okio + okio-jvm + ${okio.version} + org.jetbrains.kotlin kotlin-stdlib @@ -255,8 +265,18 @@ com.squareup.okhttp3 mockwebserver - 4.9.3 + ${okhttp3.version} test + + + com.squareup.okio + okio-jvm + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + jdiff