Skip to content

Commit 39355cd

Browse files
committed
Update test-autoconfigure module to Spring Boot 4 latest snapshots
1 parent 5017f51 commit 39355cd

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

spring-shell-test-autoconfigure/src/main/java/org/springframework/shell/test/autoconfigure/ShellTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 the original author or authors.
2+
* Copyright 2022-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,9 +27,8 @@
2727
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.SpringBootApplication;
2929
import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
30-
import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters;
31-
import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
32-
import org.springframework.boot.test.autoconfigure.properties.SkipPropertyMapping;
30+
import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters;
31+
import org.springframework.boot.test.context.PropertyMapping;
3332
import org.springframework.context.annotation.ComponentScan.Filter;
3433
import org.springframework.core.annotation.AliasFor;
3534
import org.springframework.core.env.Environment;
@@ -68,15 +67,15 @@
6867
*
6968
* @return emulated terminal width
7069
*/
71-
@PropertyMapping(value = "spring.shell.test.terminal-width", skip = SkipPropertyMapping.ON_DEFAULT_VALUE)
70+
@PropertyMapping(value = "spring.shell.test.terminal-width", skip = PropertyMapping.Skip.ON_DEFAULT_VALUE)
7271
int terminalWidth() default 80;
7372

7473
/**
7574
* Set emulated terminal height.
7675
*
7776
* @return emulated terminal height
7877
*/
79-
@PropertyMapping(value = "spring.shell.test.terminal-height", skip = SkipPropertyMapping.ON_DEFAULT_VALUE)
78+
@PropertyMapping(value = "spring.shell.test.terminal-height", skip = PropertyMapping.Skip.ON_DEFAULT_VALUE)
8079
int terminalHeight() default 24;
8180

8281
/**

spring-shell-test-autoconfigure/src/main/java/org/springframework/shell/test/autoconfigure/ShellTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Set;
2121

2222
import org.springframework.boot.context.TypeExcludeFilter;
23-
import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter;
23+
import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter;
2424
import org.springframework.shell.standard.ShellComponent;
2525

2626
/**

0 commit comments

Comments
 (0)