From 4a46a5180c01cefc6ce3c60aeafacd478062a86c Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Mon, 9 Mar 2026 20:21:46 -0400 Subject: [PATCH 1/4] Bump Zookeeper to 3.9.5 * Remove GeoServer-specific versioning in gs-plugins --- build/dependencies.txt | 7 +-- docs/user/upgrade/6.0.0.rst | 2 +- .../geomesa-archetypes-gs-plugin/pom.xml | 50 ++++++------------- pom.xml | 2 +- 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/build/dependencies.txt b/build/dependencies.txt index 0e988162588..4333ba93e9c 100644 --- a/build/dependencies.txt +++ b/build/dependencies.txt @@ -169,8 +169,8 @@ org.apache.thrift:libthrift:0.17.0:compile org.apache.xml:xml-commons-resolver:1.2:compile org.apache.yetus:audience-annotations:0.12.0:compile org.apache.yetus:audience-annotations:0.13.0:compile -org.apache.zookeeper:zookeeper-jute:3.9.4:compile -org.apache.zookeeper:zookeeper:3.9.4:compile +org.apache.zookeeper:zookeeper-jute:3.9.5:compile +org.apache.zookeeper:zookeeper:3.9.5:compile org.apiguardian:apiguardian-api:1.1.2:compile org.calrissian.mango:mango-core:3.0.0:compile org.checkerframework:checker-qual:2.5.2:compile @@ -305,7 +305,6 @@ com.github.pjfanning:jersey-json:1.22.0:provided com.github.stephenc.jcip:jcip-annotations:1.0-1:provided com.google.code.findbugs:jsr305:3.0.2:provided com.google.crypto.tink:tink:1.9.0:provided -com.google.errorprone:error_prone_annotations:2.36.0:provided com.google.inject.extensions:guice-servlet:4.2.3:provided com.google.inject:guice:4.2.3:provided com.jcraft:jsch:0.1.55:provided @@ -372,7 +371,6 @@ org.antlr:antlr4-runtime:4.7.1:provided org.apache.accumulo:accumulo-start:2.1.4:provided org.apache.avro:avro-ipc:1.11.4:provided org.apache.avro:avro-mapred:1.11.4:provided -org.apache.commons:commons-lang3:3.18.0:provided org.apache.commons:commons-math3:3.6.1:provided org.apache.commons:commons-vfs2:2.9.0:provided org.apache.datasketches:datasketches-java:3.3.0:provided @@ -449,7 +447,6 @@ org.apache.tomcat:tomcat-util-scan:9.0.104:provided org.apache.tomcat:tomcat-util:9.0.104:provided org.apache.xbean:xbean-asm9-shaded:4.23:provided org.bouncycastle:bcprov-jdk18on:1.78.1:provided -org.checkerframework:checker-qual:3.49.5:provided org.codehaus.janino:commons-compiler:3.1.9:provided org.codehaus.janino:janino:3.1.9:provided org.codehaus.jettison:jettison:1.5.4:provided diff --git a/docs/user/upgrade/6.0.0.rst b/docs/user/upgrade/6.0.0.rst index 6b434ae494b..e311a76ba48 100644 --- a/docs/user/upgrade/6.0.0.rst +++ b/docs/user/upgrade/6.0.0.rst @@ -44,7 +44,7 @@ The following dependencies have been upgraded: * scala 2.13 ``2.13.12`` -> ``2.13.16`` * sedona ``1.8.0`` -> ``1.8.1`` * spark ``3.5.5`` -> ``3.5.7`` -* zookeeper ``3.9.3`` -> ``3.9.4`` +* zookeeper ``3.9.3`` -> ``3.9.5`` StrategyDecider API Update -------------------------- diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 9bc638243e2..53bbc702873 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -13,98 +13,78 @@ pom - 4.7.1 - 3.49.5 - 1.18.0 - 2.19.0 - 3.18.0 - 1.3.5 - 1.5.4 - 1.13.0 - 2.36.0 - 2.19.0 - 2.19.0 + 4.7.1 + 1.5.4 + commons-codec commons-codec - ${gs.commons.codec.version} + ${commons.codec.version} provided commons-io commons-io - ${gs.commons.io.version} + ${commons.io.version} provided org.apache.commons commons-lang3 - ${gs.commons.lang3.version} + ${commons.lang3.version} provided commons-logging commons-logging - ${gs.commons.logging.version} + ${commons.logging.version} provided commons-pool commons-pool - ${gs.commons.pool.version} + ${commons.pool.version} provided org.apache.commons commons-text - ${gs.commons.text.version} + ${commons.text.version} provided com.fasterxml.jackson.core jackson-annotations - ${gs.jackson.version} + ${fasterxml.jackson.version} provided com.fasterxml.jackson.core jackson-core - ${gs.jackson.version} + ${fasterxml.jackson.version} provided com.fasterxml.jackson.core jackson-databind - ${gs.jackson.databind.version} + ${fasterxml.jackson.version} provided com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${gs.jackson.version} + ${fasterxml.jackson.version} provided com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${gs.jackson.version} - provided - - - com.google.errorprone - error_prone_annotations - ${gs.error.prone.version} - provided - - - org.checkerframework - checker-qual - ${gs.checker.qual.version} + ${fasterxml.jackson.version} provided @@ -224,7 +204,7 @@ org.antlr antlr4-runtime - ${gs.antlr.version} + ${antlr.version} provided diff --git a/pom.xml b/pom.xml index 20f376dc139..6a1690db33a 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 2.1.4 2.0.1 - 3.9.4 + 3.9.5 0.17.0 0.12.0 0.12.0 From 8b6b3ed450e41868a19692e0ba0f7186ba5535b7 Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Tue, 10 Mar 2026 09:33:33 -0400 Subject: [PATCH 2/4] Bump Jackson to 2.21.1 --- build/dependencies.txt | 25 +++++++++++++------------ docs/user/upgrade/6.0.0.rst | 1 + pom.xml | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build/dependencies.txt b/build/dependencies.txt index 4333ba93e9c..7c3d2dbe8dc 100644 --- a/build/dependencies.txt +++ b/build/dependencies.txt @@ -4,10 +4,10 @@ com.clearspring.analytics:stream:2.9.8:compile com.esotericsoftware:kryo-shaded:4.0.3:compile com.esotericsoftware:minlog:1.3.0:compile com.facebook:nailgun-server:1.0.1:compile -com.fasterxml.jackson.core:jackson-annotations:2.19.0:compile -com.fasterxml.jackson.core:jackson-core:2.19.0:compile -com.fasterxml.jackson.core:jackson-databind:2.19.0:compile -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0:compile +com.fasterxml.jackson.core:jackson-annotations:2.21:compile +com.fasterxml.jackson.core:jackson-core:2.21.1:compile +com.fasterxml.jackson.core:jackson-databind:2.21.1:compile +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.1:compile com.github.ben-manes.caffeine:caffeine:3.1.8:compile com.github.luben:zstd-jni:1.5.5-11:compile com.github.pureconfig:pureconfig-core_2.12:0.17.4:compile @@ -288,13 +288,14 @@ com.amazonaws:jmespath-java:1.12.793:provided com.datastax.cassandra:cassandra-driver-core:3.11.5:provided com.datastax.cassandra:cassandra-driver-mapping:3.11.5:provided com.eclipsesource.minimal-json:minimal-json:0.9.5:provided -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.19.0:provided -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.19.0:provided -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.19.0:provided -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.19.0:provided -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.19.0:provided -com.fasterxml.jackson.module:jackson-module-scala_2.12:2.19.0:provided -com.fasterxml.woodstox:woodstox-core:7.1.0:provided +com.fasterxml.jackson.core:jackson-annotations:2.21.1:provided +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.1:provided +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.1:provided +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.21.1:provided +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.21.1:provided +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.21.1:provided +com.fasterxml.jackson.module:jackson-module-scala_2.12:2.21.1:provided +com.fasterxml.woodstox:woodstox-core:5.4.0:provided com.github.jnr:jffi:1.2.16:provided com.github.jnr:jffi:native:1.2.16:provided com.github.jnr:jnr-constants:0.9.9:provided @@ -450,7 +451,7 @@ org.bouncycastle:bcprov-jdk18on:1.78.1:provided org.codehaus.janino:commons-compiler:3.1.9:provided org.codehaus.janino:janino:3.1.9:provided org.codehaus.jettison:jettison:1.5.4:provided -org.codehaus.woodstox:stax2-api:4.2.2:provided +org.codehaus.woodstox:stax2-api:4.2.1:provided org.eclipse.angus:angus-activation:2.0.1:provided org.eclipse.jetty.websocket:websocket-api:9.4.57.v20241219:provided org.eclipse.jetty.websocket:websocket-client:9.4.57.v20241219:provided diff --git a/docs/user/upgrade/6.0.0.rst b/docs/user/upgrade/6.0.0.rst index e311a76ba48..d14901b6d38 100644 --- a/docs/user/upgrade/6.0.0.rst +++ b/docs/user/upgrade/6.0.0.rst @@ -34,6 +34,7 @@ The following dependencies have been upgraded: * commons-logging ``1.3.3`` -> ``1.3.5`` * commons-text ``1.12.0`` -> ``1.13.0`` * geotools ``33.2`` -> ``34.2`` +* jackson ``2.19.0`` -> ``2.21.1`` * kafka ``3.9.0`` -> ``3.9.1`` * micrometer ``1.15.4`` -> ``1.16.0`` * nifi ``2.6.0`` -> ``2.7.2`` diff --git a/pom.xml b/pom.xml index 6a1690db33a..5ff5ae8d403 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 0.27 - 2.19.0 + 2.21.1 2.2.224 2.7.2 9.4.57.v20241219 From 76995945b20f457712c01c84e5d43cc1e3375c61 Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Tue, 10 Mar 2026 09:51:25 -0400 Subject: [PATCH 3/4] fix jackson-annotations version --- .../geomesa-archetypes-gs-plugin/pom.xml | 20 +++++++++---------- .../geomesa-archetypes-spark-runtime/pom.xml | 6 +++--- pom.xml | 7 ++++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 53bbc702873..e482b3e77e1 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -57,34 +57,34 @@ ${commons.text.version} provided - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml.jackson.version} - provided - com.fasterxml.jackson.core jackson-core - ${fasterxml.jackson.version} + ${jackson.version} provided com.fasterxml.jackson.core jackson-databind - ${fasterxml.jackson.version} + ${jackson.version} provided com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${fasterxml.jackson.version} + ${jackson.version} provided com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${fasterxml.jackson.version} + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} provided diff --git a/geomesa-archetypes/geomesa-archetypes-spark-runtime/pom.xml b/geomesa-archetypes/geomesa-archetypes-spark-runtime/pom.xml index 6d1876a7973..02113bb5af1 100644 --- a/geomesa-archetypes/geomesa-archetypes-spark-runtime/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-spark-runtime/pom.xml @@ -38,19 +38,19 @@ com.fasterxml.jackson.core jackson-core - ${fasterxml.jackson.version} + ${jackson.version} provided com.fasterxml.jackson.core jackson-databind - ${fasterxml.jackson.version} + ${jackson.version} provided com.fasterxml.jackson.core jackson-annotations - ${fasterxml.jackson.version} + ${jackson.annotations.version} provided diff --git a/pom.xml b/pom.xml index 5ff5ae8d403..6be6d232793 100644 --- a/pom.xml +++ b/pom.xml @@ -106,9 +106,10 @@ 0.27 - 2.21.1 2.2.224 2.7.2 + 2.21.1 + 2.21 9.4.57.v20241219 5.14.0 2.5.2 @@ -1683,14 +1684,14 @@ com.fasterxml.jackson jackson-bom - ${fasterxml.jackson.version} + ${jackson.version} pom import com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} - ${fasterxml.jackson.version} + ${jackson.version} provided From cd2e8191feb12fc133ba5d9d378df49ea8f597d7 Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Tue, 10 Mar 2026 11:13:02 -0400 Subject: [PATCH 4/4] fix cqs --- build/dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/build/dependencies.txt b/build/dependencies.txt index 7c3d2dbe8dc..364b96c497a 100644 --- a/build/dependencies.txt +++ b/build/dependencies.txt @@ -288,7 +288,6 @@ com.amazonaws:jmespath-java:1.12.793:provided com.datastax.cassandra:cassandra-driver-core:3.11.5:provided com.datastax.cassandra:cassandra-driver-mapping:3.11.5:provided com.eclipsesource.minimal-json:minimal-json:0.9.5:provided -com.fasterxml.jackson.core:jackson-annotations:2.21.1:provided com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.1:provided com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.1:provided com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.21.1:provided