From 4575f82c726379b5f408d228074fb019c21a6d0a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Tue, 3 Sep 2019 17:08:45 +0200
Subject: [PATCH] Simplify Gradle test task configuration

---
 build.gradle | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index c644591a491..5d441bbe254 100644
--- a/build.gradle
+++ b/build.gradle
@@ -317,16 +317,11 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	test {
+		useJUnitPlatform()
+		include(["**/*Tests.class", "**/*Test.class"])
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
 		systemProperty("io.netty.leakDetection.level", "paranoid")
-		useJUnitPlatform()
-		scanForTestClasses = false
-		include(["**/*Tests.class", "**/*Test.class"])
-		// Since we set scanForTestClasses to false, we need to filter out inner
-		// classes with the "$" pattern; otherwise, using -Dtest.single=MyTests to
-		// run MyTests by itself will fail if MyTests contains any inner classes.
-		exclude(['**/*$*'])
 	}
 
 	checkstyle {