root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Juergen Hoeller 2025-07-15 21:26:38 +02:00
parent bb88ec9ea5 0fc043f762
commit 28471c33ae
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework-platform/framework-platform.gradle
View File

@ -139,13 +139,13 @@ dependencies {
api("org.quartz-scheduler:quartz:2.3.2")
api("org.reactivestreams:reactive-streams:1.0.4")
api("org.seleniumhq.selenium:htmlunit3-driver:4.33.0")
api("org.seleniumhq.selenium:selenium-java:4.33.0")
api("org.seleniumhq.selenium:selenium-java:4.34.0")
api("org.skyscreamer:jsonassert:2.0-rc1")
api("org.testng:testng:7.11.0")
api("org.webjars:underscorejs:1.8.3")
api("org.webjars:webjars-locator-lite:1.1.0")
api("org.xmlunit:xmlunit-assertj:2.10.0")
api("org.xmlunit:xmlunit-matchers:2.10.0")
api("org.xmlunit:xmlunit-assertj:2.10.3")
api("org.xmlunit:xmlunit-matchers:2.10.3")
api("org.yaml:snakeyaml:2.4")
}
}

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

@ -197,7 +197,6 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
return HTTP_OUTCOME_UNKNOWN;
}
}
}
}

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

@ -195,7 +195,6 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
return HTTP_OUTCOME_UNKNOWN;
}
}
}
}