Merge branch '3.3.x' into 3.4.x

Closes gh-44922

Author: wilkinsona

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

@@ -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;