Skip to content
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

Upgrade calcite to 1.37.0 used by io-expansion service #33826

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Upgrade calcite to 1.37.0 used by io-expansion service #33826

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
2 changes: 1 addition & 1 deletion .github/trigger_files/IO_Iceberg_Integration_Tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
"modification": 1
"modification": 2
}
19 changes: 16 additions & 3 deletions sdks/java/io/iceberg/hive/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import groovy.json.JsonOutput

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand Down Expand Up @@ -32,6 +30,7 @@ def hbase_version = "2.6.1-hadoop3"
def hadoop_version = "3.4.1"
def iceberg_version = "1.6.1"
def avatica_version = "1.25.0"
def calcite_version = "1.37.0"

dependencies {
// dependencies needed to run with iceberg's hive catalog
Expand All @@ -44,12 +43,26 @@ dependencies {
exclude group: "org.apache.hadoop", module: "hadoop-yarn-server-resourcemanager"
// old hadoop-yarn-server-resourcemanager contains critical log4j and hadoop vulneribility
exclude group: "org.apache.hbase", module: "hbase-client"
// old calcite leaks old protobuf-java
// old calcite avatica leaks old protobuf-java
exclude group: "org.apache.calcite.avatica", module: "avatica"
// old calcite vulnerabilities
exclude group: "org.apache.calcite", module: "calcite-core"
exclude group: "org.apache.calcite", module: "calcite-druid"
}
runtimeOnly ("org.apache.hadoop:hadoop-yarn-server-resourcemanager:$hadoop_version")
runtimeOnly ("org.apache.hbase:hbase-client:$hbase_version")
runtimeOnly ("org.apache.calcite.avatica:avatica-core:$avatica_version")
// these exlusions were inherit from hive-exec-3.1.3.pom
runtimeOnly ("org.apache.calcite:calcite-core:$calcite_version") {
exclude group: "net.hydromatic", module: "aggdesigner-algorithm"
exclude group: "org.hsqldb", module: "hsqldb"
exclude group: "com.fasterxml.jackson.core", module: "*"
exclude group: "org.apache.calcite.avatica", module: "avatica-core"
}
runtimeOnly ("org.apache.calcite:calcite-druid:$calcite_version") {
exclude group: "com.fasterxml.jackson.core", module: "*"
exclude group: "org.apache.calcite.avatica", module: "avatica-core"
}
runtimeOnly ("org.apache.hive:hive-metastore:$hive_version")
}

Expand Down
Loading