From dc19ea8f113572d60f4e19e837636ceac38cbd8a Mon Sep 17 00:00:00 2001 From: Nisarg Thakkar Date: Mon, 30 Sep 2024 13:26:45 -0700 Subject: [PATCH] [vpj] Merge venice-hadoop-common back into VPJ --- clients/venice-push-job/build.gradle | 2 -- .../venice/hadoop/schema/HDFSSchemaSource.java | 0 .../linkedin/venice/hadoop/schema/SchemaSource.java | 0 .../venice/hadoop/schema/TestHDFSSchemaSource.java | 0 internal/venice-hadoop-common/build.gradle | 12 ------------ settings.gradle | 1 - 6 files changed, 15 deletions(-) rename {internal/venice-hadoop-common => clients/venice-push-job}/src/main/java/com/linkedin/venice/hadoop/schema/HDFSSchemaSource.java (100%) rename {internal/venice-hadoop-common => clients/venice-push-job}/src/main/java/com/linkedin/venice/hadoop/schema/SchemaSource.java (100%) rename {internal/venice-hadoop-common => clients/venice-push-job}/src/test/java/com/linkedin/venice/hadoop/schema/TestHDFSSchemaSource.java (100%) delete mode 100644 internal/venice-hadoop-common/build.gradle diff --git a/clients/venice-push-job/build.gradle b/clients/venice-push-job/build.gradle index a03f0844b1..1c8b4f98e6 100644 --- a/clients/venice-push-job/build.gradle +++ b/clients/venice-push-job/build.gradle @@ -8,8 +8,6 @@ dependencies { exclude module: ':internal:alpini' } - implementation project(':internal:venice-hadoop-common') - implementation (libraries.avro) { exclude group: 'org.mortbay.jetty' // jetty 6 conflicts with spark-java used in controller api } diff --git a/internal/venice-hadoop-common/src/main/java/com/linkedin/venice/hadoop/schema/HDFSSchemaSource.java b/clients/venice-push-job/src/main/java/com/linkedin/venice/hadoop/schema/HDFSSchemaSource.java similarity index 100% rename from internal/venice-hadoop-common/src/main/java/com/linkedin/venice/hadoop/schema/HDFSSchemaSource.java rename to clients/venice-push-job/src/main/java/com/linkedin/venice/hadoop/schema/HDFSSchemaSource.java diff --git a/internal/venice-hadoop-common/src/main/java/com/linkedin/venice/hadoop/schema/SchemaSource.java b/clients/venice-push-job/src/main/java/com/linkedin/venice/hadoop/schema/SchemaSource.java similarity index 100% rename from internal/venice-hadoop-common/src/main/java/com/linkedin/venice/hadoop/schema/SchemaSource.java rename to clients/venice-push-job/src/main/java/com/linkedin/venice/hadoop/schema/SchemaSource.java diff --git a/internal/venice-hadoop-common/src/test/java/com/linkedin/venice/hadoop/schema/TestHDFSSchemaSource.java b/clients/venice-push-job/src/test/java/com/linkedin/venice/hadoop/schema/TestHDFSSchemaSource.java similarity index 100% rename from internal/venice-hadoop-common/src/test/java/com/linkedin/venice/hadoop/schema/TestHDFSSchemaSource.java rename to clients/venice-push-job/src/test/java/com/linkedin/venice/hadoop/schema/TestHDFSSchemaSource.java diff --git a/internal/venice-hadoop-common/build.gradle b/internal/venice-hadoop-common/build.gradle deleted file mode 100644 index 7b066b8eb7..0000000000 --- a/internal/venice-hadoop-common/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - implementation project(':internal:venice-common') - implementation libraries.log4j2api - implementation (libraries.hadoopCommon) { - // Exclude transitive dependency - exclude group: 'org.apache.avro' - exclude group: 'javax.servlet' - } - - testImplementation platform('org.junit:junit-bom:5.9.1') - testImplementation 'org.junit.jupiter:junit-jupiter' -} diff --git a/settings.gradle b/settings.gradle index 88dba38627..b5b0820ec3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -54,7 +54,6 @@ include 'services:venice-standalone' include 'internal:venice-avro-compatibility-test' include 'internal:venice-client-common' include 'internal:venice-common' -include 'internal:venice-hadoop-common' include 'internal:venice-jdk-compatibility-test' include 'internal:venice-test-common'