source-oracle: adopt CDK 0.20.4 (airbytehq#35225)

ollionorg · Feb 26, 2024 · b0aac80 · b0aac80
1 parent e31aba9
commit b0aac80
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...ctors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java b/...ctors/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/...test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java b/...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
@@ -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                                                                                                                      |