aboutsummaryrefslogtreecommitdiffstats
path: root/bundle-plugin
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-07-16 15:45:05 +0200
committergjoranv <gv@verizonmedia.com>2019-07-16 15:45:05 +0200
commite2ec698ed521e7d80b71f46bbfe59c629053b510 (patch)
treea77605007bdca3d80fb97e9382184f6d18b7cadc /bundle-plugin
parent0333fbd85dc36288011a91002d02aff60ba52aa6 (diff)
Remove unnecessary set of packages.
Diffstat (limited to 'bundle-plugin')
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java8
1 files changed, 2 insertions, 6 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 e26412483d5..e8d3ffd1d9f 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
@@ -107,11 +107,7 @@ public class GenerateOsgiManifestMojo extends AbstractMojo {
// The union of packages in the bundle's project and its compile scoped jars.
PackageTally pluginPackageTally = projectPackageTally.combine(includedJarPackageTally);
- // TODO: isn't 'definedPackages' the same as pluginPackageTally.definedPackages()?
- Set<String> definedPackages = new HashSet<>(projectPackageTally.definedPackages());
- definedPackages.addAll(includedJarPackageTally.definedPackages());
-
- warnIfPackagesDefinedOverlapsGlobalPackages(definedPackages, publicPackagesFromProvidedJars.globals);
+ warnIfPackagesDefinedOverlapsGlobalPackages(pluginPackageTally.definedPackages(), publicPackagesFromProvidedJars.globals);
if (getLog().isDebugEnabled()) {
getLog().debug("Referenced packages = " + pluginPackageTally.referencedPackages());
@@ -132,7 +128,7 @@ public class GenerateOsgiManifestMojo extends AbstractMojo {
artifactSet.getJarArtifactsToInclude(), manualImports, calculatedImports.values(), pluginPackageTally));
} catch (Exception e) {
- throw new MojoExecutionException("Failed generating osgi manifest.", e);
+ throw new MojoExecutionException("Failed generating osgi manifest", e);
}
}