From 42ea09b08ad2d00d768f227aabd849db04eb8440 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 1 Aug 2022 13:37:03 +0300 Subject: [PATCH] Remove Hamcrest support from CompileWithTargetClassAccessClassLoader CompileWithTargetClassAccessClassLoader is currently only used within the CompileWithTargetClassAccessExtension which is dedicated to JUnit Jupiter support which in turn should not have any direct dependencies on Hamcrest. In other words, the JupiterTestEngine should not load any Hamcrest types that would cause issues with the CompileWithTargetClassAccessClassLoader. --- .../compile/CompileWithTargetClassAccessClassLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java index 141ba2f4e1d..c28e351282f 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java @@ -41,7 +41,7 @@ final class CompileWithTargetClassAccessClassLoader extends ClassLoader { @Override public Class loadClass(String name) throws ClassNotFoundException { - if (name.startsWith("org.junit") || name.startsWith("org.hamcrest")) { + if (name.startsWith("org.junit")) { return Class.forName(name, false, this.testClassLoader); } return super.loadClass(name);