From 189ab2acab61f242d49711c3b79ca1f404a8eb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20Heikkil=C3=A4?= Date: Fri, 26 Jun 2026 15:16:09 +0000 Subject: [PATCH] build(deps): bump GeoTools 35 and align library versions Update to GeoTools 35.0 and align supporting dependencies to their latest stable releases: - geotools 34.2 -> 35.0 - slf4j-api 1.7.25 -> 2.0.18 - HikariCP 4.0.3 -> 7.1.0 - caffeine 2.9.3 -> 3.2.4 - sqlite-jdbc 3.47.0.0 -> 3.53.2.0 - log4j 2.25.4 -> 2.26.0 SLF4J 2.x requires the slf4j2 Log4j binding, so swap log4j-slf4j-impl -> log4j-slf4j2-impl in the root, telemetry, and webapp-jakarta poms. Update CHANGELOG.md and docs/overview/modules.md to match. --- CHANGELOG.md | 7 ++++++- docs/overview/modules.md | 12 ++++++------ pom.xml | 17 +++++++++++------ src/hakunapi-gpkg/pom.xml | 2 +- src/hakunapi-telemetry/pom.xml | 2 +- .../hakunapi-simple-webapp-jakarta/pom.xml | 2 +- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c34f066..30b913af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,12 @@ For a full list of changes see: https://github.com/nlsfi/hakunapi/milestone/17 ### Library updates - `org.postgresql:postgresql` 42.7.10 → 42.7.11 -- `org.apache.logging.log4j:log4j-core` 2.25.3 → 2.25.4 +- `org.apache.logging.log4j:log4j-core` 2.25.3 → 2.26.0 +- `org.geotools` 34.2 → 35.0 +- `org.slf4j:slf4j-api` 1.7.25 → 2.0.18 (log4j binding switched `log4j-slf4j-impl` → `log4j-slf4j2-impl`) +- `com.zaxxer:HikariCP` 4.0.3 → 7.1.0 +- `com.github.ben-manes.caffeine:caffeine` 2.9.3 → 3.2.4 +- `org.xerial:sqlite-jdbc` 3.47.0.0 → 3.53.2.0 ## < 1.7.1 diff --git a/docs/overview/modules.md b/docs/overview/modules.md index 7eb4d114..f79f00ac 100644 --- a/docs/overview/modules.md +++ b/docs/overview/modules.md @@ -72,30 +72,30 @@ The table below lists all direct third-party dependencies declared in the Hakuna | Library | Version | Purpose | Notes | | --- | --- | --- | --- | | JTS Topology Suite | 1.20.0 | Geometry model, spatial predicates | | -| GeoTools | 34.2 | proj-gt: `gt-epsg-hsql` provides EPSG CRS database (HSQL-backed) for CRS definitions and reprojection | **To consider:** hakunapi-proj-proj (PROJ) [Issue #143](https://github.com/nlsfi/hakunapi/issues/143) to replace hakunapi-proj-gt for CRS definitions and reprojection? | +| GeoTools | 35.0 | proj-gt: `gt-epsg-hsql` provides EPSG CRS database (HSQL-backed) for CRS definitions and reprojection | **To consider:** hakunapi-proj-proj (PROJ) [Issue #143](https://github.com/nlsfi/hakunapi/issues/143) to replace hakunapi-proj-gt for CRS definitions and reprojection? | #### Database connectivity | Library | Version | Purpose | Notes | | --- | --- | --- | --- | -| HikariCP | 4.0.3 | JDBC connection pool | 4.0.3 is the last Java 8 release; current line is **7.x** | +| HikariCP | 7.1.0 | JDBC connection pool | | | PostgreSQL JDBC | 42.7.11 | PostgreSQL / PostGIS JDBC driver for source-postgis | Try to stay up to date | -| SQLite JDBC | 3.47.0.0 | SQLite JDBC for reading GeoPackage files for source-gpkg | | +| SQLite JDBC | 3.53.2.0 | SQLite JDBC for reading GeoPackage files for source-gpkg | | #### Output formats and parsing | Library | Version | Purpose | Notes | | --- | --- | --- | --- | | FreeMarker | 2.3.33 | HTML template engine for HTML outputs | | -| Caffeine | 2.9.3 | In-memory caching | Caffeine **3.x** targets Java 11+; no known reason to stay on 2.9. | +| Caffeine | 3.2.4 | In-memory caching | | | ANTLR 4 runtime | 4.13.2 | Runtime for the ANTLR-generated CQL2 parser | | #### Logging and telemetry | Library | Version | Purpose | Notes | | --- | --- | --- | --- | -| SLF4J | 1.7.25 | Logging facade | SLF4J **2.x** is the current line (and Log4j 2.25 supports it.) | -| Log4j 2 | 2.25.4 | Logging implementation: API, core, SLF4J bridge, and Jakarta servlet lifecycle integration | | +| SLF4J | 2.0.18 | Logging facade | | +| Log4j 2 | 2.26.0 | Logging implementation: API, core, SLF4J 2 bridge (`log4j-slf4j2-impl`), and Jakarta servlet lifecycle integration | | #### Testing diff --git a/pom.xml b/pom.xml index dd8008fd..4eb71002 100644 --- a/pom.xml +++ b/pom.xml @@ -44,16 +44,16 @@ 2.21 2.2.42 1.20.0 - 4.0.3 - 1.7.25 - 2.25.4 + 7.1.0 + 2.0.18 + 2.26.0 42.7.11 - 34.2 + 35.0 4.13.2 4.11.0 2.9.1 2.9.0 - 2.9.3 + 3.2.4 UTF-8 21 ${java.version} @@ -206,7 +206,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j.version} @@ -238,6 +238,11 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + org.apache.maven.plugins maven-war-plugin diff --git a/src/hakunapi-gpkg/pom.xml b/src/hakunapi-gpkg/pom.xml index 06b93daa..40fea717 100644 --- a/src/hakunapi-gpkg/pom.xml +++ b/src/hakunapi-gpkg/pom.xml @@ -9,7 +9,7 @@ hakunapi-gpkg - 3.47.0.0 + 3.53.2.0 diff --git a/src/hakunapi-telemetry/pom.xml b/src/hakunapi-telemetry/pom.xml index 27872a0f..5642bc53 100644 --- a/src/hakunapi-telemetry/pom.xml +++ b/src/hakunapi-telemetry/pom.xml @@ -22,7 +22,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test diff --git a/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml index 7b5da440..3df3a558 100644 --- a/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml +++ b/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.apache.logging.log4j