Simplify Jackrabbit packaging and shuffle some components between

categories

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 32b46812d32af96d6ac7fdacd5d8ef078ca51d48..33aadcf5e19fc90136740e536e58f80053b12bd0 100644 (file)
--- 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 329304ee458d0f295f48a33fc51e9bc8d91bdea2..0372e66d8568650728c0a05e6b5ac282ad5ff980 100644 (file)
--- 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 4a79519653a70f152c3737e10e02d63a761b8d75..b23aad3b2cb46301cd60b511744e84b216493492 100644 (file)
--- 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 (file)
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
deleted file mode 100644 (file)
index a00a55a..0000000
--- a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd
+++ /dev/null
@@ -1,12 +0,0 @@
-Argeo-Origin-M2: org.apache.jackrabbit: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/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled
new file mode 100644 (file)
index 0000000..a00a55a
--- /dev/null
+++ b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled
@@ -0,0 +1,12 @@
+Argeo-Origin-M2: org.apache.jackrabbit: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/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd
deleted file mode 100644 (file)
index b1193c5..0000000
--- a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd
+++ /dev/null
@@ -1,13 +0,0 @@
-Argeo-Origin-M2: org.apache.jackrabbit: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/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled
new file mode 100644 (file)
index 0000000..b1193c5
--- /dev/null
+++ b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled
@@ -0,0 +1,13 @@
+Argeo-Origin-M2: org.apache.jackrabbit: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/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd
deleted file mode 100644 (file)
index f8d5dec..0000000
--- a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-servlet
-Fragment-Host: org.apache.jackrabbit.core
-Import-Package: org.apache.jackrabbit.rmi.*;resolution:=optional,*

diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled
new file mode 100644 (file)
index 0000000..f8d5dec
--- /dev/null
+++ b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-servlet
+Fragment-Host: org.apache.jackrabbit.core
+Import-Package: org.apache.jackrabbit.rmi.*;resolution:=optional,*

diff --git a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd
new file mode 100644 (file)
index 0000000..7d28b18
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-2.0-only
+Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd
deleted file mode 100644 (file)
index 2c29670..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-codec:commons-codec:1.15

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd
deleted file mode 100644 (file)
index 9e9a654..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-compress:1.22
-Import-Package: \
-org.brotli.*;resolution:=optional,
-org.tukaani.*;resolution:=optional,
-com.github.luben.zstd;resolution:=optional,
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd b/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd
deleted file mode 100644 (file)
index a58ae5b..0000000
--- a/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: CC0-1.0
-Argeo-Origin-M2: org.tukaani:xz:1.9

diff --git a/repackage/org.argeo.tp/com.h2database.bnd b/repackage/org.argeo.tp/com.h2database.bnd
index db8d34fbaa6869ea570274473f4f9e8d6f72e09c..d1086698a2b596c981b064eaade2a6a7a60ad35d 100644 (file)
--- 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/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
deleted file mode 100644 (file)
index 7d28b18..0000000
--- a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: LGPL-2.0-only
-Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
new file mode 100644 (file)
index 0000000..2c29670
--- /dev/null
+++ b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-codec:commons-codec:1.15

diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
new file mode 100644 (file)
index 0000000..9e9a654
--- /dev/null
+++ b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.22
+Import-Package: \
+org.brotli.*;resolution:=optional,
+org.tukaani.*;resolution:=optional,
+com.github.luben.zstd;resolution:=optional,
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.tukaani.xz.bnd b/repackage/org.argeo.tp/org.tukaani.xz.bnd
new file mode 100644 (file)
index 0000000..a58ae5b
--- /dev/null
+++ b/repackage/org.argeo.tp/org.tukaani.xz.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: org.tukaani:xz:1.9

diff --git a/sdk/argeo-build b/sdk/argeo-build
index c8f6d0e6aa4d9a6f24dd4ba4f9ac7878945d6e89..6c0e011bdddc156221a8dfc3bba979446e08deea 160000 (submodule)
--- 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 ee966053d4d745a79bc5c2595c43f087152011c3..ee1f22222181123990fade5b8e6642a2adbb6ac1 100644 (file)
--- a/sdk/output-argeo-tp-rwt.target
+++ b/sdk/output-argeo-tp-rwt.target
@@ -3,6 +3,6 @@
 <target name="argeo-tp-rwt">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
        </locations>
 </target>
\ 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 a0771aea7fb318841ac02efc73e5cd483ec02d80..4d21df8c27429749df9a2fe58ce28edd81ddad9c 100644 (file)
--- a/sdk/output-argeo-tp-swt-win.target
+++ b/sdk/output-argeo-tp-swt-win.target
@@ -4,6 +4,6 @@
        <locations>\r
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>\r
                <location path="${project_loc:argeo-tp}/../output/a2/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>\r
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>\r
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>\r
        </locations>\r
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target
index b667d4791da199335aa94223900478d8f125f753..42b061f54df2a434bdb7c4b295e169e869b08663 100644 (file)
--- a/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@ -4,6 +4,6 @@
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
        </locations>
 </target>
\ No newline at end of file