1 files changed, 9 insertions, 5 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 dcca60e1be8..c86d5bda800 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
@@ -134,14 +134,18 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
 
             logOverlappingPackages(projectPackages, exportedPackagesFromProvidedDeps);
 
-            Map<String, Import> calculatedImports = calculateImports(includedPackages.referencedPackages(),
-                                                                     includedPackages.definedPackages(),
-                                                                     exportsByPackageName(exportedPackagesFromProvidedJars));
+            Map<String, Export> exportedPackagesByName = exportsByPackageName(exportedPackagesFromProvidedJars);
 
-            List<String> nonPublicApiUsed = disallowedImports(calculatedImports, nonPublicApiPackagesFromProvidedJars);
+            Map<String, Import> importsForProjectPackages = calculateImports(projectPackages.referencedPackages(),
+                                                                             includedPackages.definedPackages(),
+                                                                             exportedPackagesByName);
+            List<String> nonPublicApiUsed = disallowedImports(importsForProjectPackages, nonPublicApiPackagesFromProvidedJars);
             logNonPublicApiUsage(nonPublicApiUsed);
 
-            Map<String, String> manifestContent = generateManifestContent(artifactsToInclude, calculatedImports, includedPackages);
+            Map<String, Import> importsForIncludedPackages = calculateImports(includedPackages.referencedPackages(),
+                                                                     includedPackages.definedPackages(),
+                                                                     exportedPackagesByName);
+            Map<String, String> manifestContent = generateManifestContent(artifactsToInclude, importsForIncludedPackages, includedPackages);
             addAdditionalManifestProperties(manifestContent);
             addManifestPropertiesForInternalAndCoreBundles(manifestContent, includedPackages, providedJarArtifacts);
             addManifestPropertiesForUserBundles(manifestContent, providedJarArtifacts, nonPublicApiUsed);