Skip to content

Commit

Permalink
Revert "update all connectors for new CDK version and more stringent …
Browse files Browse the repository at this point in the history
…javac checks"

This reverts commit 18ad87b.
  • Loading branch information
stephane-airbyte committed Nov 2, 2023
1 parent 18ad87b commit 9c6ed93
Show file tree
Hide file tree
Showing 71 changed files with 21 additions and 507 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,3 @@ dependencies {
implementation 'org.junit.jupiter:junit-jupiter:5.8.1'

}

//This is only needed because we're using some very old libraries from airbyte-commons that were not packaged correctly
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,3 @@ dependencies {
implementation 'io.airbyte.airbyte-config:config-models:0.42.0'
implementation 'com.datadoghq:datadog-api-client:2.16.0'
}

//This is only needed because we're using some very old libraries from airbyte-commons that were not packaged correctly
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,3 @@ dependencies {
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation "org.testcontainers:junit-jupiter:1.17.5"
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ public void copyIntoTableFromStage(final String datasetId,
}

@Override
@Deprecated
public void cleanUpStage(final String datasetId, final String stream, final List<String> stagedFiles) {
if (keepStagingFiles) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
/**
* Record Consumer used for STANDARD INSERTS
*/
@SuppressWarnings("try")
class BigQueryRecordConsumer extends FailureTrackingAirbyteMessageConsumer implements AirbyteMessageConsumer {
public class BigQueryRecordConsumer extends FailureTrackingAirbyteMessageConsumer implements AirbyteMessageConsumer {

private static final Logger LOGGER = LoggerFactory.getLogger(BigQueryRecordConsumer.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import lombok.extern.slf4j.Slf4j;

@Slf4j
@SuppressWarnings("try")
public class BigQueryRecordStandardConsumer extends AsyncStreamConsumer {

public BigQueryRecordStandardConsumer(Consumer<AirbyteMessage> outputRecordCollector,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class BigQueryUploaderFactory {
"Destination Default" option.
More details:
""";
""";

public static AbstractBigQueryUploader<?> getUploader(final UploaderConfig uploaderConfig)
throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,3 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertVersion}"
testImplementation libs.testcontainers.cassandra
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,3 @@ dependencies {
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

14 changes: 0 additions & 14 deletions airbyte-integrations/connectors/destination-csv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ plugins {
id 'airbyte-java-connector'
}

java {
compileJava {
options.compilerArgs += "-Xlint:-try"
}
}

airbyteJavaConnector {
cdkVersionRequired = '0.2.0'
features = ['db-destinations']
Expand All @@ -25,11 +19,3 @@ application {
dependencies {
implementation 'org.apache.commons:commons-csv:1.4'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,3 @@ dependencies {

implementation 'com.azure:azure-storage-blob:12.18.0'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-dev-null')
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,3 @@ dependencies {
implementation 'org.apache.commons:commons-csv:1.4'
implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.16'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,3 @@ application {
dependencies {
implementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.47'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,3 @@ application {

dependencies {
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,3 @@ dependencies {
testImplementation libs.testcontainers.elasticsearch
integrationTestJavaImplementation libs.testcontainers.elasticsearch
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,3 @@ dependencies {
integrationTestJavaImplementation 'com.exasol:exasol-testcontainers:6.5.0'
integrationTestJavaImplementation 'org.testcontainers:testcontainers:1.17.6'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/destination-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,3 @@ dependencies {




//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,3 @@ dependencies {
test {
jvmArgs = ['--add-opens=java.base/sun.nio.ch=ALL-UNNAMED', '--add-opens=java.base/java.nio=ALL-UNNAMED']
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,3 @@ dependencies {

integrationTestJavaImplementation libs.testcontainers.kafka
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/destination-keen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,3 @@ dependencies {
// TODO: remove this dependency
implementation libs.google.cloud.storage
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,3 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertVersion}"
testImplementation "org.testcontainers:localstack:${testContainersVersion}"
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,3 @@ application {

dependencies {
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,3 @@ dependencies {

integrationTestJavaImplementation libs.testcontainers.mariadb
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,3 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mongodb')
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/destination-mqtt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,3 @@ dependencies {

testImplementation 'com.hivemq:hivemq-testcontainer-junit5:2.0.0'
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,3 @@ dependencies {
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.testcontainers.mssqlserver
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@ dependencies {
implementation 'mysql:mysql-connector-java:8.0.22'
integrationTestJavaImplementation libs.testcontainers.mysql
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,3 @@ dependencies {
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.testcontainers.oracle.xe
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,3 @@ dependencies {

integrationTestJavaImplementation libs.testcontainers.postgresql
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,3 @@ dependencies {
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.114.7'

}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,3 @@ dependencies {

testImplementation libs.testcontainers.pulsar
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/destination-r2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,3 @@ dependencies {
testImplementation 'org.xerial.snappy:snappy-java:1.1.8.4'
testImplementation "org.mockito:mockito-inline:4.1.0"
}

//This is only needed because we're using some pre 0.3 version of the CDK
java {
compileJava {
options.compilerArgs.remove("-Werror")
}
}

Loading

0 comments on commit 9c6ed93

Please sign in to comment.