From 8a5634c8ab1ce4aeb40e8a0a52356c0f731bf002 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Wed, 26 Jun 2024 17:39:01 -0400 Subject: [PATCH] Fix dependencies --- sdks/java/io/cdap/build.gradle | 1 + sdks/java/io/common/build.gradle | 3 ++- sdks/java/io/debezium/build.gradle | 2 ++ .../io/gcp/bigquery/StorageApiSinkSchemaUpdateIT.java | 2 +- sdks/java/io/hcatalog/build.gradle | 10 +--------- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sdks/java/io/cdap/build.gradle b/sdks/java/io/cdap/build.gradle index 75991fc9d5ab2..ae07c2e88db1f 100644 --- a/sdks/java/io/cdap/build.gradle +++ b/sdks/java/io/cdap/build.gradle @@ -68,6 +68,7 @@ dependencies { testImplementation library.java.vendored_guava_32_1_2_jre testImplementation library.java.junit testImplementation library.java.mockito_core + testImplementation library.java.postgres testImplementation library.java.testcontainers_postgresql testImplementation project(path: ":sdks:java:extensions:avro", configuration: "testRuntimeMigration") testImplementation project(path: ":sdks:java:testing:test-utils", configuration: "testRuntimeMigration") diff --git a/sdks/java/io/common/build.gradle b/sdks/java/io/common/build.gradle index 566c7b89188af..84ad1689511ab 100644 --- a/sdks/java/io/common/build.gradle +++ b/sdks/java/io/common/build.gradle @@ -28,7 +28,8 @@ dependencies { implementation library.java.postgres implementation library.java.slf4j_api implementation library.java.testcontainers_jdbc - implementation 'com.zaxxer:HikariCP-java6:2.3.13' + // TODO(https://github.com/apache/beam/issues/31678) HikariCP 5.x requires Java11+ + implementation 'com.zaxxer:HikariCP:4.0.3' implementation project(path: ":sdks:java:core", configuration: "shadow") testImplementation library.java.junit diff --git a/sdks/java/io/debezium/build.gradle b/sdks/java/io/debezium/build.gradle index f770a833df5e8..e3b88e22607d4 100644 --- a/sdks/java/io/debezium/build.gradle +++ b/sdks/java/io/debezium/build.gradle @@ -51,6 +51,8 @@ dependencies { testImplementation library.java.testcontainers_base testImplementation library.java.testcontainers_mysql testImplementation library.java.testcontainers_postgresql + // TODO(https://github.com/apache/beam/issues/31678) HikariCP 5.x requires Java11+ + testImplementation 'com.zaxxer:HikariCP:4.0.3' // Kafka connect dependencies implementation "org.apache.kafka:connect-api:2.5.0" diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiSinkSchemaUpdateIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiSinkSchemaUpdateIT.java index bc99a4f50f700..ae9e9cefb150b 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiSinkSchemaUpdateIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiSinkSchemaUpdateIT.java @@ -180,7 +180,7 @@ static class UpdateSchemaDoFn extends DoFn, TableRow> { @StateId(ROW_COUNTER) @SuppressWarnings("unused") - private final StateSpec<@org.jetbrains.annotations.NotNull ValueState> counter; + private final StateSpec> counter; public UpdateSchemaDoFn( String projectId, String datasetId, String tableId, TableSchema newSchema) { diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle index 345e480e6cfef..c333ad3bcc085 100644 --- a/sdks/java/io/hcatalog/build.gradle +++ b/sdks/java/io/hcatalog/build.gradle @@ -39,15 +39,6 @@ hadoopVersions.each {kv -> configurations.create("hadoopVersion$kv.key")} def hive_version = "3.1.3" -/* - * We need to rely on manually specifying these evaluationDependsOn to ensure that - * the following projects are evaluated before we evaluate this project. This is because - * we are attempting to reference the "sourceSets.test.output" directly. - * TODO: use testTextures feature which is introduced in Gradle 5.6 instead of - * the test outputs directly. - */ -evaluationDependsOn(":sdks:java:io:common") - dependencies { implementation library.java.vendored_guava_32_1_2_jre implementation project(path: ":sdks:java:core", configuration: "shadow") @@ -75,6 +66,7 @@ dependencies { testImplementation "org.apache.hive:hive-common:$hive_version" testImplementation "org.apache.hive:hive-cli:$hive_version" testImplementation "org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version" + testImplementation project(path: ":sdks:java:io:common") testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") hadoopVersions.each {kv -> "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-common:$kv.value"