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.

Sign up for GitHub

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

gradle: remove deps.toml #45160

Merged
merged 1 commit into from
Sep 5, 2024
Merged

gradle: remove deps.toml #45160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions airbyte-cdk/java/airbyte-cdk/db-destinations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies {

implementation 'io.aesy:datasize:1.0.0'

testFixturesCompileOnly libs.lombok
testFixturesAnnotationProcessor libs.lombok
testFixturesCompileOnly 'org.projectlombok:lombok:1.18.30'
testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
testFixturesImplementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-dependencies')
testFixturesImplementation testFixtures(project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-dependencies'))
testFixturesImplementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-cdk-core')
Expand Down
1 change: 1 addition & 0 deletions airbyte-ci/connectors/pipelines/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only

| Version | PR | Description |
| ------- | ---------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------|
| 4.35.1 | [#45160](https://github.com/airbytehq/airbyte/pull/45160) | Remove deps.toml dependency for java connectors. |
| 4.35.0 | [#44879](https://github.com/airbytehq/airbyte/pull/44879) | Mount `components.py` when building manifest-only connector image |
| 4.34.2 | [#44786](https://github.com/airbytehq/airbyte/pull/44786) | Pre-emptively skip archived connectors when searching for modified files |
| 4.34.1 | [#44557](https://github.com/airbytehq/airbyte/pull/44557) | Conditionally propagate parameters in manifest-only migration |
Expand Down
1 change: 0 additions & 1 deletion airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/steps/gradle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ async def _run(self, *args: Any, **kwargs: Any) -> StepResult:
".root",
".env",
"build.gradle",
"deps.toml",
"gradle.properties",
"gradle",
"gradlew",
Expand Down
2 changes: 1 addition & 1 deletion airbyte-ci/connectors/pipelines/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pipelines"
version = "4.35.0"
version = "4.35.1"
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
authors = ["Airbyte <contact@airbyte.io>"]

Expand Down
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ dependencies {
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
testImplementation libs.testcontainers.clickhouse
testImplementation 'org.testcontainers:clickhouse:1.19.0'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
integrationTestJavaImplementation 'org.testcontainers:clickhouse:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-clickhouse/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ dependencies {
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
testImplementation libs.testcontainers.clickhouse
testImplementation 'org.testcontainers:clickhouse:1.19.0'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
integrationTestJavaImplementation 'org.testcontainers:clickhouse:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ dependencies {

// MIT
// https://www.testcontainers.org/
testImplementation libs.testcontainers.elasticsearch
integrationTestJavaImplementation libs.testcontainers.elasticsearch
testImplementation 'org.testcontainers:elasticsearch:1.19.0'
integrationTestJavaImplementation 'org.testcontainers:elasticsearch:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-elasticsearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ dependencies {

// MIT
// https://www.testcontainers.org/
testImplementation libs.testcontainers.elasticsearch
integrationTestJavaImplementation libs.testcontainers.elasticsearch
testImplementation 'org.testcontainers:elasticsearch:1.19.0'
integrationTestJavaImplementation 'org.testcontainers:elasticsearch:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-iceberg/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ dependencies {
}
}

testImplementation libs.testcontainers.postgresql
integrationTestJavaImplementation libs.testcontainers.postgresql
testImplementation 'org.testcontainers:postgresql:1.19.0'
integrationTestJavaImplementation 'org.testcontainers:postgresql:1.19.0'

testImplementation 'org.mockito:mockito-inline:4.7.0'
}
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-kafka/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dependencies {
implementation 'org.apache.kafka:kafka-clients:2.8.0'
implementation 'org.apache.kafka:connect-json:2.8.0'

integrationTestJavaImplementation libs.testcontainers.kafka
integrationTestJavaImplementation 'org.testcontainers:kafka:1.19.0'
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ dependencies {
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.testcontainers.mssqlserver
testImplementation 'org.testcontainers:mssqlserver:1.19.0'

}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-mssql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ dependencies {
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.testcontainers.mssqlserver
testImplementation 'org.testcontainers:mssqlserver:1.19.0'
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ dependencies {
implementation 'mysql:mysql-connector-java:8.0.22'

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
integrationTestJavaImplementation libs.testcontainers.mysql
integrationTestJavaImplementation 'org.testcontainers:mysql:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-mysql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ application {

dependencies {
implementation 'mysql:mysql-connector-java:8.0.22'
integrationTestJavaImplementation libs.testcontainers.mysql
testFixturesApi libs.testcontainers.mysql
integrationTestJavaImplementation 'org.testcontainers:mysql:1.19.0'
testFixturesApi 'org.testcontainers:mysql:1.19.0'
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
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.0'

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-oracle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ dependencies {
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.0'
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-redis/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ dependencies {
// https://mvnrepository.com/artifact/org.assertj/assertj-core
testImplementation "org.assertj:assertj-core:${assertVersion}"
// https://mvnrepository.com/artifact/org.testcontainers/testcontainers
testImplementation libs.testcontainers
testImplementation 'org.testcontainers:testcontainers:1.19.0'
}
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/destination-s3-glue/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ dependencies {
// https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-glue
implementation 'com.amazonaws:aws-java-sdk-glue:1.12.334'

implementation libs.aws.java.sdk.s3
implementation libs.s3
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.6'
implementation 'software.amazon.awssdk:s3:2.20.20'
}
121 changes: 0 additions & 121 deletions deps.toml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ dependencyResolutionManagement {
}
}
}

versionCatalogs {
libs {
from(files("deps.toml"))
}
}
}

gradleEnterprise {
Expand Down
Loading