Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

source-oracle: adopt CDK 0.20.4 #35225

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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'
}
Original file line number Diff line number Diff line change
@@ -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
23 changes: 2 additions & 21 deletions airbyte-integrations/connectors/source-oracle/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-oracle/metadata.yaml
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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);
Original file line number Diff line number Diff line change
@@ -90,7 +90,6 @@ protected String getNameSpace() {

@Override
protected void tearDown(final TestDestinationEnv testEnv) {
dslContext.close();
container.close();
}

1 change: 1 addition & 0 deletions docs/integrations/sources/oracle.md
Original file line number Diff line number Diff line change
@@ -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 |