From e8c8a9647d39da79ec52a29556555eb15a46049d Mon Sep 17 00:00:00 2001
From: Duane May <duane.may@broadcom.com>
Date: Fri, 17 Jan 2025 17:32:49 -0500
Subject: [PATCH] Remove the global retry gradle plugin

Signed-off-by: Duane May <duane.may@broadcom.com>
---
 build.gradle        | 15 ---------------
 dependencies.gradle |  1 -
 2 files changed, 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 438e6865b0d..ee0aa80025e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,6 @@ buildscript {
         classpath(libraries.cargoGradlePlugin)
         classpath(libraries.springDependencyMangementGradlePlugin)
         classpath(libraries.springBootGradlePlugin)
-        classpath(libraries.testRetryPlugin)
         classpath(libraries.gradleJcocoPlugin)
         classpath(libraries.sonarqubePlugin)
     }
@@ -33,7 +32,6 @@ apply(plugin: "war")
 
 allprojects {
     apply(plugin: "io.spring.dependency-management")
-    apply(plugin: "org.gradle.test-retry")
     apply(plugin: "org.barfuin.gradle.jacocolog")
     apply(plugin: "org.sonarqube")
 
@@ -110,19 +108,6 @@ subprojects {
         useJUnitPlatform()
         jvmArgs += ["-Xmx1024m", "-XX:+StartAttachListener", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/var/log/uaa-tests.hprof"]
 
-        retry {
-            def failOnPassedAfterRetrySystemProperty = Boolean.parseBoolean(
-                    System.getProperty("failOnPassedAfterRetry", "false"));
-            if (!failOnPassedAfterRetrySystemProperty) {
-                logger.warn("retry: Flaky tests will not make the test run fail because failOnPassedAfterRetry is false.")
-            }
-
-            // Configure the retry extension
-            failOnPassedAfterRetry = failOnPassedAfterRetrySystemProperty
-            maxFailures = Integer.parseInt(System.getProperty("maxFailures", "3"))
-            maxRetries = Integer.parseInt(System.getProperty("maxRetries", "1"))
-        }
-
         testLogging {
             events("failed")
             exceptionFormat("full")
diff --git a/dependencies.gradle b/dependencies.gradle
index 1d78aef440b..946db221fcc 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -137,7 +137,6 @@ libraries.apacheHttpClient = "org.apache.httpcomponents:httpclient:4.5.14"
 libraries.jacocoAgent = "org.jacoco:org.jacoco.agent:0.8.12"
 
 // gradle plugins
-libraries.testRetryPlugin = "org.gradle:test-retry-gradle-plugin:1.6.0"
 libraries.cargoGradlePlugin = "com.bmuschko:gradle-cargo-plugin:2.9.0"
 libraries.springBootGradlePlugin = "org.springframework.boot:spring-boot-gradle-plugin:${versions.springBootVersion}"
 libraries.springDependencyMangementGradlePlugin = "io.spring.gradle:dependency-management-plugin"