fix(deps): bump :spring-framework-bom from 6.2.1 to 6.2.2

vegardit · Jan 20, 2025 · 81978c4 · 81978c4
1 parent 265dba0
commit 81978c4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/libs/eea-spring-6/pom.xml b/libs/eea-spring-6/pom.xml
@@ -23,7 +23,7 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>6.2.1</version>
+        <version>6.2.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/...src/main/resources/org/springframework/test/context/bean/override/BeanOverrideHandler.eea b/...src/main/resources/org/springframework/test/context/bean/override/BeanOverrideHandler.eea
@@ -21,7 +21,7 @@ getBeanType
  ()Lorg/springframework/core/ResolvableType;
 getField
  ()Ljava/lang/reflect/Field;
- ()Ljava/lang/reflect/Field;
+ ()L0java/lang/reflect/Field;
 getStrategy
  ()Lorg/springframework/test/context/bean/override/BeanOverrideStrategy;
  ()Lorg/springframework/test/context/bean/override/BeanOverrideStrategy;

diff --git a/...c/main/resources/org/springframework/test/context/bean/override/BeanOverrideProcessor.eea b/...c/main/resources/org/springframework/test/context/bean/override/BeanOverrideProcessor.eea
@@ -3,3 +3,6 @@ class org/springframework/test/context/bean/override/BeanOverrideProcessor
 createHandler
  (Ljava/lang/annotation/Annotation;Ljava/lang/Class<*>;Ljava/lang/reflect/Field;)Lorg/springframework/test/context/bean/override/BeanOverrideHandler;
  (Ljava/lang/annotation/Annotation;Ljava/lang/Class<*>;Ljava/lang/reflect/Field;)L1org/springframework/test/context/bean/override/BeanOverrideHandler;
+createHandlers
+ (Ljava/lang/annotation/Annotation;Ljava/lang/Class<*>;)Ljava/util/List<Lorg/springframework/test/context/bean/override/BeanOverrideHandler;>;
+ (Ljava/lang/annotation/Annotation;Ljava/lang/Class<*>;)L1java/util/List<Lorg/springframework/test/context/bean/override/BeanOverrideHandler;>;
diff --git a/...src/main/resources/org/springframework/test/context/bean/override/mockito/MockitoBean.eea b/...src/main/resources/org/springframework/test/context/bean/override/mockito/MockitoBean.eea
@@ -12,6 +12,9 @@ name
 reset
  ()Lorg/springframework/test/context/bean/override/mockito/MockReset;
  ()Lorg/springframework/test/context/bean/override/mockito/MockReset;
+types
+ ()[Ljava/lang/Class<*>;
+ ()[Ljava/lang/Class<*>;
 value
  ()Ljava/lang/String;
  ()Ljava/lang/String;
diff --git a/...rc/main/resources/org/springframework/test/context/bean/override/mockito/MockitoBeans.eea b/...rc/main/resources/org/springframework/test/context/bean/override/mockito/MockitoBeans.eea
@@ -0,0 +1,5 @@
+class org/springframework/test/context/bean/override/mockito/MockitoBeans
+
+value
+ ()[Lorg/springframework/test/context/bean/override/mockito/MockitoBean;
+ ()[Lorg/springframework/test/context/bean/override/mockito/MockitoBean;
diff --git a/libs/eea-spring-6/src/main/resources/org/springframework/test/http/HttpHeadersAssert.eea b/libs/eea-spring-6/src/main/resources/org/springframework/test/http/HttpHeadersAssert.eea
@@ -16,6 +16,9 @@ containsHeaders
 doesNotContainHeader
  (Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;
  (Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;
+doesNotContainHeaders
+ ([Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;
+ ([Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;
 doesNotContainsHeaders
  ([Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;
  ([Ljava/lang/String;)Lorg/springframework/test/http/HttpHeadersAssert;

diff --git a/...ng-6/src/main/resources/org/springframework/web/client/ExtractingResponseErrorHandler.eea b/...ng-6/src/main/resources/org/springframework/web/client/ExtractingResponseErrorHandler.eea
@@ -3,9 +3,6 @@ class org/springframework/web/client/ExtractingResponseErrorHandler
 <init>
  (Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;)V
  (Ljava/util/List<Lorg/springframework/http/converter/HttpMessageConverter<*>;>;)V
-handleError
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpResponse;)V
- (Ljava/net/URI;Lorg/springframework/http/HttpMethod;Lorg/springframework/http/client/ClientHttpResponse;)V
 handleError
  (Lorg/springframework/http/client/ClientHttpResponse;Lorg/springframework/http/HttpStatusCode;Ljava/net/URI;Lorg/springframework/http/HttpMethod;)V
  (Lorg/springframework/http/client/ClientHttpResponse;Lorg/springframework/http/HttpStatusCode;Ljava/net/URI;Lorg/springframework/http/HttpMethod;)V

diff --git a/...a-spring-6/src/main/resources/org/springframework/web/client/NoOpResponseErrorHandler.eea b/...a-spring-6/src/main/resources/org/springframework/web/client/NoOpResponseErrorHandler.eea
@@ -1,8 +1,5 @@
 class org/springframework/web/client/NoOpResponseErrorHandler
 
-handleError
- (Lorg/springframework/http/client/ClientHttpResponse;)V
- (Lorg/springframework/http/client/ClientHttpResponse;)V
 hasError
  (Lorg/springframework/http/client/ClientHttpResponse;)Z
  (Lorg/springframework/http/client/ClientHttpResponse;)Z