Handle non-JAR files in dependency and resource builders

Added handling for ZipException in ProjectBuilder and ResourceBuilder to support non-JAR files (e.g., .so, .dylib) referenced in repositories. This prevents errors when such files are encountered (e.g. via ${repo} macro) and ensures dependencies and resources are processed gracefully.

Also do not add non-jar files as library entries in BndContainerInitializer

Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>

Author: chrisrueger

biz.aQute.bndlib/src/aQute/bnd/build/ProjectBuilder.java

@@ -20,6 +20,7 @@
 import java.util.function.Supplier;
 import java.util.jar.Manifest;
 import java.util.regex.Pattern;
+import java.util.zip.ZipException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -229,6 +230,10 @@ public void init() {
 							try (Jar jar = new Jar(file)) {
 								fillDependencies(dependencies, jar, containerAttributes);
 							}
+							catch (ZipException e) {
+								// not a jar file (can happen if a
+								// ${repo}-reference a non-jar (.dylib, .so)
+							}
 						}
 					}
 				}
@@ -284,6 +289,10 @@ private void fillDependencies(Parameters dependencies, Jar jar, Map<String, Stri
 			dependencies.add(key.toString(), attrs);
 		} else {
 			// fall back to pom.properties in jar
+			if (jar == null) {
+				return;
+			}
+
 			jar.getResources(pomPropertiesFilter)
 				.forEachOrdered(r -> {
 					UTF8Properties pomProperties = new UTF8Properties();

biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java

@@ -23,6 +23,7 @@
 import java.util.function.Supplier;
 import java.util.jar.Manifest;
 import java.util.stream.Stream;
+import java.util.zip.ZipException;
 
 import org.osgi.annotation.versioning.ProviderType;
 import org.osgi.framework.Constants;
@@ -1034,7 +1035,21 @@ public static SupportingResource parse(File file, URI uri) {
 				file.length(), mime);
 
 			return rb.build();
-		} catch (Exception rt) {
+		} catch (ZipException rt) {
+			// can happen if the file is not a JAR file (e.g. a dynamic libray,
+			// .so, .dylib)
+			ResourceBuilder rb = new ResourceBuilder();
+			// placeholder for "any file"
+			String mime = "application/octet-stream";
+			rb.addContentCapability(uri,
+				new DeferredComparableValue<String>(String.class,
+					SupplierWithException.asSupplier(() -> SHA256.digest(file)
+						.asHex()),
+					file.hashCode()),
+				file.length(), mime);
+			return rb.build();
+		}
+		catch (Exception rt) {
 			throw new IllegalArgumentException("illegal format " + file.getAbsolutePath(), rt);
 		}
 	}

bndtools.builder/src/org/bndtools/builder/classpath/BndContainerInitializer.java

@@ -616,6 +616,16 @@ private JarInfo getJarInfo(File file) {
 
 		private void addLibraryEntry(IPath path, File file, List<IAccessRule> accessRules,
 			List<IClasspathAttribute> extraAttrs, IPath sourceAttachmentPath, IPath sourceAttachmentRootPath) {
+
+			if (file.isFile() && !file.getName()
+				.toLowerCase()
+				.endsWith(".jar")) {
+				// non .jar files are no library entries (it is possible that
+				// the ${repo} macro references non jar files which could end up
+				// here
+				return;
+			}
+
 			IClasspathEntry libraryEntry = JavaCore.newLibraryEntry(path, sourceAttachmentPath,
 				sourceAttachmentRootPath, toAccessRulesArray(accessRules), toClasspathAttributesArray(extraAttrs),
 				false);