Upgrade develocity plugin; disable failOnSkippedAfterRetry (#69221)

Author: edgao

buildSrc/src/main/groovy/airbyte-bulk-connector.gradle

@@ -226,18 +226,23 @@ class AirbyteBulkConnectorPlugin implements Plugin<Project> {
                     showStandardStreams = true
                 }
 
-                retry {
-                    // If running in CI, enable retries to mitigate flakiness
-                    if (System.getenv().containsKey("CI")) {
-                        // Run each test method up to three times
-                        maxRetries = 3
-                        // If any test method fails, disable retries for the other tests
-                        // (unintuitive: if you set this to 1, then as soon as a test case fails, it will disable retries, including for itself.
-                        // So we set to 2, which means: a test case failing will retry itself. If, after three retries, it still fails, then we disable retries globally.)
-                        maxFailures = 2
+                develocity {
+                    testRetry {
+                        // If running in CI, enable retries to mitigate flakiness
+                        if (System.getenv().containsKey("CI")) {
+                            // Run each test method up to three times
+                            maxRetries = 3
+                            // If any test method fails, disable retries for the other tests
+                            // (unintuitive: if you set this to 1, then as soon as a test case fails, it will disable retries, including for itself.
+                            // So we set to 2, which means: a test case failing will retry itself. If, after three retries, it still fails, then we disable retries globally.)
+                            maxFailures = 2
+                        }
+                        // If a test fails, but succeeds on retry - don't fail the task
+                        failOnPassedAfterRetry = false
+                        // If a test fails, but is skipped on retry (e.g., due to failed assumptions) - don't fail the task.
+                        // This handles cases where tests use Assumptions.assumeTrue() to conditionally skip themselves.
+                        failOnSkippedAfterRetry = false
                     }
-                    // If a test fails, but succeeds on retry - don't fail the task
-                    failOnPassedAfterRetry = false
                 }
                 reports {
                     junitXml {

settings.gradle

@@ -20,7 +20,7 @@ pluginManagement {
 // Configure the gradle enterprise plugin to enable build scans. Enabling the plugin at the top of the settings file allows the build scan to record
 // as much information as possible.
 plugins {
-    id "com.gradle.enterprise" version "3.15.1"
+    id "com.gradle.develocity" version "3.19.2"
     id 'com.github.burrunan.s3-build-cache' version "1.8.1"
 }
 
@@ -114,10 +114,10 @@ dependencyResolutionManagement {
     }
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
         uploadInBackground = !isCI // Disable in CI or scan URLs may not work.
         buildScanPublished { PublishedBuildScan scan ->
             file("scan-journal.log") << "${new Date()} - ${scan.buildScanId} - ${scan.buildScanUri}\n"