From 2aed4ec1227628a9630471bddc0d903e7cb48eaa Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 8 Feb 2022 07:17:21 +0100 Subject: [PATCH] Finalise TP distribution. --- org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java | 5 ++++- tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd | 5 ++++- tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java index 883e02fe6..dcf706299 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java +++ b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java @@ -250,6 +250,8 @@ public class A2Factory { case "Created-By": continue keys; } + if("Require-Capability".equals(key.toString()) && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) + continue keys;// hack for very old classes additionalEntries.put(key.toString(), value.toString()); logger.log(DEBUG, () -> key + "=" + value); @@ -428,7 +430,7 @@ public class A2Factory { // copy MANIFEST Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); Files.createDirectories(manifestPath.getParent()); - for (String key : entries.keySet()) { + for (String key : entries.keySet()) { String value = entries.get(key); Object previousValue = manifest.getMainAttributes().putValue(key, value); if (previousValue != null && !previousValue.equals(value)) { @@ -612,6 +614,7 @@ public class A2Factory { Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize(); +// factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd")); // factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j")); // System.exit(0); diff --git a/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd index 045292198..365a91012 100644 --- a/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd +++ b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd @@ -1,3 +1,6 @@ Bundle-License: BSD-3-Clause SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r -SLC-Origin-ManifestNotModified: true +Import-Package: \ +sun.*;resolution:=optional, \ +com.jcraft.jsch;resolution:=optional, \ +* diff --git a/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd b/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd new file mode 100644 index 000000000..d2d184835 --- /dev/null +++ b/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: com.googlecode.javaewah.JavaEWAH +SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.6 +SLC-Origin-ManifestNotModified: true -- 2.39.5