Skip to content

Commit

Permalink
fix: set proper jooq dependency scope (#14856)
Browse files Browse the repository at this point in the history
  • Loading branch information
colesnodgrass committed Dec 18, 2024
1 parent e397d4c commit 0d1561b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 7 additions & 7 deletions airbyte-db/jooq/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ dependencies {
implementation(project(":oss:airbyte-db:db-lib"))

// jOOQ code generation)
implementation(libs.jooq.codegen)
implementation(libs.platform.testcontainers.postgresql)
jooqGenerator(libs.platform.testcontainers.postgresql)

// These are required because gradle might be using lower version of Jna from other
// library transitive dependency. Can be removed if we can figure out which library is the cause.
// Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
implementation(libs.jna)
implementation(libs.jna.platform)
jooqGenerator(libs.jna)
jooqGenerator(libs.jna.platform)

// The jOOQ code generator(only has access to classes added to the jooqGenerator configuration
jooqGenerator(project(":oss:airbyte-db:db-lib")) {
Expand Down Expand Up @@ -94,10 +93,11 @@ sourceSets["main"].java {
)
}


sourceSets["main"].java {
srcDirs("${project.layout.buildDirectory.get()}/generated/configsDatabase/src/main/java",
"${project.layout.buildDirectory.get()}/generated/jobsDatabase/src/main/java")
srcDirs(
"${project.layout.buildDirectory.get()}/generated/configsDatabase/src/main/java",
"${project.layout.buildDirectory.get()}/generated/jobsDatabase/src/main/java",
)
}

tasks.named<JooqGenerate>("generateConfigsDatabaseJooq") {
Expand Down
1 change: 1 addition & 0 deletions airbyte-keycloak-setup/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
testImplementation(libs.bundles.micronaut.test)
testImplementation(libs.bundles.junit)
testImplementation(libs.junit.jupiter.system.stubs)
testImplementation(libs.platform.testcontainers.postgresql)

testImplementation(project(":oss:airbyte-test-utils"))
}
Expand Down

0 comments on commit 0d1561b

Please sign in to comment.