Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-44923
This commit is contained in:
Andy Wilkinson
2025-03-27 20:00:22 +00:00
parent ab1b3104bb 6fde9dc49b
commit e5a05ec7da
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/ErrorAttributesOptionsTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/error/ErrorAttributesOptionsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
* limitations under the License.
*/
package org.springframework.boot.web.servlet.error;
package org.springframework.boot.web.error;
import java.util.EnumSet;
import org.junit.jupiter.api.Test;
import org.springframework.boot.web.error.ErrorAttributeOptions;
import org.springframework.boot.web.error.ErrorAttributeOptions.Include;
import static org.assertj.core.api.Assertions.assertThat;