From b0aac80d29bccf0940d738e0b83b944d018a4533 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 11:54:01 -0800 Subject: [PATCH] source-oracle: adopt CDK 0.20.4 (#35225) --- .../source-oracle-strict-encrypt/build.gradle | 21 ++--------------- .../metadata.yaml | 2 +- .../connectors/source-oracle/build.gradle | 23 ++----------------- .../connectors/source-oracle/metadata.yaml | 4 ++-- .../source/oracle/OracleSource.java | 2 +- .../oracle/OracleSourceDatatypeTest.java | 1 - docs/integrations/sources/oracle.md | 1 + 7 files changed, 9 insertions(+), 45 deletions(-) diff --git a/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle b/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle index 3e196be30b25a..a295c243cda41 100644 --- a/airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/source-oracle-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.oracle_strict_encrypt.OracleStrictEncryptSource' applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0'] @@ -26,14 +16,7 @@ application { dependencies { implementation project(':airbyte-integrations:connectors:source-oracle') - // 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 "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0" - testImplementation 'org.apache.commons:commons-lang3:3.11' - testImplementation libs.testcontainers.oracle.xe - - integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-oracle-strict-encrypt') + testImplementation 'org.testcontainers:oracle-xe:1.19.4' } diff --git a/airbyte-integrations/connectors/source-oracle-strict-encrypt/metadata.yaml b/airbyte-integrations/connectors/source-oracle-strict-encrypt/metadata.yaml index 382182cd5b129..e550b010941e3 100644 --- a/airbyte-integrations/connectors/source-oracle-strict-encrypt/metadata.yaml +++ b/airbyte-integrations/connectors/source-oracle-strict-encrypt/metadata.yaml @@ -11,7 +11,7 @@ data: connectorSubtype: database connectorType: source definitionId: b39a7370-74c3-45a6-ac3a-380d48520a83 - dockerImageTag: 0.5.1 + dockerImageTag: 0.5.2 dockerRepository: airbyte/source-oracle-strict-encrypt githubIssueLabel: source-oracle icon: oracle.svg diff --git a/airbyte-integrations/connectors/source-oracle/build.gradle b/airbyte-integrations/connectors/source-oracle/build.gradle index 040932b686d87..0eb2700d9a30d 100644 --- a/airbyte-integrations/connectors/source-oracle/build.gradle +++ b/airbyte-integrations/connectors/source-oracle/build.gradle @@ -1,39 +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 { - compileTestJava { - options.compilerArgs.remove("-Werror") - } - compileJava { - options.compilerArgs.remove("-Werror") - } -} - -airbyteJavaConnector.addCdkDependencies() - application { mainClass = 'io.airbyte.integrations.source.oracle.OracleSource' applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0'] } 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 "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0" - testImplementation 'org.apache.commons:commons-lang3:3.11' - testImplementation libs.testcontainers.oracle.xe + testImplementation 'org.testcontainers:oracle-xe:1.19.4' } diff --git a/airbyte-integrations/connectors/source-oracle/metadata.yaml b/airbyte-integrations/connectors/source-oracle/metadata.yaml index 557ea895a9336..56a6d42d4ff34 100644 --- a/airbyte-integrations/connectors/source-oracle/metadata.yaml +++ b/airbyte-integrations/connectors/source-oracle/metadata.yaml @@ -9,7 +9,7 @@ data: connectorSubtype: database connectorType: source definitionId: b39a7370-74c3-45a6-ac3a-380d48520a83 - dockerImageTag: 0.5.1 + dockerImageTag: 0.5.2 dockerRepository: airbyte/source-oracle documentationUrl: https://docs.airbyte.com/integrations/sources/oracle githubIssueLabel: source-oracle @@ -18,7 +18,7 @@ data: name: Oracle DB registries: cloud: - dockerImageTag: 0.5.1 + dockerImageTag: 0.5.2 dockerRepository: airbyte/source-oracle-strict-encrypt enabled: true oss: diff --git a/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java b/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java index 43193f9806870..7223b6e9f37c0 100644 --- a/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java +++ b/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java @@ -164,7 +164,7 @@ private static void convertAndImportCertificate(final String certificate) throws } private static void runProcess(final String cmd, final Runtime run) throws IOException, InterruptedException { - final Process pr = run.exec(cmd); + final Process pr = run.exec(cmd.split(" ")); if (!pr.waitFor(30, TimeUnit.SECONDS)) { pr.destroy(); throw new RuntimeException("Timeout while executing: " + cmd); diff --git a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java index 6154b1ac32b3b..5f708dfe2dd7b 100644 --- a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java @@ -90,7 +90,6 @@ protected String getNameSpace() { @Override protected void tearDown(final TestDestinationEnv testEnv) { - dslContext.close(); container.close(); } diff --git a/docs/integrations/sources/oracle.md b/docs/integrations/sources/oracle.md index fffff24f0666d..61b9b69b0f43f 100644 --- a/docs/integrations/sources/oracle.md +++ b/docs/integrations/sources/oracle.md @@ -132,6 +132,7 @@ Airbyte has the ability to connect to the Oracle source with 3 network connectiv | Version | Date | Pull Request | Subject | |:--------|:-----------| :------------------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------| +| 0.5.2 | 2024-02-13 | [35225](https://github.com/airbytehq/airbyte/pull/35225) | Adopt CDK 0.20.4 | | 0.5.1 | 2024-01-24 | [34453](https://github.com/airbytehq/airbyte/pull/34453) | bump CDK version | | 0.5.0 | 2023-12-18 | [33485](https://github.com/airbytehq/airbyte/pull/33485) | Remove LEGACY state | | 0.4.0 | 2023-06-26 | [27737](https://github.com/airbytehq/airbyte/pull/27737) | License Update: Elv2 |