From d0192f02ee79558bd66a42504510829656066087 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 5 Feb 2022 12:59:18 +0100 Subject: [PATCH] First complete base distribution with the new approach (Argeo Commons working with it). --- .../src/org/argeo/slc/ManifestConstants.java | 2 ++ .../src/org/argeo/slc/build/A2Factory.java | 27 ++++++++++++++++--- sdk/argeo-tp-rap.target | 4 ++- .../org.apache.commons.collections.bnd | 3 +++ .../org.apache.commons.dbcp.bnd | 6 +++++ .../org.apache.commons.fileupload.bnd | 4 +-- .../org.apache.commons.pool.bnd | 4 +++ .../org.apache.httpcomponents.httpclient.bnd | 4 +++ .../org.apache.httpcomponents.httpcore.bnd | 4 +++ .../org.apache.httpcomponents.httpmime.bnd | 4 +++ tp/org.argeo.tp.apache/org.apache.lucene.bnd | 4 +++ .../org.apache.tika.core.bnd | 5 ++++ .../org.apache.tika.parsers.bnd | 7 +++++ tp/org.argeo.tp.apache/org.apache.xalan.bnd | 4 +++ .../org.apache.xalan.serializer.bnd | 4 +++ tp/org.argeo.tp.apache/org.apache.xerces.bnd | 6 +++++ .../org.apache.xml.resolver.bnd | 4 +++ .../org.apache.xml.security.bnd.deactivated | 4 +++ .../org.apache.xmlbeans.bnd | 9 +++++++ tp/org.argeo.tp.javax/javax.websocket.bnd | 3 +++ .../javax.xml.bind.bnd.deactivated | 4 +++ .../EDU.oswego.cs.dl.util.concurrent.bnd | 4 +++ tp/org.argeo.tp.jcr/com.google.guava.bnd | 5 ++++ .../com.google.guava.failureaccess.bnd | 4 +++ tp/org.argeo.tp.jcr/jackrabbit/common.bnd | 3 +++ .../jackrabbit/org.apache.jackrabbit.api.bnd | 3 +++ .../jackrabbit/org.apache.jackrabbit.core.bnd | 13 +++++++++ .../jackrabbit/org.apache.jackrabbit.data.bnd | 14 ++++++++++ .../org.apache.jackrabbit.jcr.client.bnd | 2 ++ .../org.apache.jackrabbit.jcr.commons.bnd | 2 ++ .../org.apache.jackrabbit.jcr2dav.bnd | 2 ++ .../org.apache.jackrabbit.jcr2spi.bnd | 2 ++ .../org.apache.jackrabbit.server.bnd | 2 ++ .../org.apache.jackrabbit.servlet.bnd | 4 +++ .../jackrabbit/org.apache.jackrabbit.spi.bnd | 2 ++ .../org.apache.jackrabbit.spi.commons.bnd | 2 ++ .../org.apache.jackrabbit.spi2dav.bnd | 2 ++ .../org.apache.jackrabbit.spi2jcr.bnd | 2 ++ .../org.apache.jackrabbit.webdav.bnd | 2 ++ tp/org.argeo.tp.jcr/javax.jcr.bnd | 5 ++++ tp/org.argeo.tp.sdk/org.hamcrest.bnd | 5 ++++ tp/org.argeo.tp.sdk/org.junit.bnd | 8 ++++++ tp/org.argeo.tp/org.h2.bnd | 4 +++ 43 files changed, 202 insertions(+), 6 deletions(-) create mode 100644 tp/org.argeo.tp.apache/org.apache.commons.collections.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.commons.pool.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.lucene.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.tika.core.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.xalan.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.xerces.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.xml.security.bnd.deactivated create mode 100644 tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd create mode 100644 tp/org.argeo.tp.javax/javax.websocket.bnd create mode 100644 tp/org.argeo.tp.javax/javax.xml.bind.bnd.deactivated create mode 100644 tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd create mode 100644 tp/org.argeo.tp.jcr/com.google.guava.bnd create mode 100644 tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/common.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.client.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.commons.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2dav.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2spi.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.server.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.commons.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2dav.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2jcr.bnd create mode 100644 tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.webdav.bnd create mode 100644 tp/org.argeo.tp.jcr/javax.jcr.bnd create mode 100644 tp/org.argeo.tp.sdk/org.hamcrest.bnd create mode 100644 tp/org.argeo.tp.sdk/org.junit.bnd create mode 100644 tp/org.argeo.tp/org.h2.bnd diff --git a/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java b/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java index 919d050d7..9795ae106 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java +++ b/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java @@ -5,6 +5,8 @@ public enum ManifestConstants { BUNDLE_SYMBOLICNAME("Bundle-SymbolicName"), // BUNDLE_VERSION("Bundle-Version"), // BUNDLE_LICENSE("Bundle-License"), // + EXPORT_PACKAGE("Export-Package"), // + IMPORT_PACKAGE("Import-Package"), // // SLC SLC_CATEGORY("SLC-Category"), // SLC_ORIGIN_M2("SLC-Origin-M2"), // 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 f0aea3cb2..8c7b11e2b 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 @@ -102,7 +102,7 @@ public class A2Factory { URL url = MavenConventionsUtils.mavenCentralUrl(artifact); Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar"); - Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps); + Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact); downloadAndProcessM2Sources(artifact, targetBundleDir); @@ -178,7 +178,7 @@ public class A2Factory { } } mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates()); - Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps); + Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact); // logger.log(Level.DEBUG, () -> "Processed " + downloaded); // sources @@ -201,7 +201,8 @@ public class A2Factory { } - protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps) { + protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps, + DefaultArtifact artifact) { try { Map additionalEntries = new TreeMap<>(); @@ -216,6 +217,21 @@ public class A2Factory { additionalEntries.put(key.toString(), value); } } else { + if (artifact != null) { + if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { + fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName()); + } + if (!fileProps.containsKey(BUNDLE_VERSION.toString())) { + fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion()); + } + } + +// if (!fileProps.contains(EXPORT_PACKAGE.toString())) { +// fileProps.put(EXPORT_PACKAGE.toString(), "*"); +// } +// if (!fileProps.contains(IMPORT_PACKAGE.toString())) { +// fileProps.put(IMPORT_PACKAGE.toString(), "*"); +// } try (Analyzer bndAnalyzer = new Analyzer()) { bndAnalyzer.setProperties(fileProps); @@ -347,6 +363,7 @@ public class A2Factory { Manifest manifest = new Manifest(jarIn.getManifest()); // remove problematic entries in MANIFEST + manifest.getEntries().clear(); // Set entriesToDelete = new HashSet<>(); // for (String key : manifest.getEntries().keySet()) { //// logger.log(DEBUG, "## " + key); @@ -388,6 +405,8 @@ public class A2Factory { entries: while ((entry = jarIn.getNextJarEntry()) != null) { if (entry.isDirectory()) continue entries; + if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF")) + continue entries; Path target = targetBundleDir.resolve(entry.getName()); Files.createDirectories(target.getParent()); Files.copy(jarIn, target); @@ -588,9 +607,11 @@ public class A2Factory { factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); // Maven + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.javax")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr")); } } diff --git a/sdk/argeo-tp-rap.target b/sdk/argeo-tp-rap.target index 3ae7887e4..296f1f93f 100644 --- a/sdk/argeo-tp-rap.target +++ b/sdk/argeo-tp-rap.target @@ -1,6 +1,6 @@ - + @@ -8,5 +8,7 @@ + + \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd b/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd new file mode 100644 index 000000000..b81a7e3bc --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.collections +SLC-Origin-M2: commons-collections:commons-collections:3.2.2 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd b/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd new file mode 100644 index 000000000..085774d79 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd @@ -0,0 +1,6 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.dbcp +Bundle-Version: 1.4.0 +SLC-Origin-M2: commons-dbcp:commons-dbcp:1.4 +Import-Package: javax.transaction.*; resolution:="optional",\ +* diff --git a/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd b/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd index 8dbc50996..c51062fe1 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd @@ -1,6 +1,6 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.fileupload Bundle-Version: 1.4.0 -Import-Package: javax.portlet;resolution:=optional, - * +Import-Package: javax.portlet;resolution:=optional,\ +* SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd b/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd new file mode 100644 index 000000000..776efc0f4 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.pool +SLC-Origin-M2: commons-pool:commons-pool:1.5.7 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd new file mode 100644 index 000000000..9622fc593 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpclient +SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.9 +Export-Package: org.apache.http.*;version="4.5.9" \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd new file mode 100644 index 000000000..991778dc8 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpcore +SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.10 +Export-Package: org.apache.http.*;version="4.4.10" \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd new file mode 100644 index 000000000..683f12a1b --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpmime +SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.9 +Export-Package: org.apache.http.*;version="4.5.9" \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.lucene.bnd b/tp/org.argeo.tp.apache/org.apache.lucene.bnd new file mode 100644 index 000000000..ded36ae8b --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.lucene.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.lucene +SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2 +Export-Package: org.apache.lucene.* \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.tika.core.bnd b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd new file mode 100644 index 000000000..104b5e95d --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.tika.core +Bundle-Version: 1.22.0 +SLC-Origin-M2: org.apache.tika:tika-core:1.22 +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd new file mode 100644 index 000000000..62ed54730 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd @@ -0,0 +1,7 @@ +Bundle-Activator: org.apache.tika.parser.internal.Activator +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.tika.parsers +Bundle-Version: 1.22.0 +Import-Package: *;resolution:=optional +SLC-Origin-M2: org.apache.tika:tika-parsers:1.22 +Export-Package: org.apache.tika.* \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.bnd new file mode 100644 index 000000000..95b25ad48 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xalan.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xalan +SLC-Origin-M2: xalan:xalan:2.7.2 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd new file mode 100644 index 000000000..22a080332 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xalan.serializer +SLC-Origin-M2: xalan:serializer:2.7.2 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.xerces.bnd b/tp/org.argeo.tp.apache/org.apache.xerces.bnd new file mode 100644 index 000000000..43b749cc7 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xerces.bnd @@ -0,0 +1,6 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xerces +Import-Package: sun.*;resolution:=optional, + * +SLC-Origin-M2: xerces:xercesImpl:2.12.0 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd b/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd new file mode 100644 index 000000000..affda3d3c --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xml.resolver +SLC-Origin-M2: xml-resolver:xml-resolver:1.2 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.xml.security.bnd.deactivated b/tp/org.argeo.tp.apache/org.apache.xml.security.bnd.deactivated new file mode 100644 index 000000000..038c19f5b --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xml.security.bnd.deactivated @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xml.security +SLC-Origin-M2: org.apache.santuario:xmlsec:2.1.2 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd new file mode 100644 index 000000000..cdc2cbaee --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd @@ -0,0 +1,9 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xmlbeans +DynamicImport-Package: * +Import-Package: org.apache.tools.ant.*;resolution:=optional, + net.sf.saxon.*;resolution:=optional, + com.sun.*;resolution:=optional, + * +SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:3.1.0 +Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.javax/javax.websocket.bnd b/tp/org.argeo.tp.javax/javax.websocket.bnd new file mode 100644 index 000000000..85137ff0e --- /dev/null +++ b/tp/org.argeo.tp.javax/javax.websocket.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: javax.websocket +SLC-Origin-M2: javax.websocket:javax.websocket-api:1.1 +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.javax/javax.xml.bind.bnd.deactivated b/tp/org.argeo.tp.javax/javax.xml.bind.bnd.deactivated new file mode 100644 index 000000000..5a764580e --- /dev/null +++ b/tp/org.argeo.tp.javax/javax.xml.bind.bnd.deactivated @@ -0,0 +1,4 @@ +Bundle-SymbolicName: javax.xml.bind +Bundle-Version: 2.4.0 +SLC-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 +Export-Package: javax.* \ No newline at end of file diff --git a/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd b/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd new file mode 100644 index 000000000..8522d2e21 --- /dev/null +++ b/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd @@ -0,0 +1,4 @@ +Bundle-License: Public Domain +Bundle-SymbolicName: EDU.oswego.cs.dl.util.concurrent +SLC-Origin-M2: concurrent:concurrent:1.3.4 +Export-Package: EDU.oswego.* \ No newline at end of file diff --git a/tp/org.argeo.tp.jcr/com.google.guava.bnd b/tp/org.argeo.tp.jcr/com.google.guava.bnd new file mode 100644 index 000000000..a8a926f3f --- /dev/null +++ b/tp/org.argeo.tp.jcr/com.google.guava.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: com.google.guava +Bundle-Version: 27.1.0.jre +SLC-Origin-M2: com.google.guava:guava:27.1-jre +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd new file mode 100644 index 000000000..e7c19ce8c --- /dev/null +++ b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: com.google.guava.failureaccess +SLC-Origin-M2: com.google.guava:failureaccess:1.0.1 +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd new file mode 100644 index 000000000..517124884 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.18.3 +Export-Package: org.apache.jackrabbit.*;version="2.18.3" diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd new file mode 100644 index 000000000..6ebc7799a --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd @@ -0,0 +1,3 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api +Bundle-SymbolicName: org.apache.jackrabbit.api +Export-Package: org.apache.jackrabbit.* diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd new file mode 100644 index 000000000..a746cae60 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd @@ -0,0 +1,13 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-core +Bundle-SymbolicName: org.apache.jackrabbit.core +Import-Package: org.apache.jackrabbit.test;resolution:=optional,\ +org.apache.derby.*;resolution:=optional,\ +org.h2;resolution:=optional,\ +org.postgresql;resolution:=optional,\ +oracle.jdbc;resolution:=optional,\ +org.gjt.mm.mysql;resolution:=optional,\ +com.mysql.jdbc;resolution:=optional,\ +com.microsoft.sqlserver.jdbc;resolution:=optional,\ +net.sourceforge.jtds.jdbc;resolution:=optional,\ +org.hsqldb;resolution:=optional,\ +* diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd new file mode 100644 index 000000000..981b84671 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd @@ -0,0 +1,14 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-data +Bundle-SymbolicName: org.apache.jackrabbit.data +Fragment-Host: org.apache.jackrabbit.core +Import-Package: org.apache.jackrabbit.test;resolution:=optional,\ +org.apache.derby.*;resolution:=optional,\ +org.h2;resolution:=optional,\ +org.postgresql;resolution:=optional,\ +oracle.jdbc;resolution:=optional,\ +org.gjt.mm.mysql;resolution:=optional,\ +com.mysql.jdbc;resolution:=optional,\ +com.microsoft.sqlserver.jdbc;resolution:=optional,\ +net.sourceforge.jtds.jdbc;resolution:=optional,\ +org.hsqldb;resolution:=optional,\ +* diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.client.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.client.bnd new file mode 100644 index 000000000..9c083a3df --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.client.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-client +Bundle-SymbolicName: org.apache.jackrabbit.jcr.client diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.commons.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.commons.bnd new file mode 100644 index 000000000..7af2a80c8 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.commons.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-commons +Bundle-SymbolicName: org.apache.jackrabbit.jcr.commons diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2dav.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2dav.bnd new file mode 100644 index 000000000..6ec7dd939 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2dav.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2dav +Bundle-SymbolicName: org.apache.jackrabbit.jcr2dav diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2spi.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2spi.bnd new file mode 100644 index 000000000..5809e9e48 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2spi.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2spi +Bundle-SymbolicName: org.apache.jackrabbit.jcr2spi diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.server.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.server.bnd new file mode 100644 index 000000000..ef7d70378 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.server.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-server +Bundle-SymbolicName: org.apache.jackrabbit.server diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd new file mode 100644 index 000000000..01f432604 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd @@ -0,0 +1,4 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-servlet +Bundle-SymbolicName: org.apache.jackrabbit.servlet +Fragment-Host: org.apache.jackrabbit.core +Import-Package: org.apache.jackrabbit.rmi.*;resolution:=optional,* diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.bnd new file mode 100644 index 000000000..6d0c7e4ba --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi +Bundle-SymbolicName: org.apache.jackrabbit.spi diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.commons.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.commons.bnd new file mode 100644 index 000000000..3014a8c4f --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.commons.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi-commons +Bundle-SymbolicName: org.apache.jackrabbit.spi.commons diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2dav.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2dav.bnd new file mode 100644 index 000000000..7c7de9c52 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2dav.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2dav +Bundle-SymbolicName: org.apache.jackrabbit.spi2dav diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2jcr.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2jcr.bnd new file mode 100644 index 000000000..9474f309b --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2jcr.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2jcr +Bundle-SymbolicName: org.apache.jackrabbit.spi2jcr diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.webdav.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.webdav.bnd new file mode 100644 index 000000000..9a453bf02 --- /dev/null +++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.webdav.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-webdav +Bundle-SymbolicName: org.apache.jackrabbit.webdav diff --git a/tp/org.argeo.tp.jcr/javax.jcr.bnd b/tp/org.argeo.tp.jcr/javax.jcr.bnd new file mode 100644 index 000000000..10bd6c30e --- /dev/null +++ b/tp/org.argeo.tp.jcr/javax.jcr.bnd @@ -0,0 +1,5 @@ +Bundle-License: https://www.adobe.io/experience-manager/reference-materials/spec/jcr/2.0/license.html +Bundle-SymbolicName: javax.jcr +Bundle-Version: 2.0.0 +SLC-Origin-M2: javax.jcr:jcr:2.0 +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.sdk/org.hamcrest.bnd b/tp/org.argeo.tp.sdk/org.hamcrest.bnd new file mode 100644 index 000000000..152f6e718 --- /dev/null +++ b/tp/org.argeo.tp.sdk/org.hamcrest.bnd @@ -0,0 +1,5 @@ +Bundle-License: BSD-3-Clause +Bundle-SymbolicName: org.hamcrest +Bundle-Version: 2.1.0 +SLC-Origin-M2: org.hamcrest:hamcrest:2.1 +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.sdk/org.junit.bnd b/tp/org.argeo.tp.sdk/org.junit.bnd new file mode 100644 index 000000000..82a96946a --- /dev/null +++ b/tp/org.argeo.tp.sdk/org.junit.bnd @@ -0,0 +1,8 @@ +Bundle-License: EPL-1.0 +Bundle-SymbolicName: org.junit +Bundle-Version: 4.12.0 +Import-Package: org.hamcrest;resolution:=optional,\ +org.hamcrest.core;resolution:=optional,\ +* +SLC-Origin-M2: junit:junit:4.12 +Export-Package: junit.*;version="4.12.0" \ No newline at end of file diff --git a/tp/org.argeo.tp/org.h2.bnd b/tp/org.argeo.tp/org.h2.bnd new file mode 100644 index 000000000..88a41e9ad --- /dev/null +++ b/tp/org.argeo.tp/org.h2.bnd @@ -0,0 +1,4 @@ +Bundle-License: MPL-2.0 +Bundle-SymbolicName: org.h2 +SLC-Origin-M2: com.h2database:h2:1.4.199 +SLC-Origin-ManifestNotModified: true -- 2.39.2