commit ab65d7b45e233700ff25fba23f3483ffcbfd0952
author Stuart McCulloch <mcculls@apache.org> Thu Jan 29 11:05:31 2009 +0000
committer Stuart McCulloch <mcculls@apache.org> Thu Jan 29 11:05:31 2009 +0000
tree d2a993d4822e6fef46effbd07b6d5f70bef53c81
parent 6f26582c257d6c37025e0550f837917fbdc074ec

FELIX-907: patch local copy of Bnd code to fix regression

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

bundleplugin/src/main/java/aQute/lib/osgi/Builder.java

diff --git a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
index 7c631ae..84c35e6 100644
--- a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
+++ b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
@@ -425,12 +425,12 @@
 
         Map<Instruction, Map<String, String>> all = newMap();
 
-        all.putAll(replaceWitInstruction(getHeader(EXPORT_PACKAGE),
-                EXPORT_PACKAGE));
-
         all.putAll(replaceWitInstruction(getHeader(PRIVATE_PACKAGE),
                 PRIVATE_PACKAGE));
 
+        all.putAll(replaceWitInstruction(getHeader(EXPORT_PACKAGE),
+                EXPORT_PACKAGE));
+
         if (isTrue(getProperty(Constants.UNDERTEST))) {
             all.putAll(replaceWitInstruction(parseHeader(getProperty(
                     Constants.TESTPACKAGES, "test;presence:=optional")),