From 266a22e66cc162e14499c4f11c91fd6ef52994f0 Mon Sep 17 00:00:00 2001 From: jdpgrailsdev Date: Thu, 21 Sep 2023 15:23:55 -0400 Subject: [PATCH] Fix dependencies --- airbyte-commons-protocol/build.gradle | 1 + .../acceptance-test-harness/build.gradle | 1 + airbyte-db/db-lib/build.gradle | 1 + airbyte-integrations/bases/base-java/build.gradle | 2 +- airbyte-integrations/bases/debezium/build.gradle | 1 + airbyte-integrations/bases/standard-source-test/build.gradle | 1 + .../connectors/destination-azure-blob-storage/build.gradle | 1 + .../destination-bigquery-denormalized/build.gradle | 1 + .../destination-clickhouse-strict-encrypt/build.gradle | 1 + .../connectors/destination-clickhouse/build.gradle | 1 + .../connectors/destination-databricks/build.gradle | 1 + .../destination-elasticsearch-strict-encrypt/build.gradle | 1 + .../connectors/destination-elasticsearch/build.gradle | 1 + .../connectors/destination-local-json/build.gradle | 1 + .../connectors/destination-mariadb-columnstore/build.gradle | 1 + .../destination-mongodb-strict-encrypt/build.gradle | 1 + .../connectors/destination-mssql-strict-encrypt/build.gradle | 1 + .../connectors/destination-mysql-strict-encrypt/build.gradle | 1 + .../destination-oracle-strict-encrypt/build.gradle | 1 + .../destination-postgres-strict-encrypt/build.gradle | 1 + .../connectors/destination-starburst-galaxy/build.gradle | 1 + .../connectors/destination-yugabytedb/build.gradle | 1 + .../connectors/source-azure-blob-storage/build.gradle | 1 + .../connectors/source-clickhouse-strict-encrypt/build.gradle | 1 + .../source-cockroachdb-strict-encrypt/build.gradle | 1 + .../connectors/source-db2-strict-encrypt/build.gradle | 1 + .../connectors/source-mssql-strict-encrypt/build.gradle | 1 + .../connectors/source-mysql-strict-encrypt/build.gradle | 1 + .../connectors/source-oracle-strict-encrypt/build.gradle | 1 + .../connectors/source-postgres-strict-encrypt/build.gradle | 1 + airbyte-integrations/connectors/source-postgres/build.gradle | 5 ++++- .../connectors/source-scaffold-java-jdbc/build.gradle | 1 + airbyte-json-validation/build.gradle | 1 + build.gradle | 4 ---- 34 files changed, 36 insertions(+), 6 deletions(-) diff --git a/airbyte-commons-protocol/build.gradle b/airbyte-commons-protocol/build.gradle index 88aa34508982..5fc67c5950ef 100644 --- a/airbyte-commons-protocol/build.gradle +++ b/airbyte-commons-protocol/build.gradle @@ -6,5 +6,6 @@ dependencies { testImplementation libs.bundles.micronaut.test implementation libs.airbyte.protocol + implementation project(':airbyte-commons') implementation project(':airbyte-json-validation') } diff --git a/airbyte-connector-test-harnesses/acceptance-test-harness/build.gradle b/airbyte-connector-test-harnesses/acceptance-test-harness/build.gradle index af7a535d0442..983f6664cfbd 100644 --- a/airbyte-connector-test-harnesses/acceptance-test-harness/build.gradle +++ b/airbyte-connector-test-harnesses/acceptance-test-harness/build.gradle @@ -20,6 +20,7 @@ dependencies { implementation libs.bundles.datadog implementation project(':airbyte-api') + implementation project(':airbyte-commons') implementation project(':airbyte-commons-protocol') implementation project(':airbyte-config-oss:config-models-oss') implementation project(':airbyte-json-validation') diff --git a/airbyte-db/db-lib/build.gradle b/airbyte-db/db-lib/build.gradle index 9d525bd63148..1c32f337407e 100644 --- a/airbyte-db/db-lib/build.gradle +++ b/airbyte-db/db-lib/build.gradle @@ -13,6 +13,7 @@ dependencies { api libs.postgresql implementation libs.airbyte.protocol + implementation project(':airbyte-commons') implementation project(':airbyte-json-validation') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.flyway.core diff --git a/airbyte-integrations/bases/base-java/build.gradle b/airbyte-integrations/bases/base-java/build.gradle index 6ea45a4f523d..11e86dddf6c3 100644 --- a/airbyte-integrations/bases/base-java/build.gradle +++ b/airbyte-integrations/bases/base-java/build.gradle @@ -5,6 +5,7 @@ plugins { dependencies { implementation libs.airbyte.protocol + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation project(':airbyte-commons-cli') implementation project(':airbyte-json-validation') @@ -24,6 +25,5 @@ dependencies { implementation libs.bundles.datadog testImplementation 'commons-lang:commons-lang:2.6' - testImplementation 'org.mockito:mockito-inline:4.6.1' implementation group: 'org.apache.logging.log4j', name: 'log4j-layout-template-json', version: '2.17.2' } diff --git a/airbyte-integrations/bases/debezium/build.gradle b/airbyte-integrations/bases/debezium/build.gradle index 1df3052e4ec9..118d22331d8f 100644 --- a/airbyte-integrations/bases/debezium/build.gradle +++ b/airbyte-integrations/bases/debezium/build.gradle @@ -7,6 +7,7 @@ project.configurations { } dependencies { implementation libs.airbyte.protocol + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation libs.bundles.debezium.bundle diff --git a/airbyte-integrations/bases/standard-source-test/build.gradle b/airbyte-integrations/bases/standard-source-test/build.gradle index 16d271453eed..48bc8ec804d0 100644 --- a/airbyte-integrations/bases/standard-source-test/build.gradle +++ b/airbyte-integrations/bases/standard-source-test/build.gradle @@ -12,6 +12,7 @@ plugins { import org.jsoup.Jsoup; dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-api') implementation project(':airbyte-connector-test-harnesses:acceptance-test-harness') diff --git a/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle b/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle index 69a850a5d49b..b7f97e92d1bd 100644 --- a/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle +++ b/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-bigquery-denormalized/build.gradle b/airbyte-integrations/connectors/destination-bigquery-denormalized/build.gradle index cacabdbdc24d..ee3ba4504785 100644 --- a/airbyte-integrations/connectors/destination-bigquery-denormalized/build.gradle +++ b/airbyte-integrations/connectors/destination-bigquery-denormalized/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'com.google.cloud:google-cloud-bigquery:1.122.2' implementation 'org.apache.commons:commons-lang3:3.11' + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation project(':airbyte-integrations:bases:base-java') implementation project(':airbyte-integrations:connectors:destination-bigquery') diff --git a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle index 104b9741627b..84fe11e97300 100644 --- a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-clickhouse/build.gradle b/airbyte-integrations/connectors/destination-clickhouse/build.gradle index 55befff3facc..fe067bb27d82 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/build.gradle +++ b/airbyte-integrations/connectors/destination-clickhouse/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-databricks/build.gradle b/airbyte-integrations/connectors/destination-databricks/build.gradle index 8f04b10c165a..125a65a194e2 100644 --- a/airbyte-integrations/connectors/destination-databricks/build.gradle +++ b/airbyte-integrations/connectors/destination-databricks/build.gradle @@ -25,6 +25,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle index 992e0c49f785..6bf47a03e529 100644 --- a/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-elasticsearch/build.gradle b/airbyte-integrations/connectors/destination-elasticsearch/build.gradle index 4caa13a9889e..a013379234f6 100644 --- a/airbyte-integrations/connectors/destination-elasticsearch/build.gradle +++ b/airbyte-integrations/connectors/destination-elasticsearch/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-local-json/build.gradle b/airbyte-integrations/connectors/destination-local-json/build.gradle index fabdc5209733..3f9c32909aaa 100644 --- a/airbyte-integrations/connectors/destination-local-json/build.gradle +++ b/airbyte-integrations/connectors/destination-local-json/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle b/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle index 16554bc86740..a18598c7524b 100644 --- a/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle +++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/build.gradle index e5c9623dbedd..48158d3e6193 100644 --- a/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-config-oss:config-models-oss') implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle index 6786ff0d75a1..3da54d5ccf40 100644 --- a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle index dc237b8f6124..aa73896b66b7 100644 --- a/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle index dd0b3c30b6ec..6b0656311b2d 100644 --- a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle @@ -14,6 +14,7 @@ dependencies { // required so that log4j uses a standard xml parser instead of an oracle one (that gets pulled in by the oracle driver) implementation group: 'xerces', name: 'xercesImpl', version: '2.12.1' + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle index f7cb11dea88d..a9ad1ad82763 100644 --- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle b/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle index 999b643e78a9..7664c667d629 100644 --- a/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle +++ b/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle @@ -9,6 +9,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/destination-yugabytedb/build.gradle b/airbyte-integrations/connectors/destination-yugabytedb/build.gradle index d42ce0ab8202..1b7a601638ec 100644 --- a/airbyte-integrations/connectors/destination-yugabytedb/build.gradle +++ b/airbyte-integrations/connectors/destination-yugabytedb/build.gradle @@ -9,6 +9,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-config-oss:config-models-oss') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/source-azure-blob-storage/build.gradle b/airbyte-integrations/connectors/source-azure-blob-storage/build.gradle index 098fb7d02597..8f72eeca92ec 100644 --- a/airbyte-integrations/connectors/source-azure-blob-storage/build.gradle +++ b/airbyte-integrations/connectors/source-azure-blob-storage/build.gradle @@ -10,6 +10,7 @@ application { dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol implementation project(':airbyte-integrations:connectors:source-relational-db') diff --git a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle index 968861cc9a84..7cb75f581a31 100644 --- a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation project(':airbyte-integrations:connectors:source-jdbc') diff --git a/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/build.gradle index 2fc44ebe5d45..4ad894bd7039 100644 --- a/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/source-db2-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-db2-strict-encrypt/build.gradle index 7ff9f15673ca..0c2f5facf663 100644 --- a/airbyte-integrations/connectors/source-db2-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-db2-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:connectors:source-db2') implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/source-mssql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-mssql-strict-encrypt/build.gradle index 641e83f83020..75d95686662d 100644 --- a/airbyte-integrations/connectors/source-mssql-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-mssql-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation libs.airbyte.protocol diff --git a/airbyte-integrations/connectors/source-mysql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-mysql-strict-encrypt/build.gradle index 40c2028ac9db..ae5e96fe0f48 100644 --- a/airbyte-integrations/connectors/source-mysql-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-mysql-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle index a57e9232ed5c..0c161eb49a68 100644 --- a/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle @@ -14,6 +14,7 @@ dependencies { // required so that log4j uses a standard xml parser instead of an oracle one (that gets pulled in by the oracle driver) implementation group: 'xerces', name: 'xercesImpl', version: '2.12.1' + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation project(':airbyte-integrations:connectors:source-oracle') diff --git a/airbyte-integrations/connectors/source-postgres-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-postgres-strict-encrypt/build.gradle index 5b0531b05854..7e74d7884cca 100644 --- a/airbyte-integrations/connectors/source-postgres-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-postgres-strict-encrypt/build.gradle @@ -10,6 +10,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') diff --git a/airbyte-integrations/connectors/source-postgres/build.gradle b/airbyte-integrations/connectors/source-postgres/build.gradle index b7a564e28509..5e4ee4e40a49 100644 --- a/airbyte-integrations/connectors/source-postgres/build.gradle +++ b/airbyte-integrations/connectors/source-postgres/build.gradle @@ -14,8 +14,11 @@ application { } dependencies { - implementation 'io.airbyte:airbyte-cdk:0.0.2' + implementation ('io.airbyte:airbyte-cdk:0.0.2') { + transitive = false + } + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation project(':airbyte-integrations:bases:debezium') diff --git a/airbyte-integrations/connectors/source-scaffold-java-jdbc/build.gradle b/airbyte-integrations/connectors/source-scaffold-java-jdbc/build.gradle index d762674ac7e1..34ac66dcd461 100644 --- a/airbyte-integrations/connectors/source-scaffold-java-jdbc/build.gradle +++ b/airbyte-integrations/connectors/source-scaffold-java-jdbc/build.gradle @@ -9,6 +9,7 @@ application { } dependencies { + implementation project(':airbyte-commons') implementation project(':airbyte-db:db-lib') implementation project(':airbyte-integrations:bases:base-java') implementation libs.airbyte.protocol diff --git a/airbyte-json-validation/build.gradle b/airbyte-json-validation/build.gradle index da1231ed3ea5..1aa348c25e05 100644 --- a/airbyte-json-validation/build.gradle +++ b/airbyte-json-validation/build.gradle @@ -3,6 +3,7 @@ plugins { } dependencies { + implementation project(':airbyte-commons') implementation 'com.networknt:json-schema-validator:1.0.72' // needed so that we can follow $ref when parsing json. jackson does not support this natively. implementation 'me.andrz.jackson:jackson-json-reference-core:0.3.2' diff --git a/build.gradle b/build.gradle index 5c90ec23e312..fb2632e0780a 100644 --- a/build.gradle +++ b/build.gradle @@ -271,10 +271,6 @@ subprojects { subproj -> } dependencies { - if (subproj.name != 'airbyte-commons') { - implementation project(':airbyte-commons') - } - implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.0")) implementation(platform("org.glassfish.jersey:jersey-bom:2.31"))