Merge branch '2.4.x'
This commit is contained in:
commit
7465eb0f03
|
|
@ -26,7 +26,6 @@ import org.assertj.core.api.Condition;
|
||||||
import org.hamcrest.collection.IsMapContaining;
|
import org.hamcrest.collection.IsMapContaining;
|
||||||
|
|
||||||
import org.springframework.boot.configurationprocessor.metadata.ItemMetadata.ItemType;
|
import org.springframework.boot.configurationprocessor.metadata.ItemMetadata.ItemType;
|
||||||
import org.springframework.util.Assert;
|
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue