Skip to content

Commit 28471c3

Browse files
committed
Merge branch '6.2.x'
# Conflicts: # framework-platform/framework-platform.gradle # spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java # spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java
2 parents bb88ec9 + 0fc043f commit 28471c3

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

framework-platform/framework-platform.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ dependencies {
139139
api("org.quartz-scheduler:quartz:2.3.2")
140140
api("org.reactivestreams:reactive-streams:1.0.4")
141141
api("org.seleniumhq.selenium:htmlunit3-driver:4.33.0")
142-
api("org.seleniumhq.selenium:selenium-java:4.33.0")
142+
api("org.seleniumhq.selenium:selenium-java:4.34.0")
143143
api("org.skyscreamer:jsonassert:2.0-rc1")
144144
api("org.testng:testng:7.11.0")
145145
api("org.webjars:underscorejs:1.8.3")
146146
api("org.webjars:webjars-locator-lite:1.1.0")
147-
api("org.xmlunit:xmlunit-assertj:2.10.0")
148-
api("org.xmlunit:xmlunit-matchers:2.10.0")
147+
api("org.xmlunit:xmlunit-assertj:2.10.3")
148+
api("org.xmlunit:xmlunit-matchers:2.10.3")
149149
api("org.yaml:snakeyaml:2.4")
150150
}
151151
}

spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ else if (statusCode instanceof HttpStatus status) {
197197
return HTTP_OUTCOME_UNKNOWN;
198198
}
199199
}
200-
201200
}
202201

203202
}

spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ else if (statusCode instanceof HttpStatus status) {
195195
return HTTP_OUTCOME_UNKNOWN;
196196
}
197197
}
198-
199198
}
200199

201200
}

0 commit comments

Comments
 (0)