aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-12 15:25:47 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:21 +0200
commit5da809318217b36a990ec030145a547e9eebaef8 (patch)
treed73a72a18b18bb007b93738133e44ff3e75ba5f5 /jdisc_core
parent84e869333e0ab433d3fcfc91c2f0124991f1e586 (diff)
Upgrade to guice 4.2.3 and guava 27.1
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java
index 38d4c70646c..1cf4e3dd858 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java
@@ -153,7 +153,7 @@ public abstract class ServerProviderConformanceTest {
final Module... config)
throws Throwable {
runTest(adapter,
- Modules.override(Modules.combine()).with(newBindingSetSelector("unknown")),
+ Modules.override(Modules.EMPTY_MODULE).with(newBindingSetSelector("unknown")),
RequestType.WITHOUT_CONTENT,
new TestRequestHandler() {
@@ -170,7 +170,7 @@ public abstract class ServerProviderConformanceTest {
final Module... config)
throws Throwable {
runTest(adapter,
- Modules.override(Modules.combine()).with(newBindingSetSelector(null)),
+ Modules.override(Modules.EMPTY_MODULE).with(newBindingSetSelector(null)),
RequestType.WITHOUT_CONTENT,
new TestRequestHandler() {