From 1bb5dafb8b8ba4b69a7bed7242bb8724c79de583 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 8 May 2022 08:20:24 +0200 Subject: [PATCH] Improve publishing third parties. --- .../src/org/argeo/slc/factory/A2Factory.java | 16 +++++----------- tp/org.argeo.tp.formats/com.lowagie.bnd | 3 +++ tp/org.argeo.tp.formats/flying-saucer/common.bnd | 2 ++ .../flying-saucer/org.xhtmlrenderer.core.bnd | 1 + .../flying-saucer/org.xhtmlrenderer.openpdf.bnd | 1 + .../flying-saucer/org.xhtmlrenderer.swt.bnd | 4 ++++ tp/org.argeo.tp.formats/fop/common.bnd | 2 -- tp/org.argeo.tp.formats/fop/merge.bnd | 15 +++++++++++++++ .../fop/org.apache.fop.core.bnd | 9 --------- .../fop/org.apache.fop.events.bnd | 6 ------ .../fop/org.apache.fop.util.bnd | 2 -- 11 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 tp/org.argeo.tp.formats/com.lowagie.bnd create mode 100644 tp/org.argeo.tp.formats/flying-saucer/common.bnd create mode 100644 tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd create mode 100644 tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd create mode 100644 tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd delete mode 100644 tp/org.argeo.tp.formats/fop/common.bnd create mode 100644 tp/org.argeo.tp.formats/fop/merge.bnd delete mode 100644 tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd delete mode 100644 tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd delete mode 100644 tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java index 5aa9d9d53..7048a39ed 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java @@ -265,6 +265,8 @@ public class A2Factory { : null; String bundleSymbolicName = mergeProps.getProperty(ManifestConstants.BUNDLE_SYMBOLICNAME.toString()); + if (bundleSymbolicName == null) + throw new IllegalArgumentException("Bundle-SymbolicName must be set in " + mergeBnd); DefaultCategoryNameVersion nameVersion = new DefaultArtifact( category + ":" + bundleSymbolicName + ":" + m2Version); Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch()); @@ -475,6 +477,8 @@ public class A2Factory { continue entries; if (entry.getName().startsWith("module-info.java"))// skip META-INF entries continue entries; + if (entry.getName().startsWith("/")) // absolute paths + continue entries; Path target = targetSourceDir.resolve(entry.getName()); Files.createDirectories(target.getParent()); if (!Files.exists(target)) { @@ -872,16 +876,7 @@ public class A2Factory { // factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); -// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); - factory.processEclipseArchive( - descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox")); - factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); - factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); System.exit(0); // Eclipse @@ -894,7 +889,6 @@ public class A2Factory { factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox")); factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); - System.exit(0); // Maven factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); diff --git a/tp/org.argeo.tp.formats/com.lowagie.bnd b/tp/org.argeo.tp.formats/com.lowagie.bnd new file mode 100644 index 000000000..b8bd29306 --- /dev/null +++ b/tp/org.argeo.tp.formats/com.lowagie.bnd @@ -0,0 +1,3 @@ +Bundle-License: LGPL-2.1 +Bundle-SymbolicName: com.lowagie +SLC-Origin-M2: com.github.librepdf:openpdf:1.3.27 diff --git a/tp/org.argeo.tp.formats/flying-saucer/common.bnd b/tp/org.argeo.tp.formats/flying-saucer/common.bnd new file mode 100644 index 000000000..8fc898c7b --- /dev/null +++ b/tp/org.argeo.tp.formats/flying-saucer/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: LGPL-3 +SLC-Origin-M2: :9.1.22 \ No newline at end of file diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd new file mode 100644 index 000000000..19312ee32 --- /dev/null +++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-core diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd new file mode 100644 index 000000000..0c241bd74 --- /dev/null +++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd new file mode 100644 index 000000000..3a1c6d398 --- /dev/null +++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd @@ -0,0 +1,4 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt +IMport-Package:\ +org.eclipse.swt.printing;resolution:="optional",\ +* \ No newline at end of file diff --git a/tp/org.argeo.tp.formats/fop/common.bnd b/tp/org.argeo.tp.formats/fop/common.bnd deleted file mode 100644 index 64a95daec..000000000 --- a/tp/org.argeo.tp.formats/fop/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.7 \ No newline at end of file diff --git a/tp/org.argeo.tp.formats/fop/merge.bnd b/tp/org.argeo.tp.formats/fop/merge.bnd new file mode 100644 index 000000000..96c438a63 --- /dev/null +++ b/tp/org.argeo.tp.formats/fop/merge.bnd @@ -0,0 +1,15 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.fop +SLC-Origin-M2: :2.7 +SLC-Origin-M2-Merge: \ +org.apache.xmlgraphics:fop-core,\ +org.apache.xmlgraphics:fop-util,\ +org.apache.xmlgraphics:fop-events,\ + +Export-Package: org.apache.fop.* + +Import-Package: \ +javax.media.jai;resolution:="optional",\ +com.thoughtworks.qdox.*;resolution:="optional",\ +org.apache.tools.ant.*;resolution:="optional",\ +* diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd deleted file mode 100644 index ba69e0b6a..000000000 --- a/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd +++ /dev/null @@ -1,9 +0,0 @@ -Bundle-SymbolicName: org.apache.fop.core -SLC-Origin-M2: org.apache.xmlgraphics:fop-core -Import-Package: \ -javax.media.jai;resolution:="optional",\ -org.apache.tools.ant.*;resolution:="optional",\ -* -Export-Package: \ -!org.apache.fop.util.*,\ -* \ No newline at end of file diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd deleted file mode 100644 index 31265cc9e..000000000 --- a/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-SymbolicName: org.apache.fop.events -SLC-Origin-M2: org.apache.xmlgraphics:fop-events -Import-Package: \ -com.thoughtworks.qdox.*;resolution:="optional",\ -org.apache.tools.ant.*;resolution:="optional",\ -* diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd deleted file mode 100644 index c2ea982d5..000000000 --- a/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.fop.util -SLC-Origin-M2: org.apache.xmlgraphics:fop-util -- 2.30.2