80 files changed, 38 insertions, 302 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b4a87aa39c..059851205cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src)
 add_subdirectory(application-model)
 add_subdirectory(application-preprocessor)
 add_subdirectory(athenz-identity-provider-service)
-add_subdirectory(component)
 add_subdirectory(config-bundle)
 add_subdirectory(config-model)
 add_subdirectory(config-model-api)
@@ -60,7 +59,6 @@ add_subdirectory(configserver)
 add_subdirectory(configserver-flags)
 add_subdirectory(configutil)
 add_subdirectory(container-core)
-add_subdirectory(container-di)
 add_subdirectory(container-disc)
 add_subdirectory(container-jersey2)
 add_subdirectory(container-messagebus)
diff --git a/Code-map.md b/Code-map.md
index a02b52c76a8..fd5a583bc79 100644
--- a/Code-map.md
+++ b/Code-map.md
@@ -44,9 +44,8 @@ jDisc core modules:
 jDisc container modules, layered on jDisc core:
 
 - [container-disc](https://github.com/vespa-engine/vespa/tree/master/container-disc) - integration between the jDisc container and jDisc core layers.
-- [container-core](https://github.com/vespa-engine/vespa/tree/master/container-core) - core jDisc container functionality: Metrics, OSGi integration for component bundles, HTTP connector, etc.
+- [container-core](https://github.com/vespa-engine/vespa/tree/master/container-core) - core jDisc container functionality: Metrics, OSGi integration for component bundles, dependency injection, HTTP connector, etc.
 - [component](https://github.com/vespa-engine/vespa/tree/master/component) - the component model. Components (in Java) will implement or subclass a type for this module.
-- [container-di](https://github.com/vespa-engine/vespa/tree/master/container-di) - component dependency injection framework for the container, compatible with Guice annotations but an separate implementation which handles injection of config and injection of component collections.
 
 Search container, layered on jDisc container:
 
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index 31c8049b0dd..e1d199c4c9b 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -61,12 +61,13 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
 
     public void execute() throws MojoExecutionException {
         try {
-            if (discPreInstallBundle != null && !buildLegacyVespaPlatformBundle)
+            if (discPreInstallBundle != null && ! buildLegacyVespaPlatformBundle)
                 throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by legacy Vespa platform bundles.");
 
             Artifacts.ArtifactSet artifactSet = Artifacts.getArtifacts(project);
             warnOnUnsupportedArtifacts(artifactSet.getNonJarArtifacts());
-            warnIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude());
+            if (! isContainerDiscArtifact(project.getArtifact()))
+                throwIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude());
 
             List<Export> exportedPackagesFromProvidedJars = exportedPackagesAggregated(
                     artifactSet.getJarArtifactsProvided().stream().map(Artifact::getFile).collect(Collectors.toList()));
@@ -188,7 +189,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
                         artifact.getId(), artifact.getType())));
     }
 
-    private void warnIfInternalContainerArtifactsAreIncluded(Collection<Artifact> includedArtifacts) throws MojoExecutionException {
+    private void throwIfInternalContainerArtifactsAreIncluded(Collection<Artifact> includedArtifacts) throws MojoExecutionException {
         /* In most cases it's sufficient to test for 'component', as it's the lowest level container artifact,
          * Embedding container artifacts will cause class loading issues at runtime, because the classes will
          * not be equal to those seen by the framework (e.g. AbstractComponent). */
@@ -204,6 +205,10 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
         return a.getArtifactId().equals("component") && a.getGroupId().equals("com.yahoo.vespa");
     }
 
+    private boolean isContainerDiscArtifact(Artifact a) {
+        return a.getArtifactId().equals("container-disc") && a.getGroupId().equals("com.yahoo.vespa");
+    }
+
     private PackageTally getProjectClassesTally() {
         File outputDirectory = new File(project.getBuild().getOutputDirectory());
 
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 25350957a34..4a1c2a47a07 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -151,7 +151,6 @@
                                         <include>com.yahoo.vespa:configgen:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-core:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-dev:*:jar:provided</include>
-                                        <include>com.yahoo.vespa:container-di:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-disc:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-documentapi:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-jersey2:*:jar:provided</include>
diff --git a/component/CMakeLists.txt b/component/CMakeLists.txt
deleted file mode 100644
index 87d0a4989ba..00000000000
--- a/component/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(component)
diff --git a/component/abi-spec.json b/component/abi-spec.json
index 2dfa3e0d71d..0e33fde3c5a 100644
--- a/component/abi-spec.json
+++ b/component/abi-spec.json
@@ -348,5 +348,20 @@
       "public bridge synthetic java.lang.Object clone()"
     ],
     "fields": []
+  },
+  "com.yahoo.container.di.componentgraph.Provider": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.component.Deconstructable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.Object get()"
+    ],
+    "fields": []
   }
 }
\ No newline at end of file
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java b/component/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
index 3fd3195e5dd..3fd3195e5dd 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
+++ b/component/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
diff --git a/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java b/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java
new file mode 100644
index 00000000000..054abe9cff9
--- /dev/null
+++ b/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java
@@ -0,0 +1,12 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+/**
+ * Note that this package also exists in another Vespa module, for historical
+ * reasons. All Java classes should be kept in this module, and the other
+ * module's package should remain empty.
+ */
+@ExportPackage
+@PublicApi
+package com.yahoo.container.di.componentgraph;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 8334dcf1f60..d0460578b25 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -24,11 +24,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -149,16 +144,6 @@
       <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <!-- TODO Vespa 8: stop providing org.json:json -->
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
@@ -328,17 +313,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>com.yahoo.vespa</groupId>
         <artifactId>config-class-plugin</artifactId>
         <version>${project.version}</version>
diff --git a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java b/container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
index 0fb8a99a957..0fb8a99a957 100644
--- a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
+++ b/container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
diff --git a/container-di/src/main/java/com/yahoo/container/bundle/MockBundle.java b/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java
index a6524b41886..a6524b41886 100644
--- a/container-di/src/main/java/com/yahoo/container/bundle/MockBundle.java
+++ b/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java
diff --git a/container-di/src/main/java/com/yahoo/container/bundle/package-info.java b/container-core/src/main/java/com/yahoo/container/bundle/package-info.java
index c9707371626..c9707371626 100644
--- a/container-di/src/main/java/com/yahoo/container/bundle/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/bundle/package-info.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
index 065733a719a..065733a719a 100644
--- a/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java b/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
index 4e3881a6fe6..4e3881a6fe6 100644
--- a/container-di/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
+++ b/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java
index a7ff6c46a8b..a7ff6c46a8b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
+++ b/container-core/src/main/java/com/yahoo/container/di/ConfigRetriever.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java
index 82c7f65bc2a..82c7f65bc2a 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Container.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/Osgi.java b/container-core/src/main/java/com/yahoo/container/di/Osgi.java
index 940986e2f38..940986e2f38 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Osgi.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Osgi.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
index fef2809f236..fef2809f236 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index b6fa4241e26..b6fa4241e26 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
index 429052c0039..429052c0039 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Exceptions.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Exceptions.java
index b0d9d1f3921..b0d9d1f3921 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Exceptions.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Exceptions.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
index 61d0d9bba8d..61d0d9bba8d 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/GuiceNode.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/JerseyNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/JerseyNode.java
index 0f8aa678934..0f8aa678934 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/JerseyNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/JerseyNode.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java
index be80fc1616d..be80fc1616d 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
index 3afc8bb817c..3afc8bb817c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/package-info.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/package-info.java
index e9b5b14d5d8..e9b5b14d5d8 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/package-info.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index 327949bb8d0..327949bb8d0 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/Graph.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/Graph.java
index 946330668bd..946330668bd 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/Graph.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/Graph.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java b/container-core/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
index c88f851909c..c88f851909c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
+++ b/container-core/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java b/container-core/src/main/java/com/yahoo/container/di/config/RestApiContext.java
index bfb9a8f9160..bfb9a8f9160 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java
+++ b/container-core/src/main/java/com/yahoo/container/di/config/RestApiContext.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java b/container-core/src/main/java/com/yahoo/container/di/config/Subscriber.java
index 60207447bfd..60207447bfd 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java
+++ b/container-core/src/main/java/com/yahoo/container/di/config/Subscriber.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java b/container-core/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
index c1c36a1b3de..c1c36a1b3de 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/package-info.java b/container-core/src/main/java/com/yahoo/container/di/config/package-info.java
index b8f65b1c3c8..b8f65b1c3c8 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/di/config/package-info.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/osgi/BundleClasses.java b/container-core/src/main/java/com/yahoo/container/di/osgi/BundleClasses.java
index bca3ed73d0b..bca3ed73d0b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/osgi/BundleClasses.java
+++ b/container-core/src/main/java/com/yahoo/container/di/osgi/BundleClasses.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/osgi/OsgiUtil.java b/container-core/src/main/java/com/yahoo/container/di/osgi/OsgiUtil.java
index e1854155e5b..e1854155e5b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/osgi/OsgiUtil.java
+++ b/container-core/src/main/java/com/yahoo/container/di/osgi/OsgiUtil.java
diff --git a/container-di/src/main/java/com/yahoo/container/di/osgi/package-info.java b/container-core/src/main/java/com/yahoo/container/di/osgi/package-info.java
index 9685cf571bd..9685cf571bd 100644
--- a/container-di/src/main/java/com/yahoo/container/di/osgi/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/di/osgi/package-info.java
diff --git a/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java b/container-core/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java
index 8c501963db3..8c501963db3 100644
--- a/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java
+++ b/container-core/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java
diff --git a/container-di/src/main/java/com/yahoo/osgi/provider/model/package-info.java b/container-core/src/main/java/com/yahoo/osgi/provider/model/package-info.java
index f930f56ae4a..f930f56ae4a 100644
--- a/container-di/src/main/java/com/yahoo/osgi/provider/model/package-info.java
+++ b/container-core/src/main/java/com/yahoo/osgi/provider/model/package-info.java
diff --git a/container-di/src/main/resources/configdefinitions/application-bundles.def b/container-core/src/main/resources/configdefinitions/application-bundles.def
index 7e03b1e3ac8..7e03b1e3ac8 100644
--- a/container-di/src/main/resources/configdefinitions/application-bundles.def
+++ b/container-core/src/main/resources/configdefinitions/application-bundles.def
diff --git a/container-di/src/main/resources/configdefinitions/container.components.def b/container-core/src/main/resources/configdefinitions/container.components.def
index f27abc2fa5a..f27abc2fa5a 100644
--- a/container-di/src/main/resources/configdefinitions/container.components.def
+++ b/container-core/src/main/resources/configdefinitions/container.components.def
diff --git a/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def b/container-core/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def
index a226420274d..a226420274d 100644
--- a/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def
+++ b/container-core/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def
diff --git a/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def b/container-core/src/main/resources/configdefinitions/container.di.config.jersey-injection.def
index 9f5be59abbd..9f5be59abbd 100644
--- a/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def
+++ b/container-core/src/main/resources/configdefinitions/container.di.config.jersey-injection.def
diff --git a/container-di/src/main/resources/configdefinitions/platform-bundles.def b/container-core/src/main/resources/configdefinitions/platform-bundles.def
index a30a846b565..a30a846b565 100644
--- a/container-di/src/main/resources/configdefinitions/platform-bundles.def
+++ b/container-core/src/main/resources/configdefinitions/platform-bundles.def
diff --git a/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java b/container-core/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
index 6fe58e99fda..6fe58e99fda 100644
--- a/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
+++ b/container-core/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
diff --git a/container-di/src/test/java/com/yahoo/component/provider/test/ComponentRegistryTestCase.java b/container-core/src/test/java/com/yahoo/component/provider/test/ComponentRegistryTestCase.java
index 69eec95b746..69eec95b746 100644
--- a/container-di/src/test/java/com/yahoo/component/provider/test/ComponentRegistryTestCase.java
+++ b/container-core/src/test/java/com/yahoo/component/provider/test/ComponentRegistryTestCase.java
diff --git a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java b/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
index 0842ee4a797..0842ee4a797 100644
--- a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
+++ b/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java b/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
index 290836d7842..290836d7842 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
index b596246a43d..b596246a43d 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index 2106a1f3671..2106a1f3671 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/DirConfigSource.java b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java
index ec937a1a4ef..ec937a1a4ef 100644
--- a/container-di/src/test/java/com/yahoo/container/di/DirConfigSource.java
+++ b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
index 70dc4c8665c..70dc4c8665c 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/FallbackToGuiceInjectorTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/FallbackToGuiceInjectorTest.java
index 7c517d67960..7c517d67960 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/FallbackToGuiceInjectorTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/FallbackToGuiceInjectorTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java
index f30f9260830..f30f9260830 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
index e61e90cd718..e61e90cd718 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/cycle/CycleFinderTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/cycle/CycleFinderTest.java
index 174ca301c59..174ca301c59 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/cycle/CycleFinderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/cycle/CycleFinderTest.java
diff --git a/container-di/src/test/java/com/yahoo/container/di/componentgraph/cycle/GraphTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/cycle/GraphTest.java
index 069f72ad8e7..069f72ad8e7 100644
--- a/container-di/src/test/java/com/yahoo/container/di/componentgraph/cycle/GraphTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/cycle/GraphTest.java
diff --git a/container-di/src/test/vespa-configdef/config.di.int.def b/container-core/src/test/vespa-configdef/config.di.int.def
index a34539c4a0f..a34539c4a0f 100644
--- a/container-di/src/test/vespa-configdef/config.di.int.def
+++ b/container-core/src/test/vespa-configdef/config.di.int.def
diff --git a/container-di/src/test/vespa-configdef/config.di.string.def b/container-core/src/test/vespa-configdef/config.di.string.def
index 396afe54f3f..396afe54f3f 100644
--- a/container-di/src/test/vespa-configdef/config.di.string.def
+++ b/container-core/src/test/vespa-configdef/config.di.string.def
diff --git a/container-di/src/test/vespa-configdef/config.test.bootstrap1.def b/container-core/src/test/vespa-configdef/config.test.bootstrap1.def
index bdee16d99ea..bdee16d99ea 100644
--- a/container-di/src/test/vespa-configdef/config.test.bootstrap1.def
+++ b/container-core/src/test/vespa-configdef/config.test.bootstrap1.def
diff --git a/container-di/src/test/vespa-configdef/config.test.bootstrap2.def b/container-core/src/test/vespa-configdef/config.test.bootstrap2.def
index b4fbffd8ae6..b4fbffd8ae6 100644
--- a/container-di/src/test/vespa-configdef/config.test.bootstrap2.def
+++ b/container-core/src/test/vespa-configdef/config.test.bootstrap2.def
diff --git a/container-di/src/test/vespa-configdef/config.test.components1.def b/container-core/src/test/vespa-configdef/config.test.components1.def
index bdee16d99ea..bdee16d99ea 100644
--- a/container-di/src/test/vespa-configdef/config.test.components1.def
+++ b/container-core/src/test/vespa-configdef/config.test.components1.def
diff --git a/container-di/src/test/vespa-configdef/config.test.test.def b/container-core/src/test/vespa-configdef/config.test.test.def
index d3e0ed17748..d3e0ed17748 100644
--- a/container-di/src/test/vespa-configdef/config.test.test.def
+++ b/container-core/src/test/vespa-configdef/config.test.test.def
diff --git a/container-di/src/test/vespa-configdef/config.test.test2.def b/container-core/src/test/vespa-configdef/config.test.test2.def
index d3e0ed17748..d3e0ed17748 100644
--- a/container-di/src/test/vespa-configdef/config.test.test2.def
+++ b/container-core/src/test/vespa-configdef/config.test.test2.def
diff --git a/container-di/src/test/vespa-configdef/config.test.thread-pool.def b/container-core/src/test/vespa-configdef/config.test.thread-pool.def
index 9e6b6694e84..9e6b6694e84 100644
--- a/container-di/src/test/vespa-configdef/config.test.thread-pool.def
+++ b/container-core/src/test/vespa-configdef/config.test.thread-pool.def
diff --git a/container-di/.gitignore b/container-di/.gitignore
deleted file mode 100644
index 3cc25b51fc4..00000000000
--- a/container-di/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pom.xml.build
-/target
diff --git a/container-di/CMakeLists.txt b/container-di/CMakeLists.txt
deleted file mode 100644
index 7bb25e6a420..00000000000
--- a/container-di/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions()
diff --git a/container-di/OWNERS b/container-di/OWNERS
deleted file mode 100644
index 3b2ba1ede81..00000000000
--- a/container-di/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-gjoranv
diff --git a/container-di/README.md b/container-di/README.md
deleted file mode 100644
index 0eeb9d7280f..00000000000
--- a/container-di/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-# Container DI
-
-JDisc's dependency injection framework.
diff --git a/container-di/abi-spec.json b/container-di/abi-spec.json
deleted file mode 100644
index 02cc29cd07f..00000000000
--- a/container-di/abi-spec.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "com.yahoo.container.di.componentgraph.Provider": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.component.Deconstructable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.Object get()"
-    ],
-    "fields": []
-  }
-}
\ No newline at end of file
diff --git a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java b/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java
deleted file mode 100644
index bcdaff110e1..00000000000
--- a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.component;
-
-/**
- * @author baldersheim
- */
-public class ComponentIdBenchmark {
-    public void run() {
-         boolean result=true;
-         String strings[] = createStrings(1000);
-         // Warm-up
-         out("Warming up...");
-         for (int i=0; i<30*1000; i++)
-             result = result ^ createComponentId(strings);
-
-         long startTime=System.currentTimeMillis();
-         out("Running...");
-         for (int i=0; i<100*1000; i++)
-             result = result ^ createComponentId(strings);
-         out("Ignore this: " + result); // Make sure we are not fooled by optimization by creating an observable result
-         long endTime=System.currentTimeMillis();
-         out("Create anonymous component ids of 1000 strings 100.000 times took " + (endTime-startTime) + " ms");
-     }
-
-     private final String [] createStrings(int num) {
-         String strings [] = new String [num];
-         for(int i=0; i < strings.length; i++) {
-             strings[i] = "this.is.a.short.compound.name." + i;
-         }
-         return strings;
-     }
-
-     private final boolean createComponentId(String [] strings) {
-         boolean retval = true;
-         for (int i=0; i < strings.length; i++) {
-             ComponentId n = ComponentId.createAnonymousComponentId(strings[i]);
-             retval = retval ^ n.isAnonymous();
-         }
-         return retval;
-     }
-
-     private void out(String string) {
-         System.out.println(string);
-     }
-
-     public static void main(String[] args) {
-         new ComponentIdBenchmark().run();
-     }
-
-}
diff --git a/container-di/pom.xml b/container-di/pom.xml
deleted file mode 100644
index f0778f7d45e..00000000000
--- a/container-di/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>container-di</artifactId>
-  <version>7-SNAPSHOT</version>
-  <packaging>container-plugin</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-bundle</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <classifier>no_aop</classifier>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>component</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-      <plugins>
-        <plugin>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>bundle-plugin</artifactId>
-          <extensions>true</extensions>
-        </plugin>
-        <plugin>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>config-class-plugin</artifactId>
-          <version>${project.version}</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>config-gen</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>configgen-test-defs</id>
-              <phase>generate-test-sources</phase>
-              <goals>
-                <goal>config-gen</goal>
-              </goals>
-              <configuration>
-                <defFilesDirectories>src/test/vespa-configdef</defFilesDirectories>
-                <outputDirectory>target/generated-test-sources/vespa-configgen-plugin</outputDirectory>
-                <testConfig>true</testConfig>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <forkMode>once</forkMode>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>abi-check-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-        </plugin>
-      </plugins>
-  </build>
-</project>
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java
deleted file mode 100644
index 0c11cfb5ba4..00000000000
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-@PublicApi
-package com.yahoo.container.di.componentgraph;
-
-import com.yahoo.api.annotations.PublicApi;
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 15eb0328284..349d3f7bae1 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -56,7 +56,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>component</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -167,7 +166,6 @@
             <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
             <discPreInstallBundle>
                 <!-- Vespa bundles -->
