Skip to content
Draft
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
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ flink21 = { strictly = "2.1.0"}
google-libraries-bom = "26.79.0"
gcs-analytics-core = "1.2.3"
guava = "33.5.0-jre"
hadoop3 = "3.4.3"
hadoop3 = "3.5.0"
httpcomponents-httpclient5 = "5.6"
hive2 = { strictly = "2.3.10"} # see rich version usage explanation above
immutables-value = "2.12.1"
Expand All @@ -63,6 +63,7 @@ jackson214 = { strictly = "2.14.2"}
jackson215 = { strictly = "2.15.2"} # see rich version usage explanation above
jakarta-el-api = "3.0.3"
jakarta-servlet-api = "6.1.0"
javax-servlet-api = "4.0.1"
jaxb-api = "2.3.1"
jaxb-runtime = "2.3.9"
jetty = "12.1.8"
Expand Down Expand Up @@ -202,6 +203,8 @@ flink21-test-utilsjunit = { module = "org.apache.flink:flink-test-utils-junit",
guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
jakarta-el-api = { module = "jakarta.el:jakarta.el-api", version.ref = "jakarta-el-api" }
jakarta-servlet = {module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet-api"}
javax-servlet = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet-api" }
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
jetty-compression-server = { module = "org.eclipse.jetty.compression:jetty-compression-server", version.ref = "jetty" }
jetty-compression-gzip = { module = "org.eclipse.jetty.compression:jetty-compression-gzip", version.ref = "jetty" }
jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
Expand Down
2 changes: 2 additions & 0 deletions kafka-connect/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ project(':iceberg-kafka-connect:iceberg-kafka-connect-runtime') {
}
all {
exclude group: 'javax.activation', module: 'activation'
exclude group: 'com.sun.activation', module: 'jakarta.activation'
exclude group: 'javax.annotation', module: 'javax.annotation-api'
exclude group: 'org.jspecify', module: 'jspecify'
// force upgrades for dependencies with known vulnerabilities...
resolutionStrategy {
Expand Down
2 changes: 2 additions & 0 deletions spark/v3.4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer

// Required because we remove antlr plugin dependencies from the compile configuration, see note above
runtimeOnly libs.antlr.runtime
testRuntimeOnly libs.javax.servlet
antlr libs.antlr.antlr4
}

Expand Down Expand Up @@ -259,6 +260,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
// runtime dependencies for running REST Catalog based integration test
integrationRuntimeOnly project(path: ':iceberg-core', configuration: 'testArtifacts')
integrationRuntimeOnly (project(path: ':iceberg-open-api', configuration: 'testFixturesRuntimeElements'))
integrationRuntimeOnly libs.javax.servlet

// Not allowed on our classpath, only the runtime jar is allowed
integrationCompileOnly project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}")
Expand Down
2 changes: 2 additions & 0 deletions spark/v3.5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
testImplementation libs.parquet.hadoop
testImplementation libs.awaitility
testImplementation(testFixtures(project(':iceberg-parquet')))
testRuntimeOnly libs.javax.servlet

// Required because we remove antlr plugin dependencies from the compile configuration, see note above
runtimeOnly libs.antlr.runtime
Expand Down Expand Up @@ -261,6 +262,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
// runtime dependencies for running REST Catalog based integration test
integrationRuntimeOnly project(path: ':iceberg-core', configuration: 'testArtifacts')
integrationRuntimeOnly (project(path: ':iceberg-open-api', configuration: 'testFixturesRuntimeElements'))
integrationRuntimeOnly libs.javax.servlet

// Not allowed on our classpath, only the runtime jar is allowed
integrationCompileOnly project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}")
Expand Down
Loading