diff options
| author | gjoranv <gv@yahoo-inc.com> | 2016-06-17 14:38:25 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2016-06-21 00:32:08 +0200 |
| commit | ab6fc061e9c01fd2b4a2d96b68021fad1adc525e (patch) | |
| tree | 5ac216c4c15dbf7969270c3b29df05ea6e6bba98 | |
| parent | dd5de94a49973bd6a8aa45c3699fdb5f13efa468 (diff) | |
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
| -rw-r--r-- | container-dev/pom.xml | 5 | ||||
| -rw-r--r-- | container-disc/pom.xml | 8 | ||||
| -rw-r--r-- | container-search-and-docproc/pom.xml | 8 | ||||
| -rw-r--r-- | 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 ca21d564ed4..22cc10d36e4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -118,5 +118,10 @@ <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 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, diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 8c567c189ac..36a5cc0c586 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -82,10 +82,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>jrt</artifactId> </exclusion> - <exclusion> - <groupId>com.yahoo.vespa</groupId> - <artifactId>searchlib</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -122,10 +118,6 @@ <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 eaab9079b89..933d1128e01 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -106,6 +106,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>searchlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |