From 10e9f177944b2737ee018ed695338cfeff4fd0a3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 4 Oct 2019 10:55:36 +0200 Subject: [PATCH] Adapt to changes in BND. --- .../slc/client/ui/dist/commands/BndProcess.java | 6 +++--- .../org/argeo/slc/repo/osgi/ArchiveWrapper.java | 2 +- .../src/org/argeo/slc/repo/osgi/BndWrapper.java | 16 ++++++++++------ .../src/org/argeo/slc/repo/osgi/UriWrapper.java | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java index 6448ae5ab..99936dcb3 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java @@ -23,9 +23,9 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import aQute.lib.osgi.Builder; -import aQute.lib.osgi.Constants; -import aQute.lib.osgi.Jar; +import aQute.bnd.osgi.Builder; +import aQute.bnd.osgi.Constants; +import aQute.bnd.osgi.Jar; public class BndProcess extends AbstractHandler implements Constants { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java index f5ba43682..d53078ec5 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java @@ -40,7 +40,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; -import aQute.lib.osgi.Jar; +import aQute.bnd.osgi.Jar; /** * Download a software distribution and generates the related OSGi bundles from diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java index 17bdbe117..3d83c07e7 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java @@ -18,9 +18,9 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.osgi.framework.Version; import org.springframework.beans.factory.BeanNameAware; -import aQute.lib.osgi.Builder; -import aQute.lib.osgi.Constants; -import aQute.lib.osgi.Jar; +import aQute.bnd.osgi.Builder; +import aQute.bnd.osgi.Constants; +import aQute.bnd.osgi.Jar; /** Utilities around the BND library, which manipulates OSGi metadata. */ public class BndWrapper implements Constants, CategorizedNameVersion, @@ -124,9 +124,13 @@ public class BndWrapper implements Constants, CategorizedNameVersion, } catch (Exception e) { throw new SlcException("Cannot wrap jar", e); } finally { - b.close(); - if (jar != null) - jar.close(); + try { + b.close(); + if (jar != null) + jar.close(); + } catch (Exception e) { + // silent + } } } diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java index 819b62386..665bfce51 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java @@ -21,7 +21,7 @@ import org.argeo.slc.repo.RepoUtils; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; -import aQute.lib.osgi.Jar; +import aQute.bnd.osgi.Jar; public class UriWrapper extends BndWrapper implements Runnable { private final static Log log = LogFactory.getLog(UriWrapper.class); -- 2.39.2