diff --git a/airbyte-cdk/bulk/core/base/build.gradle b/airbyte-cdk/bulk/core/base/build.gradle index 0b753f4c9aea..c6d491deb0be 100644 --- a/airbyte-cdk/bulk/core/base/build.gradle +++ b/airbyte-cdk/bulk/core/base/build.gradle @@ -31,11 +31,11 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'org.apache.logging.log4j:log4j-slf4j2-impl' implementation 'org.apache.logging.log4j:log4j-layout-template-json:2.17.2' - implementation 'org.bouncycastle:bcprov-jdk18on:1.77' + implementation 'org.bouncycastle:bcprov-jdk18on:1.70' implementation 'org.openapi4j:openapi-schema-validator:1.0.7' runtimeOnly 'com.google.guava:guava:33.2.0-jre' - runtimeOnly 'org.apache.commons:commons-compress:1.26.1' + runtimeOnly 'org.apache.commons:commons-compress:1.27.1' testFixturesApi 'org.jetbrains.kotlin:kotlin-test-junit' testFixturesApi 'org.jetbrains.kotlin:kotlin-reflect' diff --git a/airbyte-cdk/java/airbyte-cdk/core/build.gradle b/airbyte-cdk/java/airbyte-cdk/core/build.gradle index 5c991d709731..fe24cb06b6ca 100644 --- a/airbyte-cdk/java/airbyte-cdk/core/build.gradle +++ b/airbyte-cdk/java/airbyte-cdk/core/build.gradle @@ -42,12 +42,12 @@ dependencies { implementation 'net.i2p.crypto:eddsa:0.3.0' implementation 'org.apache.httpcomponents:httpcore:4.4.16' implementation 'org.apache.logging.log4j:log4j-layout-template-json:2.17.2' - implementation 'org.apache.sshd:sshd-mina:2.11.0' + implementation 'org.apache.sshd:sshd-mina:2.13.2' // bouncycastle is pinned to version-match the transitive dependency from kubernetes client-java // because a version conflict causes "parameter object not a ECParameterSpec" on ssh tunnel initiation - implementation 'org.bouncycastle:bcpkix-jdk15on:1.66' - implementation 'org.bouncycastle:bcprov-jdk15on:1.66' - implementation 'org.bouncycastle:bctls-jdk15on:1.66' + implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' + implementation 'org.bouncycastle:bcprov-jdk15on:1.70' + implementation 'org.bouncycastle:bctls-jdk15on:1.70' testFixturesApi 'org.testcontainers:testcontainers:1.19.0' testFixturesApi 'org.testcontainers:jdbc:1.19.0' diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties index 940c3205c2ba..5590734237c5 100644 --- a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties +++ b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties @@ -1 +1 @@ -version=0.44.20 +version=0.44.21 diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle b/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle index 428d19774c9f..5b6ff4d15e40 100644 --- a/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle +++ b/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle @@ -20,7 +20,7 @@ dependencies { api 'commons-io:commons-io:2.15.1' api ('io.airbyte.airbyte-protocol:protocol-models:0.11.0') { exclude group: 'com.google.api-client', module: 'google-api-client' } api 'javax.annotation:javax.annotation-api:1.3.2' - api 'org.apache.commons:commons-compress:1.25.0' + api 'org.apache.commons:commons-compress:1.27.1' api 'org.apache.commons:commons-lang3:3.14.0' api 'org.apache.logging.log4j:log4j-api:2.21.1' api 'org.apache.logging.log4j:log4j-core:2.21.1' diff --git a/airbyte-cdk/java/airbyte-cdk/s3-destinations/build.gradle b/airbyte-cdk/java/airbyte-cdk/s3-destinations/build.gradle index 823172c7d6b8..185d85ae23bd 100644 --- a/airbyte-cdk/java/airbyte-cdk/s3-destinations/build.gradle +++ b/airbyte-cdk/java/airbyte-cdk/s3-destinations/build.gradle @@ -20,19 +20,19 @@ dependencies { implementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-db-destinations') // Re-export dependencies for gcs-destinations. - api 'com.amazonaws:aws-java-sdk-s3:1.12.647' - api 'com.amazonaws:aws-java-sdk-sts:1.12.647' + api 'com.amazonaws:aws-java-sdk-s3:1.12.771' + api 'com.amazonaws:aws-java-sdk-sts:1.12.771' api ('com.github.airbytehq:json-avro-converter:1.1.3') { exclude group: 'ch.qos.logback', module: 'logback-classic'} api 'com.github.alexmojaki:s3-stream-upload:2.2.4' api 'org.apache.avro:avro:1.11.3' api 'org.apache.commons:commons-csv:1.10.0' api 'org.apache.commons:commons-text:1.11.0' api ('org.apache.hadoop:hadoop-aws:3.3.6') { exclude group: 'com.amazonaws', module: 'aws-java-sdk-bundle' } - api ('org.apache.hadoop:hadoop-common:3.3.6') { + api ('org.apache.hadoop:hadoop-common:3.4.0') { exclude group: 'org.apache.zookeeper' exclude group: 'org.apache.hadoop', module: 'hadoop-yarn-common' } - api ('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.6') { + api ('org.apache.hadoop:hadoop-mapreduce-client-core:3.4.0') { exclude group: 'org.apache.zookeeper' exclude group: 'org.apache.hadoop', module: 'hadoop-yarn-common' } diff --git a/airbyte-integrations/connectors/destination-redshift/build.gradle b/airbyte-integrations/connectors/destination-redshift/build.gradle index a6011737393d..061c257721c1 100644 --- a/airbyte-integrations/connectors/destination-redshift/build.gradle +++ b/airbyte-integrations/connectors/destination-redshift/build.gradle @@ -4,7 +4,7 @@ plugins { } airbyteJavaConnector { - cdkVersionRequired = '0.44.19' + cdkVersionRequired = '0.44.21' features = ['db-destinations', 's3-destinations', 'typing-deduping'] useLocalCdk = false } @@ -32,7 +32,7 @@ application { dependencies { - implementation 'com.amazonaws:aws-java-sdk-s3:1.11.978' + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.771' // TODO: Verify no aws sdk code is pulled by this dependency causing classpath conflicts // https://docs.aws.amazon.com/redshift/latest/mgmt/jdbc20-jdbc10-driver-differences.html implementation 'com.amazon.redshift:redshift-jdbc42:2.1.0.26' diff --git a/airbyte-integrations/connectors/destination-redshift/metadata.yaml b/airbyte-integrations/connectors/destination-redshift/metadata.yaml index e4f1a09e3c2b..cf80f987fe5c 100644 --- a/airbyte-integrations/connectors/destination-redshift/metadata.yaml +++ b/airbyte-integrations/connectors/destination-redshift/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: database connectorType: destination definitionId: f7a7d195-377f-cf5b-70a5-be6b819019dc - dockerImageTag: 3.4.4 + dockerImageTag: 3.4.5 dockerRepository: airbyte/destination-redshift documentationUrl: https://docs.airbyte.com/integrations/destinations/redshift githubIssueLabel: destination-redshift diff --git a/airbyte-integrations/connectors/destination-s3/build.gradle b/airbyte-integrations/connectors/destination-s3/build.gradle index 67bfe4e1dd63..5a4762e3e25e 100644 --- a/airbyte-integrations/connectors/destination-s3/build.gradle +++ b/airbyte-integrations/connectors/destination-s3/build.gradle @@ -4,7 +4,7 @@ plugins { } airbyteJavaConnector { - cdkVersionRequired = '0.44.20' + cdkVersionRequired = '0.44.21' features = ['db-destinations', 's3-destinations'] useLocalCdk = false } @@ -27,18 +27,18 @@ application { dependencies { // csv - implementation 'com.amazonaws:aws-java-sdk-s3:1.11.978' + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.771' implementation 'org.apache.commons:commons-csv:1.4' implementation 'com.github.alexmojaki:s3-stream-upload:2.2.2' // parquet - implementation ('org.apache.hadoop:hadoop-common:3.3.3') { + implementation ('org.apache.hadoop:hadoop-common:3.4.0') { exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-reload4j' exclude group: 'org.apache.zookeeper' } implementation ('org.apache.hadoop:hadoop-aws:3.3.3') { exclude group: 'org.slf4j', module: 'slf4j-log4j12'} - implementation ('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.3') { + implementation ('org.apache.hadoop:hadoop-mapreduce-client-core:3.4.0') { exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-reload4j' exclude group: 'org.apache.zookeeper' @@ -47,6 +47,6 @@ dependencies { implementation ('com.github.airbytehq:json-avro-converter:1.1.3') { exclude group: 'ch.qos.logback', module: 'logback-classic'} implementation group: 'com.hadoop.gplcompression', name: 'hadoop-lzo', version: '0.4.20' testImplementation 'org.apache.commons:commons-lang3:3.11' - testImplementation 'org.xerial.snappy:snappy-java:1.1.8.4' + testImplementation 'org.xerial.snappy:snappy-java:1.1.10.6' testImplementation "org.mockito:mockito-inline:4.1.0" } diff --git a/airbyte-integrations/connectors/destination-s3/metadata.yaml b/airbyte-integrations/connectors/destination-s3/metadata.yaml index fb887686ce4e..333b8d13f9ba 100644 --- a/airbyte-integrations/connectors/destination-s3/metadata.yaml +++ b/airbyte-integrations/connectors/destination-s3/metadata.yaml @@ -2,7 +2,7 @@ data: connectorSubtype: file connectorType: destination definitionId: 4816b78f-1489-44c1-9060-4b19d5fa9362 - dockerImageTag: 1.0.4 + dockerImageTag: 1.0.5 dockerRepository: airbyte/destination-s3 githubIssueLabel: destination-s3 icon: s3.svg diff --git a/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle b/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle index ffe2bf71cf6b..f8a6b1c5f2b8 100644 --- a/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle +++ b/airbyte-integrations/connectors/destination-starburst-galaxy/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation 'org.apache.iceberg:iceberg-aws:1.1.0' implementation 'org.apache.iceberg:iceberg-parquet:1.1.0' - implementation 'org.apache.hadoop:hadoop-common:3.3.3' + implementation 'org.apache.hadoop:hadoop-common:3.4.0' implementation "org.apache.hadoop:hadoop-aws:3.3.2" implementation 'software.amazon.awssdk:bundle:2.20.20' diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle index 0a6cbf407212..ddfed0796ed3 100644 --- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle +++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle @@ -99,7 +99,7 @@ class AirbyteJavaConnectorExtension { implementation "com.google.guava:guava:31.1-jre" implementation "commons-io:commons-io:2.7" - implementation "org.apache.commons:commons-compress:1.20" + implementation "org.apache.commons:commons-compress:1.27.1" implementation "org.apache.commons:commons-lang3:3.11" implementation "org.slf4j:slf4j-api:2.0.9" diff --git a/deps.toml b/deps.toml index 52702d874d12..3213d59aec60 100644 --- a/deps.toml +++ b/deps.toml @@ -23,11 +23,11 @@ mockito-version = "5.11.0" [libraries] airbyte-protocol = { module = "io.airbyte.airbyte-protocol:protocol-models", version.ref = "airbyte-protocol" } -apache-commons = { module = "org.apache.commons:commons-compress", version = "1.20" } +apache-commons = { module = "org.apache.commons:commons-compress", version = "1.27.1" } apache-commons-lang = { module = "org.apache.commons:commons-lang3", version = "3.11" } appender-log4j2 = { module = "com.therealvan:appender-log4j2", version = "3.6.0" } assertj-core = { module = "org.assertj:assertj-core", version = "3.21.0" } -aws-java-sdk-s3 = { module = "com.amazonaws:aws-java-sdk-s3", version = "1.12.6" } +aws-java-sdk-s3 = { module = "com.amazonaws:aws-java-sdk-s3", version = "1.12.771" } commons-io = { module = "commons-io:commons-io", version.ref = "commons_io" } testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" }