Skip to content

Commit be60863

Browse files
committed
Merge branch '3.4.x'
Closes gh-44842
2 parents 520d343 + 7368b34 commit be60863

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.springframework.boot.autoconfigure.cache.support.MockCachingProvider.MockCacheManager;
5252
import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
5353
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
54-
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
5554
import org.springframework.boot.testsupport.classpath.resources.WithResource;
5655
import org.springframework.cache.Cache;
5756
import org.springframework.cache.Cache.ValueWrapper;
@@ -97,7 +96,6 @@
9796
* @author Mark Paluch
9897
* @author Ryon Day
9998
*/
100-
@ClassPathExclusions("hazelcast-client-*.jar")
10199
class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests {
102100

103101
@Test

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
4242
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4343
import org.springframework.boot.test.context.runner.ContextConsumer;
44-
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
4544
import org.springframework.boot.testsupport.classpath.resources.WithResource;
4645
import org.springframework.context.annotation.Bean;
4746
import org.springframework.context.annotation.Configuration;
@@ -55,7 +54,6 @@
5554
*
5655
* @author Stephane Nicoll
5756
*/
58-
@ClassPathExclusions("hazelcast-client-*.jar")
5957
class HazelcastAutoConfigurationServerTests {
6058

6159
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

0 commit comments

Comments
 (0)