From 2bc0f303c5803076ff6a9879a510823444fd3814 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Sat, 19 Nov 2022 08:28:19 +0100 Subject: [PATCH] Improve and extend SQL support --- repackage/org.argeo.tp.gis/h2gis/common.bnd | 2 ++ repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd | 1 + repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd | 2 ++ .../org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd | 2 ++ repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd | 1 + repackage/org.argeo.tp.gis/org.cts.bnd | 3 +++ .../org.argeo.tp.gis/org.locationtech.spatial4j.bnd | 5 +++++ repackage/org.argeo.tp.gis/org.poly2tri.bnd | 2 ++ repackage/org.argeo.tp.gis/postgis/common.bnd | 3 +++ repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd | 1 + .../postgis/net.postgis.jdbc.geometry.bnd | 1 + .../org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd | 1 + .../org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd | 1 + repackage/org.argeo.tp.sql/org.h2.bnd | 9 +++++++-- repackage/org.argeo.tp.sql/org.postgresql.bnd | 8 ++++++++ repackage/org.argeo.tp.sql/org.postgresql.jdbc42.bnd | 4 ---- 16 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 repackage/org.argeo.tp.gis/h2gis/common.bnd create mode 100644 repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd create mode 100644 repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd create mode 100644 repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd create mode 100644 repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd create mode 100644 repackage/org.argeo.tp.gis/org.cts.bnd create mode 100644 repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd create mode 100644 repackage/org.argeo.tp.gis/org.poly2tri.bnd create mode 100644 repackage/org.argeo.tp.gis/postgis/common.bnd create mode 100644 repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd create mode 100644 repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd create mode 100644 repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd create mode 100644 repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd create mode 100644 repackage/org.argeo.tp.sql/org.postgresql.bnd delete mode 100644 repackage/org.argeo.tp.sql/org.postgresql.jdbc42.bnd diff --git a/repackage/org.argeo.tp.gis/h2gis/common.bnd b/repackage/org.argeo.tp.gis/h2gis/common.bnd new file mode 100644 index 0000000..52b4af1 --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: LGPL-3.0-or-later +SLC-Origin-M2: :2.1.0 diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd new file mode 100644 index 0000000..f343ffd --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.orbisgis:h2gis-api \ 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 new file mode 100644 index 0000000..ec85e3a --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.orbisgis:h2gis +Fragment-Host: org.h2 \ 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 new file mode 100644 index 0000000..b15c334 --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.orbisgis:postgis-jts +Fragment-Host: org.h2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd new file mode 100644 index 0000000..4f7d45d --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.orbisgis:h2gis-utilities \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.cts.bnd b/repackage/org.argeo.tp.gis/org.cts.bnd new file mode 100644 index 0000000..c535e54 --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.cts.bnd @@ -0,0 +1,3 @@ +Bundle-License: LGPL-3.0-or-later +SLC-Origin-M2: org.orbisgis:cts:1.6.0 +# 1.6.0 sources are missing in Maven central diff --git a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd new file mode 100644 index 0000000..46c5d8e --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8 +Import-Package:\ +org.noggit;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.poly2tri.bnd b/repackage/org.argeo.tp.gis/org.poly2tri.bnd new file mode 100644 index 0000000..7972450 --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.poly2tri.bnd @@ -0,0 +1,2 @@ +Bundle-License: BSD-3-Clause +SLC-Origin-M2: org.orbisgis:poly2tri:0.4.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/common.bnd b/repackage/org.argeo.tp.gis/postgis/common.bnd new file mode 100644 index 0000000..f49155e --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: LGPL-2.1-only +SLC-Origin-M2: :2021.1.0 +Export-Package: net.postgis.* \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd new file mode 100644 index 0000000..e373a7b --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd new file mode 100644 index 0000000..92b8f63 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-geometry \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd new file mode 100644 index 0000000..03dd804 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc-java2d \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd new file mode 100644 index 0000000..7329fa0 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc-jts \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.h2.bnd b/repackage/org.argeo.tp.sql/org.h2.bnd index a6090fa..3068392 100644 --- a/repackage/org.argeo.tp.sql/org.h2.bnd +++ b/repackage/org.argeo.tp.sql/org.h2.bnd @@ -1,4 +1,9 @@ Bundle-License: MPL-2.0 Bundle-SymbolicName: org.h2 -SLC-Origin-M2: com.h2database:h2:1.4.200 -SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: com.h2database:h2:2.1.214 +Import-Package:\ +jakarta.*;resolution:=optional,\ +org.apache.lucene.*;resolution:=optional,\ +org.codehaus.groovy.*;resolution:=optional,\ +org.osgi.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.postgresql.bnd b/repackage/org.argeo.tp.sql/org.postgresql.bnd new file mode 100644 index 0000000..6e68b97 --- /dev/null +++ b/repackage/org.argeo.tp.sql/org.postgresql.bnd @@ -0,0 +1,8 @@ +Bundle-License: BSD-2-Clause +SLC-Origin-M2: org.postgresql:postgresql:42.5.0 +Import-Package:\ +org.osgi.service.jdbc;resolution:="optional",\ +com.sun.jna.*;resolution:="optional",\ +org.checkerframework.*;resolution:="optional",\ +waffle.*;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.postgresql.jdbc42.bnd b/repackage/org.argeo.tp.sql/org.postgresql.jdbc42.bnd deleted file mode 100644 index adb6e82..0000000 --- a/repackage/org.argeo.tp.sql/org.postgresql.jdbc42.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: BSD-2-Clause -Bundle-SymbolicName: org.postgresql.jdbc42 -SLC-Origin-M2: org.postgresql:postgresql:42.5.0 -SLC-Origin-ManifestNotModified: true -- 2.30.2