diff --git a/hive3/build.gradle b/hive3/build.gradle index 5dddf8a6513f..2b395bf1f92d 100644 --- a/hive3/build.gradle +++ b/hive3/build.gradle @@ -77,9 +77,18 @@ project(':iceberg-hive3') { compileOnly("org.apache.hive:hive-metastore:${hiveVersion}") { exclude group: 'org.apache.orc' + exclude group: 'org.apache.parquet' } compileOnly("org.apache.hive:hive-serde:${hiveVersion}") { exclude group: 'org.apache.orc' + exclude group: 'org.apache.parquet' + } + + compileOnly("org.apache.parquet:parquet-avro") { + exclude group: 'org.apache.avro', module: 'avro' + // already shaded by Parquet + exclude group: 'it.unimi.dsi' + exclude group: 'org.codehaus.jackson' } testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts') diff --git a/spark/v2.4/build.gradle b/spark/v2.4/build.gradle index 6fa849d04a21..4cc20baea3db 100644 --- a/spark/v2.4/build.gradle +++ b/spark/v2.4/build.gradle @@ -32,6 +32,8 @@ configure(sparkProjects) { resolutionStrategy { force 'com.fasterxml.jackson.module:jackson-module-scala_2.11:2.11.4' force 'com.fasterxml.jackson.module:jackson-module-paranamer:2.11.4' + force 'com.fasterxml.jackson.core:jackson-core:2.11.4' + force 'com.fasterxml.jackson.core:jackson-databind:2.11.4' } } } diff --git a/spark/v3.0/build.gradle b/spark/v3.0/build.gradle index 3f68b929d7b0..102e8e05d815 100644 --- a/spark/v3.0/build.gradle +++ b/spark/v3.0/build.gradle @@ -33,6 +33,8 @@ configure(sparkProjects) { resolutionStrategy { force 'com.fasterxml.jackson.module:jackson-module-scala_2.12:2.11.4' force 'com.fasterxml.jackson.module:jackson-module-paranamer:2.11.4' + force 'com.fasterxml.jackson.core:jackson-core:2.11.4' + force 'com.fasterxml.jackson.core:jackson-databind:2.11.4' } } } diff --git a/spark/v3.1/build.gradle b/spark/v3.1/build.gradle index ad83725446a4..ffaa8a119a1a 100644 --- a/spark/v3.1/build.gradle +++ b/spark/v3.1/build.gradle @@ -33,6 +33,8 @@ configure(sparkProjects) { resolutionStrategy { force 'com.fasterxml.jackson.module:jackson-module-scala_2.12:2.11.4' force 'com.fasterxml.jackson.module:jackson-module-paranamer:2.11.4' + force 'com.fasterxml.jackson.core:jackson-core:2.11.4' + force 'com.fasterxml.jackson.core:jackson-databind:2.11.4' } } } diff --git a/versions.props b/versions.props index d19443f444dd..69a08ca22bb1 100644 --- a/versions.props +++ b/versions.props @@ -1,12 +1,12 @@ org.slf4j:* = 1.7.25 -org.apache.avro:avro = 1.10.1 +org.apache.avro:avro = 1.10.2 org.apache.calcite:* = 1.10.0 org.apache.flink:* = 1.14.3 org.apache.hadoop:* = 2.7.3 org.apache.hive:* = 2.3.8 org.apache.httpcomponents.client5:* = 5.1 org.apache.orc:* = 1.7.5 -org.apache.parquet:* = 1.12.2 +org.apache.parquet:* = 1.12.3 org.apache.spark:spark-hive_2.11 = 2.4.8 org.apache.spark:spark-avro_2.11 = 2.4.8 org.apache.pig:pig = 0.14.0