diff options
author | gjoranv <gv@yahooinc.com> | 2023-06-02 17:49:19 +0200 |
---|---|---|
committer | gjoranv <gv@yahooinc.com> | 2023-06-02 17:49:19 +0200 |
commit | dba3bd1dfedd62cec24c4fd5ba3984c2e81a468f (patch) | |
tree | 309786258d408e90e68c352f99bff2c07c1ce92b /bundle-plugin | |
parent | f9b4d126fb1b812051323a63cc750bf1748dd94f (diff) |
bugfix: use effectiveBundleType everywhere.
Diffstat (limited to 'bundle-plugin')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 4 |
1 files changed, 2 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 fdf05d088c5..f7cdd325f69 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 @@ -153,12 +153,12 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { } private void addManifestPropertiesForUserBundles(Map<String, String> manifestContent, List<String> nonPublicApiUsed) { - if (bundleType != BundleType.USER) return; + if (effectiveBundleType() != BundleType.USER) return; addIfNotEmpty(manifestContent, "X-JDisc-Non-PublicApi-Import-Package", String.join(",", nonPublicApiUsed)); } private void logNonPublicApiUsage(List<String> nonPublicApiUsed) { - if (bundleType != BundleType.USER || nonPublicApiUsed.isEmpty()) return; + if (effectiveBundleType() != BundleType.USER || nonPublicApiUsed.isEmpty()) return; warnOrThrow("This project uses packages that are not part of Vespa's public api: %s".formatted(nonPublicApiUsed)); } |