From 4dc966b04b5f2bdeb43f4bc02de0675c5b9f5586 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Fri, 27 Sep 2019 13:57:31 +0200
Subject: [PATCH] Include @Inject TCK tests in the build again

Commit 979508a7f3a02df0a2a24a3dfc6968e70786684c removed the JUnit 4
dependency from all modules except spring-test. Unfortunately, the
@Inject TCK tests (SpringAtInjectTckTests) are still based on JUnit 3.
Thus, that commit accidentally excluded those tests from the build.

This commit includes SpringAtInjectTckTests in the build again by
introducing a test runtime dependency on the JUnit Vintage TestEngine
in spring-context.

See gh-23451
---
 spring-context/spring-context.gradle       | 1 +
 src/checkstyle/checkstyle-suppressions.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index b65c7278a4..54ee48da69 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -39,4 +39,5 @@ dependencies {
 	testRuntime("javax.xml.bind:jaxb-api")
 	testRuntime("org.glassfish:javax.el")
 	testRuntime("org.javamoney:moneta")
+	testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
 }
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 2fba1f7808..cfc6066dc3 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -17,7 +17,7 @@
 	<suppress files="RootBeanDefinition" checks="EqualsHashCode" />
 
 	<!-- spring-context -->
-	<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" />
+	<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports" />
 
 	<!-- spring-core -->
 	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*" />