From 86229e02031e67e9a8f11d8c6dcbcaea844d6cf7 Mon Sep 17 00:00:00 2001
From: gjoranv <gjoranv@gmail.com>
Date: Tue, 21 Jun 2016 13:56:18 +0200
Subject: Revert "Install searchlib as a bundle"

---
 container-dev/pom.xml                | 5 -----
 container-disc/pom.xml               | 8 +++-----
 container-search-and-docproc/pom.xml | 8 ++++++++
 container-search/pom.xml             | 1 -
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 22cc10d36e4..ca21d564ed4 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -118,10 +118,5 @@
       <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>searchlib</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index a6a6c78a662..b94b626da73 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -118,7 +118,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>searchlib</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>com.yahoo.vespa</groupId>
@@ -156,18 +155,17 @@
           <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,
-                searchlib-jar-with-dependencies.jar,
-                simplemetrics-jar-with-dependencies.jar,
                 vespaclient-container-plugin-jar-with-dependencies.jar,
+                simplemetrics-jar-with-dependencies.jar,
+                defaults-jar-with-dependencies.jar,
+                component-jar-with-dependencies.jar,
                 <!-- jersey2 -->
                 aopalliance-repackaged-2.3.0-b05.jar,
                 hk2-api-2.3.0-b05.jar,
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index 36a5cc0c586..8c567c189ac 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -82,6 +82,10 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>jrt</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>searchlib</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -118,6 +122,10 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>jrt</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>searchlib</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/container-search/pom.xml b/container-search/pom.xml
index 933d1128e01..eaab9079b89 100644
--- a/container-search/pom.xml
+++ b/container-search/pom.xml
@@ -106,7 +106,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>searchlib</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-- 
cgit v1.2.3