Fix checkstyle issues and test failures

See gh-27955
See gh-28442
This commit is contained in:
Phillip Webb
2022-05-10 18:32:41 -07:00
parent 83063a7269
commit 2961426d8a
3 changed files with 4 additions and 4 deletions

View File

@@ -111,7 +111,7 @@ jar {
test {
// Make sure the classes dir is used on the test classpath (required by ResourceTests).
// When test fixtures are involved, the JAR is used by default.
classpath = sourceSets.main.output.classesDirs + classpath - files(jar.archiveFile)
classpath = sourceSets.main.output.classesDirs + files(sourceSets.main.output.resourcesDir) + classpath - files(jar.archiveFile)
// Ensure that BlockHound tests run on JDK 13+. For details, see:
// https://github.com/reactor/BlockHound/issues/33