Finalise TP distribution.

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 883e02fe60ef6f07a07510dfcecfdae90c96eff2..dcf706299eeb842ca31727547cd0975e86248ca0 100644 (file)
--- 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 045292198c290a7a16661a33740a8730f3bcfabf..365a910122ca833babd05177e958c4cc61821736 100644 (file)
--- 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 (file)
index 0000000..d2d1848
--- /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