diff options
author | gjoranv <gjoranv@gmail.com> | 2016-06-21 13:56:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-21 13:56:18 +0200 |
commit | 86229e02031e67e9a8f11d8c6dcbcaea844d6cf7 (patch) | |
tree | 0e7ccbf356764eb6fae97efe69b7515a667fcaa1 /container-disc/pom.xml | |
parent | 268a3bf232c29eecfbb0131a07e1a7398f2cf2d1 (diff) |
Revert "Install searchlib as a bundle"
Diffstat (limited to 'container-disc/pom.xml')
-rw-r--r-- | container-disc/pom.xml | 8 |
1 files changed, 3 insertions, 5 deletions
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, |