diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 776b6c88f597..fae327e2ac31 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -204,6 +205,8 @@ jakarta-el-api = { module = "jakarta.el:jakarta.el-api", version.ref = "jakarta- jakarta-servlet = {module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet-api"} 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" } +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-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" } junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } diff --git a/kafka-connect/build.gradle b/kafka-connect/build.gradle index 009ae719bac5..307c9e8b269a 100644 --- a/kafka-connect/build.gradle +++ b/kafka-connect/build.gradle @@ -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 { diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle index ead4a32f49b0..d6453ab49885 100644 --- a/spark/v3.4/build.gradle +++ b/spark/v3.4/build.gradle @@ -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 } @@ -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}") diff --git a/spark/v3.5/build.gradle b/spark/v3.5/build.gradle index a69b78e5ad8e..20b7a889a38b 100644 --- a/spark/v3.5/build.gradle +++ b/spark/v3.5/build.gradle @@ -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 @@ -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}")