diff options
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 11 |
1 files changed, 7 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 c53c7f49b4a..2389849ad02 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 @@ -114,8 +114,8 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { logDebugPackageSets(publicPackagesFromProvidedJars, includedPackages); if (hasJdiscCoreProvided(artifactSet.getJarArtifactsProvided())) { - // If jdisc_core is not provided, log output may contain packages that _are_ available runtime. - logMissingPackages(publicPackagesFromProvidedJars, projectPackages, compileJarsPackages, includedPackages); + // jdisc_core being provided, guarantees that log output does not contain its exported packages + logMissingPackages(publicPackagesFromProvidedJars.exports, projectPackages, compileJarsPackages, includedPackages); } else { getLog().warn("This project does not have jdisc_core as provided dependency, so the " + "generated 'Import-Package' OSGi header may be missing important packages."); @@ -151,8 +151,11 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { return providedArtifacts.stream().anyMatch(artifact -> artifact.getArtifactId().equals("jdisc_core")); } - private void logMissingPackages(AnalyzeBundle.PublicPackages publicPackagesFromProvidedJars, PackageTally projectPackages, PackageTally compileJarPackages, PackageTally includedPackages) { - Set<String> exportedPackagesFromProvidedDeps = publicPackagesFromProvidedJars.exports + private void logMissingPackages(List<Export> exportedPackagesFromProvidedJars, + PackageTally projectPackages, + PackageTally compileJarPackages, + PackageTally includedPackages) { + Set<String> exportedPackagesFromProvidedDeps = exportedPackagesFromProvidedJars .stream() .map(Export::getPackageNames) .flatMap(Collection::stream) |