Shuffled destination-jdbc into bases folder (airbytehq#25120)

* Testing changes for reshuffle * Resolves dependency/race-condition with base classes and docker creation * Removes dockerfile * Updates java connectors gradle dependencies
shipyardapp · Apr 17, 2023 · 0dcc653 · 0dcc653
1 parent f2f788f
commit 0dcc653
Show file tree

Hide file tree

Showing 63 changed files with 42 additions and 57 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -32,7 +32,7 @@
 # Java-based destination connectors
 /airbyte-integrations/bases/standard-destination-test/ @airbytehq/destinations
 /airbyte-integrations/bases/base-java-s3/ @airbytehq/destinations
-/airbyte-integrations/connectors/destination-jdbc/ @airbytehq/destinations
+/airbyte-integrations/bases/bases-destination-jdbc/ @airbytehq/destinations
 /airbyte-integrations/connectors/destination-bigquery/ @airbytehq/destinations
 /airbyte-integrations/connectors/destination-bigquery-denormalized/ @airbytehq/destinations
 /airbyte-integrations/connectors/destination-azure-blob-storage/ @airbytehq/destinations

diff --git a/.../connectors/destination-jdbc/build.gradle → ...bases/bases-destination-jdbc/build.gradle b/.../connectors/destination-jdbc/build.gradle → ...bases/bases-destination-jdbc/build.gradle
diff --git a/...ons/connectors/destination-jdbc/readme.md → ...ns/bases/bases-destination-jdbc/readme.md b/...ons/connectors/destination-jdbc/readme.md → ...ns/bases/bases-destination-jdbc/readme.md
diff --git a/...ination/jdbc/AbstractJdbcDestination.java → ...ination/jdbc/AbstractJdbcDestination.java b/...ination/jdbc/AbstractJdbcDestination.java → ...ination/jdbc/AbstractJdbcDestination.java
diff --git a/...rations/destination/jdbc/DataAdapter.java → ...rations/destination/jdbc/DataAdapter.java b/...rations/destination/jdbc/DataAdapter.java → ...rations/destination/jdbc/DataAdapter.java
diff --git a/...ion/jdbc/JdbcBufferedConsumerFactory.java → ...ion/jdbc/JdbcBufferedConsumerFactory.java b/...ion/jdbc/JdbcBufferedConsumerFactory.java → ...ion/jdbc/JdbcBufferedConsumerFactory.java
@@ -35,13 +35,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**Strategy:
- * <p>1. Create a final table for each stream
- * <p>2. Accumulate records in a buffer. One buffer per stream
- * <p>3. As records accumulate write them in batch to the database. We set a minimum numbers of records
+/**
+ * Strategy:
+ * <p>
+ * 1. Create a final table for each stream
+ * <p>
+ * 2. Accumulate records in a buffer. One buffer per stream
+ * <p>
+ * 3. As records accumulate write them in batch to the database. We set a minimum numbers of records
  * before writing to avoid wasteful record-wise writes. In the case with slow syncs this will be
  * superseded with a periodic record flush from {@link BufferedStreamConsumer#periodicBufferFlush()}
- * <p>4. Once all records have been written to buffer, flush the buffer and write any remaining records
+ * <p>
+ * 4. Once all records have been written to buffer, flush the buffer and write any remaining records
  * to the database (regardless of how few are left)
  */
 public class JdbcBufferedConsumerFactory {
@@ -118,9 +123,12 @@ private static String getOutputSchema(final AirbyteStream stream,
 
   /**
    * Sets up destination storage through:
-   * <p>1. Creates Schema (if not exists)
-   * <p>2. Creates airybte_raw table (if not exists)
-   * <p>3. <Optional>Truncates table if sync mode is in OVERWRITE
+   * <p>
+   * 1. Creates Schema (if not exists)
+   * <p>
+   * 2. Creates airybte_raw table (if not exists)
+   * <p>
+   * 3. <Optional>Truncates table if sync mode is in OVERWRITE
    *
    * @param database JDBC database to connect to
    * @param sqlOperations interface for execution SQL queries

diff --git a/...s/destination/jdbc/JdbcSqlOperations.java → ...s/destination/jdbc/JdbcSqlOperations.java b/...s/destination/jdbc/JdbcSqlOperations.java → ...s/destination/jdbc/JdbcSqlOperations.java
diff --git a/...tions/destination/jdbc/SqlOperations.java → ...tions/destination/jdbc/SqlOperations.java b/...tions/destination/jdbc/SqlOperations.java → ...tions/destination/jdbc/SqlOperations.java
diff --git a/.../destination/jdbc/SqlOperationsUtils.java → .../destination/jdbc/SqlOperationsUtils.java b/.../destination/jdbc/SqlOperationsUtils.java → .../destination/jdbc/SqlOperationsUtils.java
diff --git a/...nation/jdbc/StagingFilenameGenerator.java → ...nation/jdbc/StagingFilenameGenerator.java b/...nation/jdbc/StagingFilenameGenerator.java → ...nation/jdbc/StagingFilenameGenerator.java
diff --git a/...rations/destination/jdbc/WriteConfig.java → ...rations/destination/jdbc/WriteConfig.java b/...rations/destination/jdbc/WriteConfig.java → ...rations/destination/jdbc/WriteConfig.java
diff --git a/...bc/constants/GlobalDataSizeConstants.java → ...bc/constants/GlobalDataSizeConstants.java b/...bc/constants/GlobalDataSizeConstants.java → ...bc/constants/GlobalDataSizeConstants.java
diff --git a/...nation/jdbc/copy/CopyConsumerFactory.java → ...nation/jdbc/copy/CopyConsumerFactory.java b/...nation/jdbc/copy/CopyConsumerFactory.java → ...nation/jdbc/copy/CopyConsumerFactory.java
diff --git a/...estination/jdbc/copy/CopyDestination.java → ...estination/jdbc/copy/CopyDestination.java b/...estination/jdbc/copy/CopyDestination.java → ...estination/jdbc/copy/CopyDestination.java
diff --git a/...s/destination/jdbc/copy/StreamCopier.java → ...s/destination/jdbc/copy/StreamCopier.java b/...s/destination/jdbc/copy/StreamCopier.java → ...s/destination/jdbc/copy/StreamCopier.java
diff --git a/...nation/jdbc/copy/StreamCopierFactory.java → ...nation/jdbc/copy/StreamCopierFactory.java b/...nation/jdbc/copy/StreamCopierFactory.java → ...nation/jdbc/copy/StreamCopierFactory.java
diff --git a/...ation/jdbc/copy/SwitchingDestination.java → ...ation/jdbc/copy/SwitchingDestination.java b/...ation/jdbc/copy/SwitchingDestination.java → ...ation/jdbc/copy/SwitchingDestination.java
diff --git a/...bc/copy/azure/AzureBlobStorageConfig.java → ...bc/copy/azure/AzureBlobStorageConfig.java b/...bc/copy/azure/AzureBlobStorageConfig.java → ...bc/copy/azure/AzureBlobStorageConfig.java
diff --git a/...y/azure/AzureBlobStorageStreamCopier.java → ...y/azure/AzureBlobStorageStreamCopier.java b/...y/azure/AzureBlobStorageStreamCopier.java → ...y/azure/AzureBlobStorageStreamCopier.java
diff --git a/.../AzureBlobStorageStreamCopierFactory.java → .../AzureBlobStorageStreamCopierFactory.java b/.../AzureBlobStorageStreamCopierFactory.java → .../AzureBlobStorageStreamCopierFactory.java
diff --git a/.../destination/jdbc/copy/gcs/GcsConfig.java → .../destination/jdbc/copy/gcs/GcsConfig.java b/.../destination/jdbc/copy/gcs/GcsConfig.java → .../destination/jdbc/copy/gcs/GcsConfig.java
diff --git a/...nation/jdbc/copy/gcs/GcsStreamCopier.java → ...nation/jdbc/copy/gcs/GcsStreamCopier.java b/...nation/jdbc/copy/gcs/GcsStreamCopier.java → ...nation/jdbc/copy/gcs/GcsStreamCopier.java
diff --git a/...jdbc/copy/gcs/GcsStreamCopierFactory.java → ...jdbc/copy/gcs/GcsStreamCopierFactory.java b/...jdbc/copy/gcs/GcsStreamCopierFactory.java → ...jdbc/copy/gcs/GcsStreamCopierFactory.java
diff --git a/...estination/jdbc/copy/s3/S3CopyConfig.java → ...estination/jdbc/copy/s3/S3CopyConfig.java b/...estination/jdbc/copy/s3/S3CopyConfig.java → ...estination/jdbc/copy/s3/S3CopyConfig.java
diff --git a/...tination/jdbc/copy/s3/S3StreamCopier.java → ...tination/jdbc/copy/s3/S3StreamCopier.java b/...tination/jdbc/copy/s3/S3StreamCopier.java → ...tination/jdbc/copy/s3/S3StreamCopier.java
diff --git a/...n/jdbc/copy/s3/S3StreamCopierFactory.java → ...n/jdbc/copy/s3/S3StreamCopierFactory.java b/...n/jdbc/copy/s3/S3StreamCopierFactory.java → ...n/jdbc/copy/s3/S3StreamCopierFactory.java
diff --git a/...ation/staging/StagingConsumerFactory.java → ...ation/staging/StagingConsumerFactory.java b/...ation/staging/StagingConsumerFactory.java → ...ation/staging/StagingConsumerFactory.java
diff --git a/...estination/staging/StagingOperations.java → ...estination/staging/StagingOperations.java b/...estination/staging/StagingOperations.java → ...estination/staging/StagingOperations.java
diff --git a/...ination-jdbc/src/main/resources/spec.json → ...ination-jdbc/src/main/resources/spec.json b/...ination-jdbc/src/main/resources/spec.json → ...ination-jdbc/src/main/resources/spec.json
diff --git a/...ion/jdbc/AbstractJdbcDestinationTest.java → ...ion/jdbc/AbstractJdbcDestinationTest.java b/...ion/jdbc/AbstractJdbcDestinationTest.java → ...ion/jdbc/AbstractJdbcDestinationTest.java
diff --git a/...ons/destination/jdbc/DataAdapterTest.java → ...ons/destination/jdbc/DataAdapterTest.java b/...ons/destination/jdbc/DataAdapterTest.java → ...ons/destination/jdbc/DataAdapterTest.java
diff --git a/...stination/jdbc/TestJdbcSqlOperations.java → ...stination/jdbc/TestJdbcSqlOperations.java b/...stination/jdbc/TestJdbcSqlOperations.java → ...stination/jdbc/TestJdbcSqlOperations.java
diff --git a/...n/jdbc/copy/SwitchingDestinationTest.java → ...n/jdbc/copy/SwitchingDestinationTest.java b/...n/jdbc/copy/SwitchingDestinationTest.java → ...n/jdbc/copy/SwitchingDestinationTest.java
diff --git a/...nation/jdbc/copy/s3/S3CopyConfigTest.java → ...nation/jdbc/copy/s3/S3CopyConfigTest.java b/...nation/jdbc/copy/s3/S3CopyConfigTest.java → ...nation/jdbc/copy/s3/S3CopyConfigTest.java
diff --git a/...tion/jdbc/copy/s3/S3StreamCopierTest.java → ...tion/jdbc/copy/s3/S3StreamCopierTest.java b/...tion/jdbc/copy/s3/S3StreamCopierTest.java → ...tion/jdbc/copy/s3/S3StreamCopierTest.java
diff --git a/...n/staging/StagingConsumerFactoryTest.java → ...n/staging/StagingConsumerFactoryTest.java b/...n/staging/StagingConsumerFactoryTest.java → ...n/staging/StagingConsumerFactoryTest.java
diff --git a/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle b/airbyte-integrations/connectors/destination-azure-blob-storage/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 
     implementation 'com.azure:azure-storage-blob:12.20.2'

diff --git a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-clickhouse')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 

diff --git a/airbyte-integrations/connectors/destination-clickhouse/build.gradle b/airbyte-integrations/connectors/destination-clickhouse/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 
     implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'

diff --git a/airbyte-integrations/connectors/destination-databricks/build.gradle b/airbyte-integrations/connectors/destination-databricks/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation project(':airbyte-integrations:bases:base-java')
     implementation project(':airbyte-integrations:bases:base-java-s3')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-s3')
     implementation project(':airbyte-integrations:connectors:destination-azure-blob-storage')
     implementation group: 'com.databricks', name: 'databricks-jdbc', version: '2.6.25'

diff --git a/airbyte-integrations/connectors/destination-dynamodb/build.gradle b/airbyte-integrations/connectors/destination-dynamodb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     implementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.47'
 

diff --git a/airbyte-integrations/connectors/destination-exasol/build.gradle b/airbyte-integrations/connectors/destination-exasol/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 
     implementation 'com.exasol:exasol-jdbc:7.1.17'
 

diff --git a/airbyte-integrations/connectors/destination-gcs/build.gradle b/airbyte-integrations/connectors/destination-gcs/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
     implementation project(':airbyte-integrations:bases:base-java-s3')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 
     implementation platform('com.amazonaws:aws-java-sdk-bom:1.12.14')

diff --git a/airbyte-integrations/connectors/destination-jdbc/.dockerignore b/airbyte-integrations/connectors/destination-jdbc/.dockerignore
diff --git a/airbyte-integrations/connectors/destination-jdbc/Dockerfile b/airbyte-integrations/connectors/destination-jdbc/Dockerfile
diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle b/airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 
     implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'

diff --git a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle
@@ -13,8 +13,8 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-mssql')
     implementation project(':airbyte-test-utils')
 

diff --git a/airbyte-integrations/connectors/destination-mssql/build.gradle b/airbyte-integrations/connectors/destination-mssql/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-test-utils')
 
     implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'

diff --git a/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-mysql')
 
     implementation 'mysql:mysql-connector-java:8.0.22'

diff --git a/airbyte-integrations/connectors/destination-mysql/build.gradle b/airbyte-integrations/connectors/destination-mysql/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 
     implementation 'mysql:mysql-connector-java:8.0.22'
 

diff --git a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-oracle')
 
     implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"

diff --git a/airbyte-integrations/connectors/destination-oracle/build.gradle b/airbyte-integrations/connectors/destination-oracle/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 
     implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"
 

diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-postgres')
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

diff --git a/airbyte-integrations/connectors/destination-postgres/build.gradle b/airbyte-integrations/connectors/destination-postgres/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 
     testImplementation project(':airbyte-test-utils')
 

diff --git a/airbyte-integrations/connectors/destination-redshift/build.gradle b/airbyte-integrations/connectors/destination-redshift/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:bases:base-java-s3')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 

diff --git a/airbyte-integrations/connectors/destination-rockset/build.gradle b/airbyte-integrations/connectors/destination-rockset/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 
     implementation group: 'com.rockset', name: 'rockset-java', version: '0.9.0'
     implementation group: 'org.awaitility', name: 'awaitility', version: '4.1.1'

diff --git a/airbyte-integrations/connectors/destination-snowflake/build.gradle b/airbyte-integrations/connectors/destination-snowflake/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation project(':airbyte-config-oss:config-models-oss')
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-integrations:connectors:destination-gcs')
     implementation project(':airbyte-integrations:bases:base-java-s3')
     implementation libs.airbyte.protocol

diff --git a/airbyte-integrations/connectors/destination-teradata/build.gradle b/airbyte-integrations/connectors/destination-teradata/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
 	implementation 'com.teradata.jdbc:terajdbc4:17.20.00.12'
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

diff --git a/airbyte-integrations/connectors/destination-tidb/build.gradle b/airbyte-integrations/connectors/destination-tidb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-integrations:bases:base-java')
     implementation libs.airbyte.protocol
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 
     implementation 'mysql:mysql-connector-java:8.0.30'

diff --git a/airbyte-integrations/connectors/destination-yugabytedb/build.gradle b/airbyte-integrations/connectors/destination-yugabytedb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation libs.airbyte.protocol
     implementation project(':airbyte-integrations:bases:base-java')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
-    implementation project(':airbyte-integrations:connectors:destination-jdbc')
+    implementation project(':airbyte-integrations:bases:bases-destination-jdbc')
     implementation project(':airbyte-db:db-lib')
 
     implementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-1'

diff --git a/settings.gradle b/settings.gradle
@@ -105,6 +105,7 @@ if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD"
     include ':airbyte-integrations:bases:base-java'
     include ':airbyte-integrations:bases:base-java-s3'
     include ':airbyte-integrations:bases:base-normalization'
+    include ':airbyte-integrations:bases:bases-destination-jdbc' // needs to be lexicographically after base-java and base-normalization to avoid race condition
     include ':airbyte-integrations:bases:base-standard-source-test-file'
     include ':airbyte-integrations:bases:connector-acceptance-test'
     include ':airbyte-integrations:bases:standard-destination-test'
@@ -115,7 +116,6 @@ if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD"
 
     // Needed by normalization integration tests
     include ':airbyte-integrations:connectors:destination-bigquery'
-    include ':airbyte-integrations:connectors:destination-jdbc'
     include ':airbyte-integrations:connectors:destination-mysql'
     include ':airbyte-integrations:connectors:destination-postgres'
     include ':airbyte-integrations:connectors:destination-redshift'

diff --git a/tools/bin/ci_check_dependency.py b/tools/bin/ci_check_dependency.py
@@ -31,7 +31,7 @@
     re.compile(".*-strict-encrypt$"),
     re.compile("^destination-dev-null$"),
     re.compile("^destination-scaffold-destination-python$"),
-    re.compile("^destination-jdbc$")
+    re.compile("^bases-destination-jdbc$")
 ]
 COMMENT_TEMPLATE_PATH = ".github/comment_templates/connector_dependency_template.md"
 

diff --git a/tools/ci_connector_ops/ci_connector_ops/pipelines/tests/java_connectors.py b/tools/ci_connector_ops/ci_connector_ops/pipelines/tests/java_connectors.py
@@ -101,7 +101,7 @@ class GradleTask(Step, ABC):
     ]
 
     DESTINATION_BUILD_INCLUDE = [
-        "airbyte-integrations/connectors/destination-jdbc",
+        "airbyte-integrations/bases/bases-destination-jdbc",
         # destination-bigquery uses utils from destination gcs
         "airbyte-integrations/connectors/destination-gcs",
     ]