diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java index efecb9bfc2ae..627e56ad8b93 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java @@ -27,9 +27,8 @@ import java.util.Iterator; import java.util.List; -import org.jetbrains.annotations.NotNull; - import org.springframework.core.io.UrlResource; +import org.springframework.lang.NonNull; import org.springframework.util.Assert; /** @@ -54,7 +53,7 @@ private ImportCandidates(List candidates) { this.candidates = Collections.unmodifiableList(candidates); } - @NotNull + @NonNull @Override public Iterator iterator() { return this.candidates.iterator(); diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index f0f1aa09ee9d..b0d8bf8796c8 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -13,7 +13,7 @@ name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"> + value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^org\.jetbrains\.annotations.*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.shaded.*, ^org\.testcontainers\.shaded.*" />