diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-07-17 10:31:31 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-07-17 10:35:48 +0200 |
| commit | cab5e80ae606d84d34061885cc74663e925e2950 (patch) | |
| tree | cd9bd587962e92d3f50c6fe40710cff060575b6f | |
| parent | be3f7b4d605f598ab22885394f3d7472439cd1a9 (diff) | |
Emphasize that preinstalling bundles is a legacy thing.
- A bundle should depend on apis, not implementations, and definitely
not implementations on a specific location on local disk.
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 6 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java index 892eb9aac05..31c8049b0dd 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java @@ -57,12 +57,12 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { private String mainClass = null; @Parameter(defaultValue = "false") - private boolean buildVespaPlatformBundle; + private boolean buildLegacyVespaPlatformBundle; public void execute() throws MojoExecutionException { try { - if (discPreInstallBundle != null && ! buildVespaPlatformBundle) - throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by Vespa platform bundles."); + if (discPreInstallBundle != null && !buildLegacyVespaPlatformBundle) + throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by legacy Vespa platform bundles."); Artifacts.ArtifactSet artifactSet = Artifacts.getArtifacts(project); warnOnUnsupportedArtifacts(artifactSet.getNonJarArtifacts()); diff --git a/parent/pom.xml b/parent/pom.xml index a77750b9132..8460611183a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -255,7 +255,7 @@ <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> <configuration> - <buildVespaPlatformBundle>true</buildVespaPlatformBundle> + <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <configGenVersion>${project.version}</configGenVersion> <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> |