svn commit: r1404983 - /felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java

[mcculls]

Author: mcculls
Date: Fri Nov  2 14:52:07 2012
New Revision: 1404983

URL: http://svn.apache.org/viewvc?rev=1404983&view=rev
Log:
Sync with latest bnd 'next' branch

Modified:
    
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java

Modified: 
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java?rev=1404983&r1=1404982&r2=1404983&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java 
(original)
+++ 
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java 
Fri Nov  2 14:52:07 2012
@@ -128,24 +128,15 @@ public class WorkspaceRepository impleme
                List<Version> versions = new ArrayList<Version>();
                Collection<Project> projects = workspace.getAllProjects();
                for (Project project : projects) {
-                       File[] build = project.build(false);
-                       if (build != null) {
-                               for (File file : build) {
-                                       Jar jar = new Jar(file);
-                                       try {
-                                               if (bsn.equals(jar.getBsn())) {
-                                                       String v  = 
jar.getVersion();
-                                                       if ( v == null)
-                                                               v = "0";
-                                                       else if 
(!Verifier.isVersion(v))
-                                                               continue; // 
skip
-                                                       
-                                                       versions.add(new 
Version(v));
-                                               }
-                                       }
-                                       finally {
-                                               jar.close();
-                                       }
+                       for (Builder builder : project.getSubBuilders()) {
+                               if (bsn.equals(builder.getBsn())) {
+                                       String v  = builder.getVersion();
+                                       if (v == null)
+                                               v = "0";
+                                       else if (!Verifier.isVersion(v))
+                                               continue; // skip
+                                       
+                                       versions.add(new Version(v));
                                }
                        }
                }