diff options
| author | gjoranv <gv@yahoo-inc.com> | 2016-06-21 15:03:03 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2016-06-21 15:05:49 +0200 |
| commit | 9ae1a720ecfe93eb62cc778f8a9259a98c6d8d2e (patch) | |
| tree | 6b3a371a602aea0738c852c9e640cb44d635407a /standalone-container | |
| parent | 442264894438a0c3dab500f1b1cb4a0596f9cca0 (diff) | |
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.
Diffstat (limited to 'standalone-container')
| -rw-r--r-- | standalone-container/pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
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> |