Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions hive3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions spark/v2.4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions spark/v3.0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions spark/v3.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions versions.props
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
org.slf4j:* = 1.7.25
org.apache.avro:avro = 1.10.1
org.apache.avro:avro = 1.10.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it make sense to update to avro 1.11.0 since it has been around for a while already?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the purpose of updating Avro was to keep parquet-avro and avro in sync. That seems like a reasonable choice to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, +1

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
Expand Down