From 2ac20cf436cf2af997d7f5d70e1e36dcaf9de4b7 Mon Sep 17 00:00:00 2001 From: swoellauer Date: Fri, 3 Mar 2023 09:34:46 +0100 Subject: [PATCH] java dependencies update --- build.gradle | 28 +++++++++++++------------- src/rasterdb/tile/ProcessingFloat.java | 4 ---- src/rasterdb/tile/ProcessingShort.java | 1 - 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 369b69b0..ee380824 100644 --- a/build.gradle +++ b/build.gradle @@ -57,16 +57,16 @@ repositories { } dependencies { - implementation group: 'org.tinylog', name: 'tinylog-impl', version: '2.5.0' - runtimeOnly group: 'org.tinylog', name: 'slf4j-tinylog', version: '2.5.0' + implementation group: 'org.tinylog', name: 'tinylog-impl', version: '2.6.0' + runtimeOnly group: 'org.tinylog', name: 'slf4j-tinylog', version: '2.6.0' implementation group: 'org.mapdb', name: 'mapdb', version: '2.0-beta13' // warning: newer versions v3 do break storage layout - implementation group: 'org.json', name: 'json', version: '20220924' - implementation group: 'org.yaml', name: 'snakeyaml', version: '1.33' + implementation group: 'org.json', name: 'json', version: '20230227' + implementation group: 'org.yaml', name: 'snakeyaml', version: '1.33' // TODO: check compatibility with newer version 2 //implementation group: 'com.opencsv', name: 'opencsv', version: '4.6' // warning: API at v5.0 breaks implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1' - implementation group: 'com.github.mreutegg', name: 'laszip4j', version: '0.11' + implementation group: 'com.github.mreutegg', name: 'laszip4j', version: '0.12' implementation group: 'ar.com.hjg', name: 'pngj', version: '2.1.0' implementation group: 'com.samskivert', name: 'jmustache', version: '1.15' @@ -74,18 +74,18 @@ dependencies { implementation group: 'com.mkobos', name: 'pca_transform', version: '1.0.2' implementation group: 'com.googlecode.javaewah', name: 'JavaEWAH', version: '1.1.13' - implementation group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.8.4' // caution: newer versions may break storage layout (last tested: 1.1.7.7) + implementation group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.9.1' // caution: newer versions may break storage layout (last tested: 1.1.7.7) implementation group: 'me.lemire.integercompression', name: 'JavaFastPFOR', version: '0.1.11' // data format changed from 0.1.11 to 0.1.12 implementation group: 'me.lemire.integercompression', name: 'JavaFastPFOR', version: '0.1.12' // caution: newer versions may break storage layout - implementation group: 'com.github.luben', name: 'zstd-jni', version: '1.5.2-5' // caution: newer versions may break storage layout (last tested: 1.4.5-6) + implementation group: 'com.github.luben', name: 'zstd-jni', version: '1.5.4-2' // caution: newer versions may break storage layout (last tested: 1.4.5-6) implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.3' // caution: newer versions may break with generated DSL Java source files - implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.13' - implementation group: 'org.eclipse.jetty', name: 'jetty-security', version: '11.0.13' - implementation group: 'org.eclipse.jetty.http2', name: 'http2-server', version: '11.0.13' - implementation group: 'org.eclipse.jetty', name: 'jetty-alpn-java-server', version: '11.0.13' - implementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '11.0.13' + implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.14' + implementation group: 'org.eclipse.jetty', name: 'jetty-security', version: '11.0.14' + implementation group: 'org.eclipse.jetty.http2', name: 'http2-server', version: '11.0.14' + implementation group: 'org.eclipse.jetty', name: 'jetty-alpn-java-server', version: '11.0.14' + implementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '11.0.14' implementation 'io.jsonwebtoken:jjwt-api:0.11.5' runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' @@ -93,8 +93,8 @@ dependencies { compileOnly group: 'org.gdal', name: 'gdal', version: '2.2.0' // compileOnly because gdal library from executing system is needed; caution: newer versions may break compatibility implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0' - implementation group: 'org.locationtech.proj4j', name: 'proj4j', version: '1.2.2' - implementation group: 'org.locationtech.proj4j', name: 'proj4j-epsg', version: '1.2.2' + implementation group: 'org.locationtech.proj4j', name: 'proj4j', version: '1.2.3' + implementation group: 'org.locationtech.proj4j', name: 'proj4j-epsg', version: '1.2.3' //implementation group: 'org.imintel', name: 'mbtiles4j', version: '1.0.6' // mbtiles currently not used diff --git a/src/rasterdb/tile/ProcessingFloat.java b/src/rasterdb/tile/ProcessingFloat.java index f28a0bea..2a591fbd 100644 --- a/src/rasterdb/tile/ProcessingFloat.java +++ b/src/rasterdb/tile/ProcessingFloat.java @@ -4,9 +4,6 @@ import java.util.Arrays; import java.util.Collection; - -import org.tinylog.Logger; - import rasterdb.Band; import rasterdb.tile.Processing.Commiter; import rasterunit.BandKey; @@ -18,7 +15,6 @@ public class ProcessingFloat { - public static float[][] readPixels(int div, RasterUnitStorage pyramid_rasterUnit, int t, Band band, Range2d pixelRange) { switch(div) { case 1: diff --git a/src/rasterdb/tile/ProcessingShort.java b/src/rasterdb/tile/ProcessingShort.java index 30255c2d..b89f5de2 100644 --- a/src/rasterdb/tile/ProcessingShort.java +++ b/src/rasterdb/tile/ProcessingShort.java @@ -14,7 +14,6 @@ import util.Range2d; public class ProcessingShort { - // public static short[][] readPixels(int div, RasterUnitStorage pyramid_rasterUnit, int t, Band band, Range2d pixelRange) { switch(div) {