diff options
| author | Jo Kristian Bergum <bergum@yahoo-inc.com> | 2020-07-16 08:40:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 08:40:42 +0200 |
| commit | c608c8384315cebdc8adacb012a8c49a09cc0340 (patch) | |
| tree | a456fc74ed740d6c5c5fb6ed61f100c09c951c24 /container-di/src/test/java/com/yahoo/container/di/ContainerTest.java | |
| parent | 14c65de9b6b0d7a5dac17aa96109e125c14762b5 (diff) | |
| parent | 0355cb740fe498abc03861bcb64de5e418c2fa88 (diff) | |
Merge pull request #13901 from vespa-engine/revert-13898-load-platform-bundles-separately
Revert "Load platform bundles separately"
Diffstat (limited to 'container-di/src/test/java/com/yahoo/container/di/ContainerTest.java')
| -rw-r--r-- | container-di/src/test/java/com/yahoo/container/di/ContainerTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java index 19f277ff8fb..eac64c20274 100644 --- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java +++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java @@ -267,8 +267,7 @@ public class ContainerTest extends ContainerTestBase { "inject[0].forClass \"" + injectedClass.getName() + "\"\n"; dirConfigSource.writeConfig("components", componentsConfig); - dirConfigSource.writeConfig("platform-bundles", ""); - dirConfigSource.writeConfig("application-bundles", ""); + dirConfigSource.writeConfig("bundles", ""); dirConfigSource.writeConfig("jersey-bundles", "bundles[0].spec \"mock-entry-to-enforce-a-MockBundle\""); dirConfigSource.writeConfig("jersey-injection", injectionConfig); |