From 535084ef8b8b0a272ebe034b0a47d67d8c1a2118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Wed, 22 Jan 2025 14:22:09 +0100 Subject: [PATCH] Catch all kinds of exceptions It seems there are some really strange formated manifest files, so better catch all kind of runtime exceptions for parsing it. --- .../baseline/provider/MavenArtifactVersionProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/provider/MavenArtifactVersionProvider.java b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/provider/MavenArtifactVersionProvider.java index 90a02bc286..e7185f8217 100644 --- a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/provider/MavenArtifactVersionProvider.java +++ b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/provider/MavenArtifactVersionProvider.java @@ -45,8 +45,6 @@ import org.eclipse.tycho.artifacts.ArtifactVersionProvider; import org.eclipse.tycho.core.osgitools.BundleReader; import org.eclipse.tycho.core.osgitools.OsgiManifest; -import org.eclipse.tycho.core.osgitools.OsgiManifestParserException; -import org.osgi.framework.BundleException; import org.osgi.framework.VersionRange; import org.osgi.framework.namespace.PackageNamespace; @@ -169,7 +167,10 @@ private ModuleRevisionBuilder readOSGiInfo(Path path) { try { OsgiManifest manifest = bundleReader.loadManifest(path.toFile()); return OSGiManifestBuilderFactory.createBuilder(manifest.getHeaders()); - } catch (BundleException | OsgiManifestParserException e) { + } catch (Exception e) { + // On maven there might be all kind of badly formated manifests ... if we can't + // parse it and create even a basic valid OSGi one than the artifacts is + // unlikely usable in OSGI context anyways } } return null;