diff options
| author | gjoranv <gv@yahooinc.com> | 2023-07-03 22:28:50 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahooinc.com> | 2023-07-03 22:37:54 +0200 |
| commit | 73dc0d31608a597685baf47e9b245f9d9422379c (patch) | |
| tree | 38a0980fbb812cf2336cfe70a336fa022a7901d9 /bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | |
| parent | 19cd09976f98ea9abda6738c378aa27ca623e11e (diff) | |
Rename function, Class-Path is no longer used
Diffstat (limited to 'bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java')
| -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 c524b233b73..304845d4dea 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 @@ -35,7 +35,7 @@ import static com.yahoo.container.plugin.osgi.ImportPackages.calculateImports; import static com.yahoo.container.plugin.util.Artifacts.VESPA_GROUP_ID; import static com.yahoo.container.plugin.util.Artifacts.getVespaArtifact; import static com.yahoo.container.plugin.util.Files.allDescendantFiles; -import static com.yahoo.container.plugin.util.JarFiles.providedArtifactsFromClassPath; +import static com.yahoo.container.plugin.util.JarFiles.providedArtifactsFromManifest; /** @@ -125,7 +125,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { // Having our wanted artifact as provided guarantees that log output does not contain its exported packages logMissingPackages(exportedPackagesFromProvidedDeps, projectPackages, compileJarsPackages, includedPackages); - logProvidedArtifactsIncluded(artifactsToInclude, providedArtifactsFromClassPath(wantedProvidedArtifact.get().getFile())); + logProvidedArtifactsIncluded(artifactsToInclude, providedArtifactsFromManifest(wantedProvidedArtifact.get().getFile())); } else if (! suppressWarningMissingImportPackages && jdisc_core.isEmpty()) { // TODO: Remove jdisc_core clause above and instead add suppressWarning to necessary vespa modules. warnOrThrow(("This project does not have '%s' as provided dependency, so the generated 'Import-Package' " + |