diff options
| -rw-r--r-- | container-core/pom.xml | 1 | ||||
| -rw-r--r-- | container-di/pom.xml | 1 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 9 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 3 |
5 files changed, 12 insertions, 3 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index e9b2d18628d..650c5e87074 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -144,6 +144,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/container-di/pom.xml b/container-di/pom.xml index f78cae8f434..0cab901ab9f 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -73,6 +73,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f320eb371bb..b94b626da73 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -94,6 +94,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 315a46a65c4..7bd1a54d330 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -121,7 +121,13 @@ <scope>compile</scope> </dependency> <dependency> - <!-- This seems odd. Used for export-package parsing. Lazy stuff. Should be separated out. --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <!-- Used for export-package parsing. Ideally, that should have been a separate artifact. --> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> @@ -206,6 +212,7 @@ <argument>${project.build.directory}/dependency/log4j-over-slf4j.jar</argument> <argument>${project.build.directory}/dependency/config-lib.jar</argument> <argument>${project.build.directory}/dependency/yolean.jar</argument> + <argument>${project.build.directory}/dependency/vespajlib.jar</argument> </arguments> </configuration> </execution> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index eb5665760c4..b211d196160 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -85,8 +85,7 @@ 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, - vespajlib.jar + container-disc-jar-with-dependencies.jar </discPreInstallBundle> <bundleActivator>com.yahoo.container.standalone.StandaloneContainerActivator</bundleActivator> <jdiscPrivilegedActivator>true</jdiscPrivilegedActivator> |