-                component-jar-with-dependencies.jar,
                 configgen.jar,
                 config-bundle-jar-with-dependencies.jar,
                 configdefinitions-jar-with-dependencies.jar,
@@ -184,7 +182,6 @@
                 security-utils-jar-with-dependencies.jar,
                 simplemetrics-jar-with-dependencies.jar,
                 defaults-jar-with-dependencies.jar,
-                component-jar-with-dependencies.jar,
                 zkfacade-jar-with-dependencies.jar,
                 zookeeper-server-jar-with-dependencies.jar,
                 <!-- Jetty -->
diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml
index e94e2a46bba..8f24b5edcb7 100644
--- a/container-jersey2/pom.xml
+++ b/container-jersey2/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
+      <artifactId>container-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml
index f98607015f9..adaf64a0a03 100644
--- a/container-messagebus/pom.xml
+++ b/container-messagebus/pom.xml
@@ -60,12 +60,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/dist/vespa.spec b/dist/vespa.spec
index a14f3bb0037..0c51f9f0a93 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -625,7 +625,6 @@ fi
 %{_prefix}/lib/jars/aopalliance-repackaged-*.jar
 %{_prefix}/lib/jars/bcpkix-jdk15on-*.jar
 %{_prefix}/lib/jars/bcprov-jdk15on-*.jar
