diff options
author | gjoranv <gv@verizonmedia.com> | 2021-04-02 22:48:04 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-04-02 22:48:46 +0200 |
commit | 6038180cd42e63cd58db1731696557b8a86e49ed (patch) | |
tree | ae0748fa20be0cf936dcc96593b5eaec19ac9e3b /bundle-plugin | |
parent | ba26c2780a7fa6d05cfbdf3bdd2d55381b669a1e (diff) |
Allow container-disc to embed the 'component' artifact
.. to allow deploying it as part of container-disc, instead of a
separate bundle.
Diffstat (limited to 'bundle-plugin')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 9 |
1 files changed, 7 insertions, 2 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 31c8049b0dd..63b3ceb669b 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 @@ -61,12 +61,13 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { public void execute() throws MojoExecutionException { try { - if (discPreInstallBundle != null && !buildLegacyVespaPlatformBundle) + 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()); - warnIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude()); + if (! isContainerDiscArtifact(project.getArtifact())) + warnIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude()); List<Export> exportedPackagesFromProvidedJars = exportedPackagesAggregated( artifactSet.getJarArtifactsProvided().stream().map(Artifact::getFile).collect(Collectors.toList())); @@ -204,6 +205,10 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { return a.getArtifactId().equals("component") && a.getGroupId().equals("com.yahoo.vespa"); } + private boolean isContainerDiscArtifact(Artifact a) { + return a.getArtifactId().equals("container-disc") && a.getGroupId().equals("com.yahoo.vespa"); + } + private PackageTally getProjectClassesTally() { File outputDirectory = new File(project.getBuild().getOutputDirectory()); |