prep work for upgrading to gradle 8 (#5298)

airbyte-bootloader/build.gradle

@@ -2,21 +2,20 @@ plugins {
     id 'application'
 }
 
+configurations.all {
+    resolutionStrategy {
+        force libs.flyway.core, libs.jooq
+    }
+}
+
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
 
     implementation platform(libs.micronaut.bom)
     implementation libs.bundles.micronaut
-
-    // Ensure that the versions defined in deps.toml are used
-    // instead of versions from transitive dependencies
-    implementation (libs.flyway.core) {
-        force = true
-    }
-    implementation (libs.jooq) {
-        force = true
-    }
+    implementation libs.flyway.core
+    implementation libs.jooq
 
     implementation project(':airbyte-commons')
     implementation project(':airbyte-config:init')
@@ -36,11 +35,9 @@ dependencies {
     testImplementation libs.platform.testcontainers.postgresql
 }
 
-mainClassName = 'io.airbyte.bootloader.Application'
-
 application {
     applicationName = project.name
-    mainClass = mainClassName
+    mainClass = 'io.airbyte.bootloader.Application'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
 

airbyte-commons-server/build.gradle

@@ -2,6 +2,13 @@ plugins {
     id "java-library"
 }
 
+configurations.all {
+    resolutionStrategy {
+        // Ensure that the versions defined in deps.toml are used
+        // instead of versions from transitive dependencies
+        force libs.flyway.core, libs.s3, libs.aws.java.sdk.s3
+    }
+}
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
@@ -12,22 +19,10 @@ dependencies {
     implementation libs.micronaut.inject
     implementation libs.micronaut.jaxrs.server
 
-    // Ensure that the versions defined in deps.toml are used
-    // instead of versions from transitive dependencies
-    implementation(libs.flyway.core) {
-        force = true
-    }
-    implementation(libs.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible with our current Helm setup
-        force = true
-    }
-    implementation(libs.aws.java.sdk.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible with our current Helm setup
-        force = true
-    }
 
+    implementation libs.flyway.core
+    implementation libs.s3
+    implementation libs.aws.java.sdk.s3
     implementation project(':airbyte-analytics')
     implementation project(':airbyte-api')
     implementation project(':airbyte-commons')

airbyte-commons-worker/build.gradle

@@ -2,6 +2,11 @@ plugins {
     id "java-library"
 }
 
+configurations.all {
+    resolutionStrategy {
+        force libs.platform.testcontainers.postgresql
+    }
+}
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
@@ -41,10 +46,7 @@ dependencies {
     testImplementation libs.json.path
     testImplementation libs.mockito.inline
     testImplementation libs.postgresql
-    testImplementation(libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    testImplementation libs.platform.testcontainers.postgresql
     testImplementation libs.jmh.core
     testImplementation libs.jmh.annotations
     testImplementation libs.docker.java

airbyte-connector-atelier-server/build.gradle

@@ -22,10 +22,8 @@ dependencies {
     implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2'
 }
 
-mainClassName = 'io.airbyte.connector_builder.MicronautConnectorBuilderServerRunner'
-
 application {
-    mainClass = mainClassName
+    mainClass = 'io.airbyte.connector_builder.MicronautConnectorBuilderServerRunner'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
 
@@ -85,4 +83,4 @@ sourceSets {
 tasks.named("buildDockerImage") {
     dependsOn generateOpenApiServer
     dependsOn copyGeneratedTar
-}
+}

airbyte-container-orchestrator/build.gradle

@@ -9,26 +9,23 @@ configurations {
     airbyteProtocol
 }
 
+configurations.all {
+    resolutionStrategy {
+        // Ensure that the versions defined in deps.toml are used
+        // instead of versions from transitive dependencies
+        // Force to avoid updated version brought in transitively from Micronaut 3.8+
+        // that is incompatible with our current Helm setup
+        force libs.s3, libs.aws.java.sdk.s3
+    }
+}
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
 
     implementation platform(libs.micronaut.bom)
     implementation libs.bundles.micronaut
-
-    // Ensure that the versions defined in deps.toml are used
-    // instead of versions from transitive dependencies
-    implementation(libs.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible with our current Helm setup
-        force = true
-    }
-    implementation(libs.aws.java.sdk.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible wit hour current Helm setup
-        force = true
-    }
-
+    implementation libs.s3
+    implementation libs.aws.java.sdk.s3
     implementation libs.kubernetes.client
     implementation libs.bundles.datadog
 

airbyte-cron/build.gradle

@@ -27,10 +27,8 @@ dependencies {
     implementation libs.bundles.micronaut
 }
 
-mainClassName = 'io.airbyte.cron.MicronautCronRunner'
-
 application {
-    mainClass = mainClassName
+    mainClass = 'io.airbyte.cron.MicronautCronRunner'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
 

airbyte-db/db-lib/build.gradle

@@ -9,6 +9,9 @@ configurations {
 
 configurations.all {
     exclude group: 'io.micronaut.flyway'
+    resolutionStrategy {
+        force libs.platform.testcontainers.postgresql
+    }
 }
 
 dependencies {
@@ -23,17 +26,11 @@ dependencies {
     implementation project(':airbyte-config:config-models')
     implementation libs.flyway.core
 
-    migrations (libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    migrations libs.platform.testcontainers.postgresql
     migrations sourceSets.main.output
 
     // Mark as compile only to avoid leaking transitively to connectors
-    compileOnly (libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    compileOnly 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.
@@ -43,10 +40,7 @@ dependencies {
 
     testImplementation project(':airbyte-test-utils')
     testImplementation libs.apache.commons.lang
-    testImplementation (libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    testImplementation libs.platform.testcontainers.postgresql
 }
 
 task(newConfigsMigration, dependsOn: 'classes', type: JavaExec) {

airbyte-db/jooq/build.gradle

@@ -3,6 +3,11 @@ plugins {
     alias(libs.plugins.nu.studer.jooq)
 }
 
+configurations.all {
+    resolutionStrategy {
+        force libs.platform.testcontainers.postgresql
+    }
+}
 dependencies {
     implementation libs.jooq.meta
     implementation libs.jooq
@@ -12,10 +17,8 @@ dependencies {
 
     // jOOQ code generation
     implementation libs.jooq.codegen
-    implementation (libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    implementation 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
@@ -24,10 +27,7 @@ dependencies {
 
     // The jOOQ code generator only has access to classes added to the jooqGenerator configuration
     jooqGenerator project(':airbyte-db:db-lib')
-    jooqGenerator(libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    jooqGenerator libs.platform.testcontainers.postgresql
 }
 
 jooq {
@@ -73,9 +73,9 @@ jooq {
     }
 }
 
-sourceSets.main.java.srcDirs (
-    tasks.named('generateConfigsDatabaseJooq').flatMap { it.outputDir },
-    tasks.named('generateJobsDatabaseJooq').flatMap { it.outputDir }
+sourceSets.main.java.srcDirs(
+        tasks.named('generateConfigsDatabaseJooq').flatMap { it.outputDir },
+        tasks.named('generateJobsDatabaseJooq').flatMap { it.outputDir }
 )
 
 sourceSets {

airbyte-metrics/reporter/build.gradle

@@ -6,6 +6,12 @@ configurations {
     jdbc
 }
 
+configurations.all {
+    resolutionStrategy {
+        force libs.jooq
+    }
+}
+
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
@@ -17,10 +23,7 @@ dependencies {
     implementation project(':airbyte-db:jooq')
     implementation project(':airbyte-db:db-lib')
     implementation project(':airbyte-metrics:metrics-lib')
-
-    implementation(libs.jooq) {
-        force = true
-    }
+    implementation libs.jooq
 
     testAnnotationProcessor platform(libs.micronaut.bom)
     testAnnotationProcessor libs.bundles.micronaut.test.annotation.processor

airbyte-persistence/job-persistence/build.gradle

@@ -2,6 +2,12 @@ plugins {
     id "java-library"
 }
 
+configurations.all {
+    resolutionStrategy {
+        force libs.platform.testcontainers.postgresql
+    }
+}
+
 dependencies {
     implementation project(':airbyte-commons')
     implementation project(':airbyte-commons-protocol')
@@ -29,10 +35,7 @@ dependencies {
 
     testImplementation project(':airbyte-config:config-persistence')
     testImplementation project(':airbyte-test-utils')
-    testImplementation(libs.platform.testcontainers.postgresql) {
-        // Force to avoid updated version brought in transitively from Micronaut
-        force = true
-    }
+    testImplementation libs.platform.testcontainers.postgresql
 }
 
 Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

airbyte-server/build.gradle

@@ -2,6 +2,15 @@ plugins {
     id 'application'
 }
 
+configurations.all {
+    resolutionStrategy {
+        // Ensure that the versions defined in deps.toml are used
+        // instead of versions from transitive dependencies
+        // Force to avoid updated version brought in transitively from Micronaut 3.8+
+        // that is incompatible with our current Helm setup
+        force libs.flyway.core, libs.s3, libs.aws.java.sdk.s3
+    }
+}
 dependencies {
     annotationProcessor platform(libs.micronaut.bom)
     annotationProcessor libs.bundles.micronaut.annotation.processor
@@ -10,22 +19,9 @@ dependencies {
     implementation platform(libs.micronaut.bom)
     implementation libs.bundles.micronaut
     implementation libs.micronaut.jaxrs.server
-
-    // Ensure that the versions defined in deps.toml are used
-    // instead of versions from transitive dependencies
-    implementation(libs.flyway.core) {
-        force = true
-    }
-    implementation(libs.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible with our current Helm setup
-        force = true
-    }
-    implementation(libs.aws.java.sdk.s3) {
-        // Force to avoid updated version brought in transitively from Micronaut 3.8+
-        // that is incompatible with our current Helm setup
-        force = true
-    }
+    implementation libs.flyway.core
+    implementation libs.s3
+    implementation libs.aws.java.sdk.s3
 
     implementation project(':airbyte-analytics')
     implementation project(':airbyte-api')
@@ -77,11 +73,9 @@ task copySeed(type: Copy, dependsOn: [project(':airbyte-config:init').processRes
 test.dependsOn(project.tasks.copySeed)
 assemble.dependsOn(project.tasks.copySeed)
 
-mainClassName = 'io.airbyte.server.Application'
-
 application {
     applicationName = project.name
-    mainClass = mainClassName
+    mainClass = 'io.airbyte.server.Application'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }