Revert "Load platform bundles separately"

2 files changed, 3 insertions, 5 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);
 
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index f1f3c4a2ae4..18236a6bde9 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
@@ -61,7 +61,7 @@ public class ContainerTestBase {
                         }
 
                         @Override
-                        public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) {
+                        public Set<Bundle> useBundles(Collection<FileReference> bundles) {
                             return emptySet();
                         }
 
@@ -81,8 +81,7 @@ public class ContainerTestBase {
     }
 
     protected void writeBootstrapConfigs(ComponentEntry... componentEntries) {
-        dirConfigSource.writeConfig("platform-bundles", "");
-        dirConfigSource.writeConfig("application-bundles", "");
+        dirConfigSource.writeConfig("bundles", "");
         StringBuilder components = new StringBuilder();
         for (int i = 0; i < componentEntries.length; i++) {
             components.append(componentEntries[i].asConfig(i));