Skip to content

Commit dd2d443

Browse files
author
Marius Posta
authored
gradle: remove deps.toml (#45160)
1 parent 3b79bd7 commit dd2d443

File tree

20 files changed

+25
-152
lines changed

20 files changed

+25
-152
lines changed

‎airbyte-cdk/java/airbyte-cdk/db-destinations/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dependencies {
1010

1111
implementation 'io.aesy:datasize:1.0.0'
1212

13-
testFixturesCompileOnly libs.lombok
14-
testFixturesAnnotationProcessor libs.lombok
13+
testFixturesCompileOnly 'org.projectlombok:lombok:1.18.30'
14+
testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
1515
testFixturesImplementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-dependencies')
1616
testFixturesImplementation testFixtures(project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-dependencies'))
1717
testFixturesImplementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-core')

‎airbyte-ci/connectors/pipelines/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only
843843

844844
| Version | PR | Description |
845845
| ------- | ---------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------|
846+
| 4.35.1 | [#45160](https://github.com/airbytehq/airbyte/pull/45160) | Remove deps.toml dependency for java connectors. |
846847
| 4.35.0 | [#44879](https://github.com/airbytehq/airbyte/pull/44879) | Mount `components.py` when building manifest-only connector image |
847848
| 4.34.2 | [#44786](https://github.com/airbytehq/airbyte/pull/44786) | Pre-emptively skip archived connectors when searching for modified files |
848849
| 4.34.1 | [#44557](https://github.com/airbytehq/airbyte/pull/44557) | Conditionally propagate parameters in manifest-only migration |

‎airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/steps/gradle.py

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ async def _run(self, *args: Any, **kwargs: Any) -> StepResult:
8383
".root",
8484
".env",
8585
"build.gradle",
86-
"deps.toml",
8786
"gradle.properties",
8887
"gradle",
8988
"gradlew",

‎airbyte-ci/connectors/pipelines/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pipelines"
7-
version = "4.35.0"
7+
version = "4.35.1"
88
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
99
authors = ["Airbyte <[email protected]>"]
1010

‎airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ dependencies {
2929
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'
3030

3131
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
32-
testImplementation libs.testcontainers.clickhouse
32+
testImplementation 'org.testcontainers:clickhouse:1.19.0'
3333

3434
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
35-
integrationTestJavaImplementation libs.testcontainers.clickhouse
35+
integrationTestJavaImplementation 'org.testcontainers:clickhouse:1.19.0'
3636
}

‎airbyte-integrations/connectors/destination-clickhouse/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ dependencies {
2828
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'
2929

3030
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
31-
testImplementation libs.testcontainers.clickhouse
31+
testImplementation 'org.testcontainers:clickhouse:1.19.0'
3232

3333
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
34-
integrationTestJavaImplementation libs.testcontainers.clickhouse
34+
integrationTestJavaImplementation 'org.testcontainers:clickhouse:1.19.0'
3535
}

‎airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ dependencies {
4040

4141
// MIT
4242
// https://www.testcontainers.org/
43-
testImplementation libs.testcontainers.elasticsearch
44-
integrationTestJavaImplementation libs.testcontainers.elasticsearch
43+
testImplementation 'org.testcontainers:elasticsearch:1.19.0'
44+
integrationTestJavaImplementation 'org.testcontainers:elasticsearch:1.19.0'
4545
}

‎airbyte-integrations/connectors/destination-elasticsearch/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ dependencies {
3939

4040
// MIT
4141
// https://www.testcontainers.org/
42-
testImplementation libs.testcontainers.elasticsearch
43-
integrationTestJavaImplementation libs.testcontainers.elasticsearch
42+
testImplementation 'org.testcontainers:elasticsearch:1.19.0'
43+
integrationTestJavaImplementation 'org.testcontainers:elasticsearch:1.19.0'
4444
}

‎airbyte-integrations/connectors/destination-iceberg/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ dependencies {
5555
}
5656
}
5757

58-
testImplementation libs.testcontainers.postgresql
59-
integrationTestJavaImplementation libs.testcontainers.postgresql
58+
testImplementation 'org.testcontainers:postgresql:1.19.0'
59+
integrationTestJavaImplementation 'org.testcontainers:postgresql:1.19.0'
6060

6161
testImplementation 'org.mockito:mockito-inline:4.7.0'
6262
}

‎airbyte-integrations/connectors/destination-kafka/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ dependencies {
2828
implementation 'org.apache.kafka:kafka-clients:2.8.0'
2929
implementation 'org.apache.kafka:connect-json:2.8.0'
3030

31-
integrationTestJavaImplementation libs.testcontainers.kafka
31+
integrationTestJavaImplementation 'org.testcontainers:kafka:1.19.0'
3232
}

‎airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ dependencies {
3434
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'
3535

3636
testImplementation 'org.apache.commons:commons-lang3:3.11'
37-
testImplementation libs.testcontainers.mssqlserver
37+
testImplementation 'org.testcontainers:mssqlserver:1.19.0'
3838

3939
}

‎airbyte-integrations/connectors/destination-mssql/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ dependencies {
3333
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'
3434

3535
testImplementation 'org.apache.commons:commons-lang3:3.11'
36-
testImplementation libs.testcontainers.mssqlserver
36+
testImplementation 'org.testcontainers:mssqlserver:1.19.0'
3737
}

‎airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ dependencies {
2929
implementation 'mysql:mysql-connector-java:8.0.22'
3030

3131
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
32-
integrationTestJavaImplementation libs.testcontainers.mysql
32+
integrationTestJavaImplementation 'org.testcontainers:mysql:1.19.0'
3333
}

‎airbyte-integrations/connectors/destination-mysql/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ application {
2727

2828
dependencies {
2929
implementation 'mysql:mysql-connector-java:8.0.22'
30-
integrationTestJavaImplementation libs.testcontainers.mysql
31-
testFixturesApi libs.testcontainers.mysql
30+
integrationTestJavaImplementation 'org.testcontainers:mysql:1.19.0'
31+
testFixturesApi 'org.testcontainers:mysql:1.19.0'
3232
}

‎airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"
3434

3535
testImplementation 'org.apache.commons:commons-lang3:3.11'
36-
testImplementation libs.testcontainers.oracle.xe
36+
testImplementation 'org.testcontainers:oracle-xe:1.19.0'
3737

3838
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')
3939
}

‎airbyte-integrations/connectors/destination-oracle/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ dependencies {
3232
implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"
3333

3434
testImplementation 'org.apache.commons:commons-lang3:3.11'
35-
testImplementation libs.testcontainers.oracle.xe
35+
testImplementation 'org.testcontainers:oracle-xe:1.19.0'
3636
}

‎airbyte-integrations/connectors/destination-redis/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ dependencies {
3737
// https://mvnrepository.com/artifact/org.assertj/assertj-core
3838
testImplementation "org.assertj:assertj-core:${assertVersion}"
3939
// https://mvnrepository.com/artifact/org.testcontainers/testcontainers
40-
testImplementation libs.testcontainers
40+
testImplementation 'org.testcontainers:testcontainers:1.19.0'
4141
}

‎airbyte-integrations/connectors/destination-s3-glue/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ dependencies {
2727
// https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-glue
2828
implementation 'com.amazonaws:aws-java-sdk-glue:1.12.334'
2929

30-
implementation libs.aws.java.sdk.s3
31-
implementation libs.s3
30+
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.6'
31+
implementation 'software.amazon.awssdk:s3:2.20.20'
3232
}

‎deps.toml

-121
This file was deleted.

‎settings.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ dependencyResolutionManagement {
102102
}
103103
}
104104
}
105-
106-
versionCatalogs {
107-
libs {
108-
from(files("deps.toml"))
109-
}
110-
}
111105
}
112106

113107
gradleEnterprise {

0 commit comments

Comments
 (0)