diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-07-17 10:43:01 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-07-17 10:43:01 +0200 |
| commit | ee08f237358d95fb5f9aaa7b04b9b00065a922fd (patch) | |
| tree | e85a420180b5fb79b7d0c35e12f20b8df3e0ca85 | |
| parent | cab5e80ae606d84d34061885cc74663e925e2950 (diff) | |
Allow 'discPreinstallBundle' per module, not in parent.
- New Vespa bundles should not preinstall other bundles from disk.
| -rw-r--r-- | container-disc/pom.xml | 3 | ||||
| -rw-r--r-- | jdisc_http_service/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 1 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 48872d0665b..1caf66e29dc 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -181,7 +181,8 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass> + <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass> + <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> <!-- Vespa bundles --> config-bundle-jar-with-dependencies.jar, diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index bd8c77bc9cc..b140e66f28a 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -140,6 +140,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> + <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> javax.servlet-api-3.1.0.jar, jetty-continuation-${jetty.version}.jar, diff --git a/parent/pom.xml b/parent/pom.xml index 8460611183a..ce40eb464fc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -255,7 +255,6 @@ <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> <configuration> - <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <configGenVersion>${project.version}</configGenVersion> <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index b9062b9284c..479a76e2fc6 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -81,6 +81,7 @@ <extensions>true</extensions> <configuration> <discApplicationClass>com.yahoo.container.standalone.StandaloneContainerApplication</discApplicationClass> + <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> configdefinitions-jar-with-dependencies.jar, config-provisioning-jar-with-dependencies.jar, |