summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java6
-rw-r--r--parent/pom.xml2
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>