From 9ae1a720ecfe93eb62cc778f8a9259a98c6d8d2e Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahoo-inc.com>
Date: Tue, 21 Jun 2016 15:03:03 +0200
Subject: Bundle vespajlib into container-disc again.

- after briefly trying to include it in jdisc_core.
  This was abandoned because vespajlib leaks commons-lang
  packages from its apis.

This reverts commit a522b5ac3d26e8ae9619c1bf85aada0eb98edc33.
This reverts commit b644afac2ef70c622feafd43742fb70f31418237.
---
 standalone-container/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'standalone-container')

diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index b211d196160..eb5665760c4 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -85,7 +85,8 @@
             config-bundle-jar-with-dependencies.jar,
             config-model-api-jar-with-dependencies.jar,
             config-model-jar-with-dependencies.jar,
-            container-disc-jar-with-dependencies.jar
+            container-disc-jar-with-dependencies.jar,
+            vespajlib.jar
           </discPreInstallBundle>
           <bundleActivator>com.yahoo.container.standalone.StandaloneContainerActivator</bundleActivator>
           <jdiscPrivilegedActivator>true</jdiscPrivilegedActivator>
-- 
cgit v1.2.3