summaryrefslogtreecommitdiffstats
path: root/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
diff options
context:
space:
mode:
Diffstat (limited to 'bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala')
-rw-r--r--bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
index d66edf88702..67ce45ed7c6 100644
--- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
+++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
@@ -210,7 +210,7 @@ class GenerateOsgiManifestMojo extends AbstractMojo {
private def analyzeProjectClasses() : PackageTally = {
val outputDirectory = new File(project.getBuild.getOutputDirectory)
- val analyzedClasses = allDescendantFiles(outputDirectory).filter(_.getName.endsWith(".class")).
+ val analyzedClasses = allDescendantFiles(outputDirectory).filter(file => isClassToAnalyze(file.getName)).
map(Analyze.analyzeClass)
PackageTally.fromAnalyzedClassFiles(analyzedClasses)
@@ -230,7 +230,7 @@ class GenerateOsgiManifestMojo extends AbstractMojo {
for {
entry <- toStream(jarFile.entries())
if !entry.isDirectory
- if entry.getName.endsWith(".class")
+ if isClassToAnalyze(entry.getName)
metaData = analyzeClass(jarFile, entry)
} yield metaData
@@ -278,6 +278,9 @@ object GenerateOsgiManifestMojo {
}
}
+ def isClassToAnalyze(name: String): Boolean =
+ name.endsWith(".class") && ! name.endsWith("module-info.class")
+
def emptyToNone(str: String) =
Option(str) map {_.trim} filterNot {_.isEmpty}
}