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 | |
| 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.
| -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, 3 insertions, 12 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 650c5e87074..e9b2d18628d 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -144,7 +144,6 @@ <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 0cab901ab9f..f78cae8f434 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -73,7 +73,6 @@ <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 a6a6c78a662..6a74e1d2906 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -94,7 +94,6 @@ <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 7bd1a54d330..315a46a65c4 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -121,13 +121,7 @@ <scope>compile</scope> </dependency> <dependency> - <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. --> + <!-- This seems odd. Used for export-package parsing. Lazy stuff. Should be separated out. --> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> @@ -212,7 +206,6 @@ <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 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> |