Fix dependencies

airbytehq · Sep 21, 2023 · 266a22e · 266a22e
1 parent 7692819
commit 266a22e
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"))