-%{_prefix}/lib/jars/component-jar-with-dependencies.jar
 %{_prefix}/lib/jars/config-bundle-jar-with-dependencies.jar
 %{_prefix}/lib/jars/configdefinitions-jar-with-dependencies.jar
 %{_prefix}/lib/jars/configgen.jar
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml
index e776aca271e..a7579aeb2ea 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -65,12 +65,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <!-- Not directly used in this module, but needed to get Import-Packages for JDK packages it exports. -->
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_core</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 4121467985c..a021454a049 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -8,45 +8,14 @@
     <version>7-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
-  <groupId>com.yahoo.vespa</groupId>
   <artifactId>metrics</artifactId>
   <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
   <name>metrics</name>
-  <description></description>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-bundle</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-core</artifactId>
+      <artifactId>config-lib</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 367a3901040..38fc8318b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@
         <module>container-dependencies-enforcer</module>
         <module>container-dependency-versions</module>
         <module>container-dev</module>
-        <module>container-di</module>
         <module>container-disc</module>
         <module>container-documentapi</module>
         <module>container-integration-test</module>
diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml
index 6ca02febefd..3e27ee4ffa3 100644
--- a/simplemetrics/pom.xml
+++ b/simplemetrics/pom.xml
@@ -49,12 +49,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-di</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>