FELIX-1501: use getProperty() instead of getProperties().getProperty() as the former does property interpolation
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@810711 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index e400564..4503840 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -190,9 +190,14 @@
Collection embeddableArtifacts = getEmbeddableArtifacts( project, analyzer );
new DependencyEmbedder( getLog(), embeddableArtifacts ).processHeaders( analyzer );
+ dumpInstructions( "BND Instructions:", analyzer.getProperties(), getLog() );
+ dumpClasspath( "BND Classpath:", analyzer.getClasspath(), getLog() );
+
analyzer.mergeManifest( analyzer.getJar().getManifest() );
analyzer.calcManifest();
+ dumpManifest( "BND Manifest:", analyzer.getJar().getManifest(), getLog() );
+
return analyzer;
}
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
index ba728a2..33fb8c4 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
@@ -41,7 +41,7 @@
throws IOException
{
Map classSpace = super.analyzeBundleClasspath( dot, bundleClasspath, contained, referred, uses );
- String bundleVersion = getProperties().getProperty( BUNDLE_VERSION );
+ String bundleVersion = getProperty( BUNDLE_VERSION );
for ( Iterator it = contained.entrySet().iterator(); it.hasNext(); )
{
Map.Entry entry = ( Map.Entry ) it.next();