root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Include @Inject TCK tests in the build again 

Commit 979508a7f3 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
This commit is contained in:
Sam Brannen 2019-09-27 13:57:31 +02:00
parent 2861fc65bd
commit 4dc966b04b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-context/spring-context.gradle
View File

@ -39,4 +39,5 @@ dependencies {
testRuntime("javax.xml.bind:jaxb-api") testRuntime("javax.xml.bind:jaxb-api")
testRuntime("org.glassfish:javax.el") testRuntime("org.glassfish:javax.el")
testRuntime("org.javamoney:moneta") testRuntime("org.javamoney:moneta")
testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
} }

2
src/checkstyle/checkstyle-suppressions.xml
View File

@ -17,7 +17,7 @@
<suppress files="RootBeanDefinition" checks="EqualsHashCode" /> <suppress files="RootBeanDefinition" checks="EqualsHashCode" />
<!-- spring-context --> <!-- spring-context -->
<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" /> <suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports" />
<!-- spring-core --> <!-- spring-core -->
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*" /> <suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*" />