commit 81b093864f18309022326c48485f550b779c1718
author Stuart McCulloch <mcculls@apache.org> Wed Aug 27 12:50:45 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Wed Aug 27 12:50:45 2008 +0000
tree 960b0a0c70d82384d0ea8564d6fed34852e7ea5f
parent bf32958abb96576db336fe9ba32e84ccbc587d66

FELIX-699: set analyzer base before loading properties in manifest goal

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@689464 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java

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 3aabdf5..0f62d6a 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -167,11 +167,12 @@
         properties.putAll( transformDirectives( instructions ) );
 
         PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
-        analyzer.setProperties( properties );
 
         if ( project.getBasedir() != null )
             analyzer.setBase( project.getBasedir() );
 
+        analyzer.setProperties( properties );
+
         if ( classpath != null )
             analyzer.setClasspath( classpath );