From 9e7936e0b012264f4ff44687c7950c6f801a5385 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 11:53:16 -0800 Subject: [PATCH] source-clickhouse: adopt CDK 0.20.4 (#35235) --- .../build.gradle | 17 +++-------------- .../metadata.yaml | 2 +- .../connectors/source-clickhouse/build.gradle | 15 ++------------- .../connectors/source-clickhouse/metadata.yaml | 4 ++-- docs/integrations/sources/clickhouse.md | 1 + 5 files changed, 9 insertions(+), 30 deletions(-) diff --git a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle index 54f437b342e8..5941a31d383a 100644 --- a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle @@ -1,23 +1,13 @@ plugins { - id 'application' id 'airbyte-java-connector' } airbyteJavaConnector { - cdkVersionRequired = '0.13.2' + cdkVersionRequired = '0.20.4' features = ['db-sources'] useLocalCdk = false } -//remove once upgrading the CDK version to 0.4.x or later -java { - compileJava { - options.compilerArgs.remove("-Werror") - } -} - -airbyteJavaConnector.addCdkDependencies() - application { mainClass = 'io.airbyte.integrations.source.clickhouse.ClickHouseStrictEncryptSource' applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0'] @@ -26,8 +16,7 @@ application { dependencies { implementation project(':airbyte-integrations:connectors:source-clickhouse') - implementation group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.3.2-patch9' + implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all' - integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse') - integrationTestJavaImplementation libs.testcontainers.clickhouse + testImplementation 'org.testcontainers:clickhouse:1.19.4' } diff --git a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/metadata.yaml b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/metadata.yaml index bc71533c61c5..3f67d3b3ead3 100644 --- a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/metadata.yaml +++ b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/metadata.yaml @@ -11,7 +11,7 @@ data: connectorSubtype: database connectorType: source definitionId: bad83517-5e54-4a3d-9b53-63e85fbd4d7c - dockerImageTag: 0.2.1 + dockerImageTag: 0.2.2 dockerRepository: airbyte/source-clickhouse-strict-encrypt githubIssueLabel: source-clickhouse icon: clickhouse.svg diff --git a/airbyte-integrations/connectors/source-clickhouse/build.gradle b/airbyte-integrations/connectors/source-clickhouse/build.gradle index f3e227e32ca8..4e16af080d96 100644 --- a/airbyte-integrations/connectors/source-clickhouse/build.gradle +++ b/airbyte-integrations/connectors/source-clickhouse/build.gradle @@ -1,31 +1,20 @@ plugins { - id 'application' id 'airbyte-java-connector' } airbyteJavaConnector { - cdkVersionRequired = '0.13.2' + cdkVersionRequired = '0.20.4' features = ['db-sources'] useLocalCdk = false } -//remove once upgrading the CDK version to 0.4.x or later -java { - compileJava { - options.compilerArgs.remove("-Werror") - } -} - -airbyteJavaConnector.addCdkDependencies() - application { mainClass = 'io.airbyte.integrations.source.clickhouse.ClickHouseSource' applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0'] } dependencies { - implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all' - integrationTestJavaImplementation libs.testcontainers.clickhouse + testImplementation 'org.testcontainers:clickhouse:1.19.4' } diff --git a/airbyte-integrations/connectors/source-clickhouse/metadata.yaml b/airbyte-integrations/connectors/source-clickhouse/metadata.yaml index 57e4228a22f0..6a6416ef1660 100644 --- a/airbyte-integrations/connectors/source-clickhouse/metadata.yaml +++ b/airbyte-integrations/connectors/source-clickhouse/metadata.yaml @@ -9,7 +9,7 @@ data: connectorSubtype: database connectorType: source definitionId: bad83517-5e54-4a3d-9b53-63e85fbd4d7c - dockerImageTag: 0.2.1 + dockerImageTag: 0.2.2 dockerRepository: airbyte/source-clickhouse documentationUrl: https://docs.airbyte.com/integrations/sources/clickhouse githubIssueLabel: source-clickhouse @@ -18,7 +18,7 @@ data: name: ClickHouse registries: cloud: - dockerImageTag: 0.2.1 + dockerImageTag: 0.2.2 dockerRepository: airbyte/source-clickhouse-strict-encrypt enabled: true oss: diff --git a/docs/integrations/sources/clickhouse.md b/docs/integrations/sources/clickhouse.md index 81ae5fe7fcee..2fa69ac5a2a6 100644 --- a/docs/integrations/sources/clickhouse.md +++ b/docs/integrations/sources/clickhouse.md @@ -78,6 +78,7 @@ Using this feature requires additional configuration, when creating the source. | Version | Date | Pull Request | Subject | |:--------| :--- |:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------| +| 0.2.2 | 2024-02-13 | [35235](https://github.com/airbytehq/airbyte/pull/35235) | Adopt CDK 0.20.4 | | 0.2.1 | 2024-01-24 | [34453](https://github.com/airbytehq/airbyte/pull/34453) | bump CDK version | | 0.1.17 | 2023-03-22 | [20760](https://github.com/airbytehq/airbyte/pull/20760) | Removed redundant date-time datatypes formatting | | 0.1.16 |2023-03-06 | [23455](https://github.com/airbytehq/airbyte/pull/23455) | For network isolation, source connector accepts a list of hosts it is allowed to connect to |