Skip to content

Commit f54d4b3

Browse files
committed
Move to SNAPSHOTs
* Downgrade to Micrometer-1.10.0 * Updates according compatibility with the latest SF changes
1 parent 4b57363 commit f54d4b3

File tree

4 files changed

+16
-25
lines changed

4 files changed

+16
-25
lines changed

build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ext {
8383
lettuceVersion = '6.1.8.RELEASE'
8484
log4jVersion = '2.17.2'
8585
mailVersion = '2.0.1'
86-
micrometerVersion = '2.0.0-SNAPSHOT'
86+
micrometerVersion = '1.10.0-SNAPSHOT'
8787
mockitoVersion = '4.4.0'
8888
mongoDriverVersion = '4.5.0'
8989
mysqlVersion = '8.0.28'
@@ -97,14 +97,14 @@ ext {
9797
saajVersion = '2.0.1'
9898
servletApiVersion = '5.0.0'
9999
smackVersion = '4.4.5'
100-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M2'
101-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M3'
102-
springGraphqlVersion = '1.0.0-M6'
103-
springKafkaVersion = '3.0.0-M3'
104-
springRetryVersion = '1.3.2'
105-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M3'
106-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M3'
107-
springWsVersion = '4.0.0-M2'
100+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
101+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
102+
springGraphqlVersion = '1.0.0-SNAPSHOT'
103+
springKafkaVersion = '3.0.0-SNAPSHOT'
104+
springRetryVersion = '1.3.3-SNAPSHOT'
105+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
106+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
107+
springWsVersion = '4.0.0-SNAPSHOT'
108108
testcontainersVersion = '1.16.3'
109109
tomcatVersion = '10.0.18'
110110
xmlUnitVersion = '2.9.0'

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

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public HttpStatus getStatusCode() {
144144
public void close() {
145145
}
146146

147+
@Deprecated
147148
public int getRawStatusCode() {
148149
return 200;
149150
}

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

+3-13
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ private HttpHeaders setUpMocksToCaptureSentHeaders(RestTemplate restTemplate) th
881881
when(requestFactory.createRequest(any(URI.class), any(HttpMethod.class))).thenReturn(clientRequest);
882882

883883
ClientHttpResponse response = mock(ClientHttpResponse.class);
884-
when(response.getRawStatusCode()).thenReturn(HttpStatus.NOT_FOUND.value());
884+
when(response.getStatusCode()).thenReturn(HttpStatus.NOT_FOUND);
885885
when(response.getStatusText()).thenReturn("Not Found");
886886
when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
887887

@@ -895,21 +895,11 @@ private HttpHeaders setUpMocksToCaptureSentHeaders(RestTemplate restTemplate) th
895895
return headers;
896896
}
897897

898-
public static class City {
899-
900-
private final String name;
901-
902-
public City(String name) {
903-
this.name = name;
904-
}
905-
906-
public String getName() {
907-
return this.name;
908-
}
898+
public record City(String name) {
909899

910900
@Override
911901
public String toString() {
912-
return name;
902+
return this.name;
913903
}
914904

915905
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2021 the original author or authors.
2+
* Copyright 2017-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
2727
import org.springframework.expression.common.LiteralExpression;
2828
import org.springframework.http.HttpEntity;
2929
import org.springframework.http.HttpMethod;
30-
import org.springframework.http.HttpStatus;
30+
import org.springframework.http.HttpStatusCode;
3131
import org.springframework.http.MediaType;
3232
import org.springframework.http.ReactiveHttpInputMessage;
3333
import org.springframework.http.ResponseEntity;
@@ -303,7 +303,7 @@ private Mono<ResponseEntity<Flux<Object>>> exchangeForResponseMono(WebClient.Req
303303
Object expectedResponseType) {
304304

305305
return requestSpec.retrieve()
306-
.onStatus(HttpStatus::isError, ClientResponse::createException)
306+
.onStatus(HttpStatusCode::isError, ClientResponse::createException)
307307
.toEntityFlux(createBodyExtractor(expectedResponseType));
308308
}
309309

0 commit comments

Comments
 (0)