diff --git a/build.gradle b/build.gradle index bfb420f..ee6cca8 100755 --- a/build.gradle +++ b/build.gradle @@ -38,9 +38,9 @@ repositories { dependencies { implementation group: 'net.java.dev.jna', name: 'jna', version: '5.13.0' - implementation files("libs/gdal-3.5.3.jar", - "libs/gdal-3.5.3-javadoc.jar", - "libs/gdal-3.5.3-sources.jar" + implementation files("libs/gdal-3.6.4.jar", + "libs/gdal-3.6.4-javadoc.jar", + "libs/gdal-3.6.4-sources.jar" ) } diff --git a/libs/gdal-3.5.3-javadoc.jar b/libs/gdal-3.5.3-javadoc.jar deleted file mode 100644 index 9da612a..0000000 --- a/libs/gdal-3.5.3-javadoc.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ed5ed3c3d361c90a662a59da4bfac0e43c0168a9a8040adfea9ed24147a0639 -size 923453 diff --git a/libs/gdal-3.5.3-sources.jar b/libs/gdal-3.5.3-sources.jar deleted file mode 100644 index f8da098..0000000 --- a/libs/gdal-3.5.3-sources.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d56a33df9e66d908185e123aae8f90f4e0578f1e754defe7925b6a1bb9547877 -size 107664 diff --git a/libs/gdal-3.5.3.jar b/libs/gdal-3.5.3.jar deleted file mode 100644 index 5306b57..0000000 --- a/libs/gdal-3.5.3.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91746000411adb6d1d6d50506c5c1b16cbb879d9177bfecf15eb895d260fe563 -size 178287 diff --git a/libs/gdal-3.6.4-javadoc.jar b/libs/gdal-3.6.4-javadoc.jar new file mode 100644 index 0000000..bda7a5f --- /dev/null +++ b/libs/gdal-3.6.4-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66d6c455335bae6a2a8f1c3674c85b0e53427772488d4d2d68503c8054b645c1 +size 963367 diff --git a/libs/gdal-3.6.4-sources.jar b/libs/gdal-3.6.4-sources.jar new file mode 100644 index 0000000..1092c20 --- /dev/null +++ b/libs/gdal-3.6.4-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5484b381b75c9ac20573899ceceb4be24a1d20fa8ea87accbb8947f73d324886 +size 111088 diff --git a/libs/gdal-3.6.4.jar b/libs/gdal-3.6.4.jar new file mode 100644 index 0000000..e52e161 --- /dev/null +++ b/libs/gdal-3.6.4.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d38be76d38a5ba695854bac4f4d886bb0f56554845270e5e105cad24fc54ef8 +size 185888 diff --git a/scripts/generate_native_modules.sh b/scripts/generate_native_modules.sh index fb567c5..12818a9 100755 --- a/scripts/generate_native_modules.sh +++ b/scripts/generate_native_modules.sh @@ -15,22 +15,20 @@ esac export SCRIPT_DIR -PROJ_VERSION="9.1.1" -GDAL_VERSION="3.5.3" +PROJ_VERSION="9.2.1" +GDAL_VERSION="3.6.4" # Build GDAL "${SCRIPT_DIR}/build_gdal.sh" $PROJ_VERSION $GDAL_VERSION -docker run -it --entrypoint /bin/bash -u $(id -u):$(id -g) \ - -v $(pwd)/libs:/java_libs \ +docker run -it --entrypoint /bin/bash -v $(pwd)/libs:/java_libs \ qartez-engine/gdal:"$GDAL_VERSION" -c "cp /usr/share/java/gdal-*.jar /java_libs/" # Build lddtopo "${SCRIPT_DIR}/build_lddtopo.sh" $GDAL_VERSION # Analyze dependencies, build DAG, run toposort and copy them to /resource folder -docker run -u $(id -u):$(id -g) \ - -v $(pwd)/src/main/resources/:/resources qartez-engine/lddtopo:"$GDAL_VERSION" /usr/share/java/libgdalalljni.so /resources +docker run -v $(pwd)/src/main/resources/:/resources qartez-engine/lddtopo:"$GDAL_VERSION" /usr/share/java/libgdalalljni.so /resources # Build and test GDAL native library lib_name=$(./gradlew properties | grep ^name | sed 's/name: //g') diff --git a/src/main/resources/native/linux-x86-64.txt b/src/main/resources/native/linux-x86-64.txt index 199dd27..ad89763 100644 --- a/src/main/resources/native/linux-x86-64.txt +++ b/src/main/resources/native/linux-x86-64.txt @@ -1,64 +1,64 @@ libicudata.so.66 libkeyutils.so.1 +libnettle.so.7 +liblber-2.4.so.2 +libbrotlicommon.so.1 +libjpeg.so.8 +libbrotlidec.so.1 libffi.so.7 +libjbig.so.0 libgmp.so.10 -libnghttp2.so.14 +libhogweed.so.5 +libtasn1.so.6 +libresolv.so.2 +libz.so.1 +libpng16.so.16 +liblzma.so.5 libwebp.so.6 -libopenjp2.so.7 -libfreexl.so.1 +libheimbase.so.1 +libcom_err.so.2 +libnghttp2.so.14 +libexpat.so.1 libcrypt.so.1 -libbrotlicommon.so.1 +libgcc_s.so.1 libunistring.so.2 libidn2.so.0 libpsl.so.5 -libjbig.so.0 -libtasn1.so.6 -libresolv.so.2 +libfreexl.so.1 libroken.so.18 -libnettle.so.7 -libhogweed.so.5 -libbrotlidec.so.1 +libwind.so.0 +libasn1.so.8 libdl.so.2 -libkrb5support.so.0 -libk5crypto.so.3 libsqlite3.so.0 -liblzma.so.5 -libgcc_s.so.1 -libsasl2.so.2 -libzstd.so.1 libp11-kit.so.0 libgnutls.so.30 -liblber-2.4.so.2 +librtmp.so.1 libcrypto.so.1.1 libssl.so.1.1 -libexpat.so.1 -libjpeg.so.8 -libcom_err.so.2 -libwind.so.0 -libasn1.so.8 +libkrb5support.so.0 +libk5crypto.so.3 libkrb5.so.3 -libheimbase.so.1 +libgssapi_krb5.so.2 +libssh.so.4 libhcrypto.so.4 libhx509.so.5 +libsasl2.so.2 +libopenjp2.so.7 libkrb5.so.26 +libzstd.so.1 +libtiff.so.5 libheimntlm.so.0 libgssapi.so.3 libldap_r-2.4.so.2 -libz.so.1 -libpng16.so.16 -librtmp.so.1 -libtiff.so.5 -libgssapi_krb5.so.2 libpq.so.5 -libssh.so.4 libcurl-gnutls.so.4 +libproj.so.15 libicuuc.so.66 libxml2.so.2 -libproj.so.15 -libxerces-c-3.2.so libgeos-3.8.0.so libgeos_c.so.1 libspatialite.so.7 libproj.so.25 -libgdal.so.31 +libxerces-c-3.2.so +libgdal.so.32 libgdalalljni.so diff --git a/src/main/resources/native/linux-x86-64/libasn1.so.8 b/src/main/resources/native/linux-x86-64/libasn1.so.8 index 385822f..f21b413 100644 --- a/src/main/resources/native/linux-x86-64/libasn1.so.8 +++ b/src/main/resources/native/linux-x86-64/libasn1.so.8 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f6e166d003b6d5371e947d855d45eed01f208bcd3af76c83b859d75e5551cea -size 678240 +oid sha256:7568bad0b3c38d1cd0cc044de98c3a581b718519244a3c2197700148badfb117 +size 674144 diff --git a/src/main/resources/native/linux-x86-64/libcrypto.so.1.1 b/src/main/resources/native/linux-x86-64/libcrypto.so.1.1 index cd2d8b4..c830c15 100644 --- a/src/main/resources/native/linux-x86-64/libcrypto.so.1.1 +++ b/src/main/resources/native/linux-x86-64/libcrypto.so.1.1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d578cd7f55befe0e0db7321bfdcd39878e03e85240e32ecdece6d3637f990f49 +oid sha256:10ded5098f3d4554a29afd29980d3fe78256f2f68237c74bdfe0a84f62f5d1a1 size 2954080 diff --git a/src/main/resources/native/linux-x86-64/libcurl-gnutls.so.4 b/src/main/resources/native/linux-x86-64/libcurl-gnutls.so.4 index 7a8f382..4fe1e7b 100644 --- a/src/main/resources/native/linux-x86-64/libcurl-gnutls.so.4 +++ b/src/main/resources/native/linux-x86-64/libcurl-gnutls.so.4 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b79b0ec3bc2edec665be3fc523514b553ba828185a951b5260bbabc652840375 +oid sha256:579c08a4d73f3d8d368f0a62b3df3b52efa3b6d0b36d3051ea46dfab182f7b15 size 584312 diff --git a/src/main/resources/native/linux-x86-64/libgcc_s.so.1 b/src/main/resources/native/linux-x86-64/libgcc_s.so.1 index 873cea3..79e3147 100644 --- a/src/main/resources/native/linux-x86-64/libgcc_s.so.1 +++ b/src/main/resources/native/linux-x86-64/libgcc_s.so.1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63eb91b5d726e401c5affb2a035e175c374cae75cdf25a1f9b007c3e79328100 +oid sha256:489803ded8a4d803e2c792763a2767c12185f5764b7bba080742d14ef2452b27 size 104984 diff --git a/src/main/resources/native/linux-x86-64/libgdal.so.31 b/src/main/resources/native/linux-x86-64/libgdal.so.31 deleted file mode 100644 index c1ac124..0000000 --- a/src/main/resources/native/linux-x86-64/libgdal.so.31 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1e3a740831b461a3df39d8a20209447b9a2def611df07e9b8da593c7ab32d39 -size 22177472 diff --git a/src/main/resources/native/linux-x86-64/libgdal.so.32 b/src/main/resources/native/linux-x86-64/libgdal.so.32 new file mode 100644 index 0000000..13b449c --- /dev/null +++ b/src/main/resources/native/linux-x86-64/libgdal.so.32 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bd5559941a0bb095c0de2b0d5fd918fd1ea0d231c6a070f42d9b33521165dec +size 22952320 diff --git a/src/main/resources/native/linux-x86-64/libgdalalljni.so b/src/main/resources/native/linux-x86-64/libgdalalljni.so index 2ca6c20..447ac70 100644 --- a/src/main/resources/native/linux-x86-64/libgdalalljni.so +++ b/src/main/resources/native/linux-x86-64/libgdalalljni.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28fcb34ff8eff20ff791f31c9d6a03b29bba4ad0a8fc5e4de9b58d2bf35d608b -size 835360 +oid sha256:fde3e8a1e87ccc2ae86bf97d4cd0b4242b82b3b6d35577ec200499b8f518c04a +size 890304 diff --git a/src/main/resources/native/linux-x86-64/libgnutls.so.30 b/src/main/resources/native/linux-x86-64/libgnutls.so.30 index 4e94c41..5832cf9 100644 --- a/src/main/resources/native/linux-x86-64/libgnutls.so.30 +++ b/src/main/resources/native/linux-x86-64/libgnutls.so.30 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08a81f73f855daf6f05a67d81e132cbe5bd70145abf54c68f01023e9f23e6d4f +oid sha256:b75e1d5d4de43be86bef8a6865719cae1ea3226b38ba5d2fb90689d97cfb92fe size 1914336 diff --git a/src/main/resources/native/linux-x86-64/libgssapi.so.3 b/src/main/resources/native/linux-x86-64/libgssapi.so.3 index 752f8cf..17eccc1 100644 --- a/src/main/resources/native/linux-x86-64/libgssapi.so.3 +++ b/src/main/resources/native/linux-x86-64/libgssapi.so.3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9ae9bf8c7daac82c6a71cdd8962ceb01bb203e5ddb22f827da5b414937c1555 +oid sha256:db2df4963e32fed7fa52659be383b4e46099aabf8268e69f08a2e1dd2891e79b size 278160 diff --git a/src/main/resources/native/linux-x86-64/libgssapi_krb5.so.2 b/src/main/resources/native/linux-x86-64/libgssapi_krb5.so.2 index 2843fb7..1249fd1 100644 --- a/src/main/resources/native/linux-x86-64/libgssapi_krb5.so.2 +++ b/src/main/resources/native/linux-x86-64/libgssapi_krb5.so.2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3185d7fd0b978eaf709321c49eb75e5b3f2e0f23b2367012698a23fdbb0d6e3f +oid sha256:1f5f64195c47843a7cce577a1f81d9bcb882d63d6b4ffe67624fd563be6df554 size 309712 diff --git a/src/main/resources/native/linux-x86-64/libhx509.so.5 b/src/main/resources/native/linux-x86-64/libhx509.so.5 index 98187ee..5d8f310 100644 --- a/src/main/resources/native/linux-x86-64/libhx509.so.5 +++ b/src/main/resources/native/linux-x86-64/libhx509.so.5 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d9bfc4eb45c80d138cc121ec422d1bcbd087e3180a68879f991635d42f0c334 +oid sha256:ae29acaa296cb14fe91771c08ad7c659a07383545173af964525ce10a35fc7ee size 313336 diff --git a/src/main/resources/native/linux-x86-64/libk5crypto.so.3 b/src/main/resources/native/linux-x86-64/libk5crypto.so.3 index 1b8d95a..bbd6a96 100644 --- a/src/main/resources/native/linux-x86-64/libk5crypto.so.3 +++ b/src/main/resources/native/linux-x86-64/libk5crypto.so.3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f7ed7886b1e9c843ec0186a680f95ade740339b9580e0f4f8d163ca83822694 +oid sha256:8b1fbf5a6eaadcec4aae227588c98c3967bf0e426cadfa8af7df5069f9bbc11a size 191040 diff --git a/src/main/resources/native/linux-x86-64/libkrb5.so.26 b/src/main/resources/native/linux-x86-64/libkrb5.so.26 index 4aa8d3a..93dda41 100644 --- a/src/main/resources/native/linux-x86-64/libkrb5.so.26 +++ b/src/main/resources/native/linux-x86-64/libkrb5.so.26 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0e4704d24e9ee3828c82aee3f87993f4b7fb292f38f8e0012d7ecc42d842e2e +oid sha256:a7f13b15b979a6cccbb193bf0a749328cba052b8f392a4c3943030381835b858 size 594104 diff --git a/src/main/resources/native/linux-x86-64/libkrb5.so.3 b/src/main/resources/native/linux-x86-64/libkrb5.so.3 index 326aa67..7adf686 100644 --- a/src/main/resources/native/linux-x86-64/libkrb5.so.3 +++ b/src/main/resources/native/linux-x86-64/libkrb5.so.3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efcfdff7cde036e211aad912b5eeadf28558b303a73377177f37e50dfddac4d6 +oid sha256:3935a4c1d0852db8a2dbec2a4c4dde4f814dcda883f4c011b843b4d9d7babf14 size 902016 diff --git a/src/main/resources/native/linux-x86-64/libkrb5support.so.0 b/src/main/resources/native/linux-x86-64/libkrb5support.so.0 index 9d65920..5e30dd1 100644 --- a/src/main/resources/native/linux-x86-64/libkrb5support.so.0 +++ b/src/main/resources/native/linux-x86-64/libkrb5support.so.0 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deb7549ff67e32fa804f28681346660ab3020cc6f44f7c144cbd14f7bf72ac91 +oid sha256:5d100fc777f06a83d4a360f9e58ce980f57dea80d6b3e183d418c1fdbf44566c size 56096 diff --git a/src/main/resources/native/linux-x86-64/libnghttp2.so.14 b/src/main/resources/native/linux-x86-64/libnghttp2.so.14 index b7f93d8..2d486eb 100644 --- a/src/main/resources/native/linux-x86-64/libnghttp2.so.14 +++ b/src/main/resources/native/linux-x86-64/libnghttp2.so.14 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35a897be91d8891336dcd974cb061f11a956c33f8dfc39e4207afc367f170846 +oid sha256:c118460ed9eaeb5617f3507936f3b5aff2b7d25d61bfd3d052fa475016d349d0 size 162160 diff --git a/src/main/resources/native/linux-x86-64/libpq.so.5 b/src/main/resources/native/linux-x86-64/libpq.so.5 index be4e026..2e46b15 100644 --- a/src/main/resources/native/linux-x86-64/libpq.so.5 +++ b/src/main/resources/native/linux-x86-64/libpq.so.5 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e926f99dac11dd91fc42dfaec84df03efe5573ef47e3dc911628586db68787c2 +oid sha256:f12da2fd0890c62e85be788337fbc75fdca4622cb350c083a42dba93339e4449 size 321672 diff --git a/src/main/resources/native/linux-x86-64/libproj.so.25 b/src/main/resources/native/linux-x86-64/libproj.so.25 index 35fcf67..102a9fc 100644 --- a/src/main/resources/native/linux-x86-64/libproj.so.25 +++ b/src/main/resources/native/linux-x86-64/libproj.so.25 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3cd310e8f6d90abc78606f7b36c9dd3bc16be91ff5b98161687b66087ad67ba -size 4259720 +oid sha256:6f1e920a45ef55e21ee238f04ddc57187f92fef681dea6bbb3ffb7ac0d276381 +size 4366344 diff --git a/src/main/resources/native/linux-x86-64/libssh.so.4 b/src/main/resources/native/linux-x86-64/libssh.so.4 index 6e2ea92..b276991 100644 --- a/src/main/resources/native/linux-x86-64/libssh.so.4 +++ b/src/main/resources/native/linux-x86-64/libssh.so.4 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc72b09a0c210ddd8eae996197fdcf50e5e00f22dd58026c989c9ad7e2bb5bbb +oid sha256:aa8e47226216a1b33cd0eea292c235ddd657b68b1f8e7874e710b8fe835e446d size 445976 diff --git a/src/main/resources/native/linux-x86-64/libssl.so.1.1 b/src/main/resources/native/linux-x86-64/libssl.so.1.1 index 5ae2b7c..a48ff18 100644 --- a/src/main/resources/native/linux-x86-64/libssl.so.1.1 +++ b/src/main/resources/native/linux-x86-64/libssl.so.1.1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:578d2f9a8b4f7fb91d714776b548aad74d26bd7a03f011c0abb47e85f19ce7dd +oid sha256:1ca2187b0f2f018b59731583fd49c2dd3eb03e2045eb1b574b675a61c871ac53 size 598104 diff --git a/src/main/resources/native/linux-x86-64/libtiff.so.5 b/src/main/resources/native/linux-x86-64/libtiff.so.5 index a7b30e0..2f64ef4 100644 --- a/src/main/resources/native/linux-x86-64/libtiff.so.5 +++ b/src/main/resources/native/linux-x86-64/libtiff.so.5 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3bd190a007be3149f3a349d443c35e6071bf0e58474ea05ed8ec25e50999b4b +oid sha256:98939e48f9012fd9b4ad52a9c91a5ac192c9c1a72e5f0093cf555c6d86e266e0 size 522936 diff --git a/src/main/resources/native/linux-x86-64/libwebp.so.6 b/src/main/resources/native/linux-x86-64/libwebp.so.6 index 3b77eba..af130e6 100644 --- a/src/main/resources/native/linux-x86-64/libwebp.so.6 +++ b/src/main/resources/native/linux-x86-64/libwebp.so.6 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60aca2154ee5672091109d9b0797690eab5100ab8ade4238b758aa1e0935b74e +oid sha256:6e09045e383d99297c4d219c53bd9e9a792641ca1a8e5f1838ae42ddcfb7d995 size 420376 diff --git a/src/main/resources/native/linux-x86-64/libxml2.so.2 b/src/main/resources/native/linux-x86-64/libxml2.so.2 index 8bb03fc..e99090a 100644 --- a/src/main/resources/native/linux-x86-64/libxml2.so.2 +++ b/src/main/resources/native/linux-x86-64/libxml2.so.2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b16068dbc16fe07401afd3f45cdc42431440d30fd01a42dc45642f39ffb7261 +oid sha256:91ade4e97d9c702617e4448c0325f98873b394ac4f42b65cea5ebd08238d1623 size 1799408 diff --git a/src/main/resources/proj/proj.db b/src/main/resources/proj/proj.db index 4901f62..c2a311b 100644 --- a/src/main/resources/proj/proj.db +++ b/src/main/resources/proj/proj.db @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da051c20522043a049a965a90f2c96914ecdba3a64d99068f3bc46e18dab68c3 -size 8282112 +oid sha256:e661e8f9e9b8f99ed045f55548db64124569700182146b21bc69daa4b4b6f5fd +size 8544256