diff options
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 6 | ||||
| -rw-r--r-- | parent/pom.xml | 1 |
2 files changed, 7 insertions, 0 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 d5aaa5888b2..be71c9c149f 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 @@ -55,8 +55,14 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { @Parameter(alias = "Main-Class") private String mainClass = null; + @Parameter(defaultValue = "false") + private boolean buildVespaPlatformBundle; + public void execute() throws MojoExecutionException { try { + if (discPreInstallBundle != null && ! buildVespaPlatformBundle) + throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by Vespa platform bundles."); + Artifacts.ArtifactSet artifactSet = Artifacts.getArtifacts(project); warnOnUnsupportedArtifacts(artifactSet.getNonJarArtifacts()); warnIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude()); diff --git a/parent/pom.xml b/parent/pom.xml index ce40eb464fc..a77750b9132 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -255,6 +255,7 @@ <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> <configuration> + <buildVespaPlatformBundle>true</buildVespaPlatformBundle> <configGenVersion>${project.version}</configGenVersion> <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> |