From 8194976c976c985c31cb1e56f44484fa52c7e9a4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 22 Mar 2023 08:00:07 +0100 Subject: [PATCH] Simplify Jackrabbit packaging and shuffle some components between categories --- .../apache-sshd/org.apache.sshd.git.bnd | 2 +- .../org.argeo.tp.gis/h2gis/org.h2gis.bnd | 2 +- .../h2gis/org.h2gis.postgis_jts.bnd | 2 +- .../org.argeo.tp.jcr/jackrabbit/merge.bnd | 23 +++++++++++++++++++ ...> org.apache.jackrabbit.core.bnd.disabled} | 0 ...> org.apache.jackrabbit.data.bnd.disabled} | 0 ...rg.apache.jackrabbit.servlet.bnd.disabled} | 0 .../de.thjom.java.systemd.bnd | 0 repackage/org.argeo.tp/com.h2database.bnd | 1 + .../org.apache.commons.codec.bnd | 0 .../org.apache.commons.compress.bnd | 0 .../org.tukaani.xz.bnd | 0 sdk/argeo-build | 2 +- sdk/output-argeo-tp-rwt.target | 2 +- sdk/output-argeo-tp-swt-win.target | 2 +- sdk/output-argeo-tp-swt.target | 2 +- 16 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd rename repackage/org.argeo.tp.jcr/jackrabbit/{org.apache.jackrabbit.core.bnd => org.apache.jackrabbit.core.bnd.disabled} (100%) rename repackage/org.argeo.tp.jcr/jackrabbit/{org.apache.jackrabbit.data.bnd => org.apache.jackrabbit.data.bnd.disabled} (100%) rename repackage/org.argeo.tp.jcr/jackrabbit/{org.apache.jackrabbit.servlet.bnd => org.apache.jackrabbit.servlet.bnd.disabled} (100%) rename repackage/{org.argeo.tp => org.argeo.tp.utils}/de.thjom.java.systemd.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp}/org.apache.commons.codec.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp}/org.apache.commons.compress.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp}/org.tukaani.xz.bnd (100%) diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd index 32b4681..33aadcf 100644 --- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd @@ -1,5 +1,5 @@ Argeo-Origin-M2: org.apache.sshd:sshd-git Import-Package: \ -org.eclipse.jgit.pgm.*;resolution:=optional,\ +org.eclipse.jgit.*;resolution:=optional,\ org.kohsuke.*;resolution:=optional,\ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd index 329304e..0372e66 100644 --- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd @@ -1,2 +1,2 @@ Argeo-Origin-M2: org.orbisgis:h2gis -Fragment-Host: org.h2 \ No newline at end of file +Fragment-Host: com.h2database \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd index 4a79519..b23aad3 100644 --- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd @@ -1,2 +1,2 @@ Argeo-Origin-M2: org.orbisgis:postgis-jts -Fragment-Host: org.h2 \ No newline at end of file +Fragment-Host: com.h2database \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd new file mode 100644 index 0000000..7a6d1ec --- /dev/null +++ b/repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd @@ -0,0 +1,23 @@ +Bundle-SymbolicName: org.apache.jackrabbit.core + +Argeo-Origin-M2-Merge: \ +org.apache.jackrabbit:jackrabbit-core, \ +org.apache.jackrabbit:jackrabbit-data, \ +org.apache.jackrabbit:jackrabbit-jcr-servlet, \ + +Export-Package: org.apache.jackrabbit.* + +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,\ +org.apache.jackrabbit.rmi.*;resolution:=optional,*\ +javax.servlet.*;resolution:=optional,* +* diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd rename to repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd rename to repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd rename to repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled diff --git a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd similarity index 100% rename from repackage/org.argeo.tp/de.thjom.java.systemd.bnd rename to repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd diff --git a/repackage/org.argeo.tp/com.h2database.bnd b/repackage/org.argeo.tp/com.h2database.bnd index db8d34f..d108669 100644 --- a/repackage/org.argeo.tp/com.h2database.bnd +++ b/repackage/org.argeo.tp/com.h2database.bnd @@ -6,4 +6,5 @@ org.apache.lucene.*;resolution:=optional,\ org.codehaus.groovy.*;resolution:=optional,\ org.osgi.*;resolution:=optional,\ com.ibm.icu.*;resolution:=optional,\ +org.locationtech.jts.*;resolution:=optional,\ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd rename to repackage/org.argeo.tp/org.apache.commons.codec.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd rename to repackage/org.argeo.tp/org.apache.commons.compress.bnd diff --git a/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd b/repackage/org.argeo.tp/org.tukaani.xz.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.tukaani.xz.bnd rename to repackage/org.argeo.tp/org.tukaani.xz.bnd diff --git a/sdk/argeo-build b/sdk/argeo-build index c8f6d0e..6c0e011 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit c8f6d0e6aa4d9a6f24dd4ba4f9ac7878945d6e89 +Subproject commit 6c0e011bdddc156221a8dfc3bba979446e08deea diff --git a/sdk/output-argeo-tp-rwt.target b/sdk/output-argeo-tp-rwt.target index ee96605..ee1f222 100644 --- a/sdk/output-argeo-tp-rwt.target +++ b/sdk/output-argeo-tp-rwt.target @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/sdk/output-argeo-tp-swt-win.target b/sdk/output-argeo-tp-swt-win.target index a0771ae..4d21df8 100644 --- a/sdk/output-argeo-tp-swt-win.target +++ b/sdk/output-argeo-tp-swt-win.target @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target index b667d47..42b061f 100644 --- a/sdk/output-argeo-tp-swt.target +++ b/sdk/output-argeo-tp-swt.target @@ -4,6 +4,6 @@ - + \ No newline at end of file -- 2.30.2