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

Move to SNAPSHOTs

Browse Source 
* Downgrade to Micrometer-1.10.0
* Updates according compatibility with the latest SF changes
This commit is contained in:
Artem Bilan
2022-04-14 12:27:46 -04:00
parent 4b57363a05
commit f54d4b3d75
4 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -83,7 +83,7 @@ ext {
lettuceVersion = '6.1.8.RELEASE'
log4jVersion = '2.17.2'
mailVersion = '2.0.1'
micrometerVersion = '2.0.0-SNAPSHOT'
micrometerVersion = '1.10.0-SNAPSHOT'
mockitoVersion = '4.4.0'
mongoDriverVersion = '4.5.0'
mysqlVersion = '8.0.28'
@@ -97,14 +97,14 @@ ext {
saajVersion = '2.0.1'
servletApiVersion = '5.0.0'
smackVersion = '4.4.5'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M2'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M3'
springGraphqlVersion = '1.0.0-M6'
springKafkaVersion = '3.0.0-M3'
springRetryVersion = '1.3.2'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M3'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M3'
springWsVersion = '4.0.0-M2'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
springGraphqlVersion = '1.0.0-SNAPSHOT'
springKafkaVersion = '3.0.0-SNAPSHOT'
springRetryVersion = '1.3.3-SNAPSHOT'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
springWsVersion = '4.0.0-SNAPSHOT'
testcontainersVersion = '1.16.3'
tomcatVersion = '10.0.18'
xmlUnitVersion = '2.9.0'

1
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java
View File

@@ -144,6 +144,7 @@ public class CookieTests {
public void close() {
}
@Deprecated
public int getRawStatusCode() {
return 200;
}

16
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java
View File

@@ -881,7 +881,7 @@ public class HttpRequestExecutingMessageHandlerTests {
when(requestFactory.createRequest(any(URI.class), any(HttpMethod.class))).thenReturn(clientRequest);
ClientHttpResponse response = mock(ClientHttpResponse.class);
when(response.getRawStatusCode()).thenReturn(HttpStatus.NOT_FOUND.value());
when(response.getStatusCode()).thenReturn(HttpStatus.NOT_FOUND);
when(response.getStatusText()).thenReturn("Not Found");
when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
@@ -895,21 +895,11 @@ public class HttpRequestExecutingMessageHandlerTests {
return headers;
}
public static class City {
private final String name;
public City(String name) {
this.name = name;
}
public String getName() {
return this.name;
}
public record City(String name) {
@Override
public String toString() {
return name;
return this.name;
}
}

6
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2021 the original author or authors.
* Copyright 2017-2022 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.
@@ -27,7 +27,7 @@ import org.springframework.expression.Expression;
import org.springframework.expression.common.LiteralExpression;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.http.ReactiveHttpInputMessage;
import org.springframework.http.ResponseEntity;
@@ -303,7 +303,7 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
Object expectedResponseType) {
return requestSpec.retrieve()
.onStatus(HttpStatus::isError, ClientResponse::createException)
.onStatus(HttpStatusCode::isError, ClientResponse::createException)
.toEntityFlux(createBodyExtractor(expectedResponseType));
}