Install searchlib as a bundle

.. instead of embedding into the container-disc bundle

* Add searchlib as a direct dependency of container-dev, as it
  was until now pulled in via container-search

* Remove invalid exclusions of searchlib
  - it's not pulled in transitively anymore, as it's been set to
    provided scope in container-search and container-disc

1 files changed, 5 insertions, 3 deletions

diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index b94b626da73..a6a6c78a662 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -118,6 +118,7 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>searchlib</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>com.yahoo.vespa</groupId>
@@ -155,17 +156,18 @@
           <Bundle-Activator>com.yahoo.container.jdisc.osgi.ContainerBundleActivator</Bundle-Activator>
           <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass>
             <discPreInstallBundle>
+                component-jar-with-dependencies.jar,
                 config-bundle-jar-with-dependencies.jar,
                 configdefinitions-jar-with-dependencies.jar,
                 container-jersey2-jar-with-dependencies.jar,
                 container-search-and-docproc-jar-with-dependencies.jar,
+                defaults-jar-with-dependencies.jar,
                 docprocs-jar-with-dependencies.jar,
                 jdisc_http_service-jar-with-dependencies.jar,
                 persistence-jar-with-dependencies.jar,
-                vespaclient-container-plugin-jar-with-dependencies.jar,
+                searchlib-jar-with-dependencies.jar,
                 simplemetrics-jar-with-dependencies.jar,
-                defaults-jar-with-dependencies.jar,
-                component-jar-with-dependencies.jar,
+                vespaclient-container-plugin-jar-with-dependencies.jar,
                 <!-- jersey2 -->
                 aopalliance-repackaged-2.3.0-b05.jar,
                 hk2-api-2.3.0-b05.jar,