Skip to content

Commit

Permalink
Various dependency updates (#3212)
Browse files Browse the repository at this point in the history
  • Loading branch information
@elahrvivaz
elahrvivaz authored Oct 9, 2024
1 parent 72ac4e4 commit b66cb24
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 102 deletions.
93 changes: 46 additions & 47 deletions build/cqs.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ com.conversantmedia:disruptor 1.2.15 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.16.1 compile
com.fasterxml.jackson.core:jackson-core 2.16.1 compile
com.fasterxml.jackson.core:jackson-databind 2.16.1 compile
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor 2.16.1 compile
com.fasterxml.jackson.datatype:jackson-datatype-jsr310 2.16.1 compile
com.fasterxml.jackson.core:jackson-annotations 2.17.2 compile
com.fasterxml.jackson.core:jackson-core 2.17.2 compile
com.fasterxml.jackson.core:jackson-databind 2.17.2 compile
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor 2.17.2 compile
com.fasterxml.jackson.datatype:jackson-datatype-jsr310 2.17.2 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
Expand All @@ -23,11 +23,11 @@ com.google.code.gson:gson 2.10.1 compile
com.google.errorprone:error_prone_annotations 2.21.1 compile
com.google.flatbuffers:flatbuffers-java 24.3.25 compile
com.google.guava:failureaccess 1.0 compile
com.google.guava:failureaccess 1.0.1 compile
com.google.guava:failureaccess 1.0.2 compile
com.google.guava:guava 18.0 compile
com.google.guava:guava 27.0-jre compile
com.google.guava:guava 28.0-jre compile
com.google.guava:guava 32.0.0-jre compile
com.google.guava:guava 33.0.0-jre compile
com.google.guava:guava 33.2.1-jre compile
com.google.protobuf:protobuf-java 2.5.0 compile
com.google.protobuf:protobuf-java 3.25.3 compile
com.google.re2j:re2j 1.1 compile
Expand All @@ -40,9 +40,9 @@ com.thoughtworks.paranamer:paranamer 2.8 compile
com.typesafe.scala-logging:scala-logging_2.12 3.9.5 compile
com.typesafe:config 1.4.3 compile
commons-cli:commons-cli 1.6.0 compile
commons-codec:commons-codec 1.16.0 compile
commons-codec:commons-codec 1.17.1 compile
commons-dbcp:commons-dbcp 1.4 compile
commons-io:commons-io 2.15.1 compile
commons-io:commons-io 2.16.1 compile
commons-jxpath:commons-jxpath 1.3 compile
commons-logging:commons-logging 1.3.3 compile
commons-pool:commons-pool 1.6 compile
Expand All @@ -54,35 +54,35 @@ io.github.azagniotov:dropwizard-metrics-cloudwatch 1.0.13 compile
io.micrometer:micrometer-commons 1.13.4 compile
io.micrometer:micrometer-core 1.13.4 compile
io.micrometer:micrometer-observation 1.13.4 compile
io.netty:netty-all 4.1.106.Final compile
io.netty:netty-buffer 4.1.106.Final compile
io.netty:netty-codec 4.1.106.Final compile
io.netty:netty-codec-dns 4.1.106.Final compile
io.netty:netty-codec-haproxy 4.1.106.Final compile
io.netty:netty-codec-http 4.1.106.Final compile
io.netty:netty-codec-http2 4.1.106.Final compile
io.netty:netty-codec-memcache 4.1.106.Final compile
io.netty:netty-codec-mqtt 4.1.106.Final compile
io.netty:netty-codec-redis 4.1.106.Final compile
io.netty:netty-codec-smtp 4.1.106.Final compile
io.netty:netty-codec-socks 4.1.106.Final compile
io.netty:netty-codec-stomp 4.1.106.Final compile
io.netty:netty-codec-xml 4.1.106.Final compile
io.netty:netty-common 4.1.106.Final compile
io.netty:netty-handler 4.1.106.Final compile
io.netty:netty-handler-proxy 4.1.106.Final compile
io.netty:netty-handler-ssl-ocsp 4.1.106.Final compile
io.netty:netty-resolver 4.1.106.Final compile
io.netty:netty-resolver-dns 4.1.106.Final compile
io.netty:netty-resolver-dns-classes-macos 4.1.106.Final compile
io.netty:netty-transport 4.1.106.Final compile
io.netty:netty-transport-classes-epoll 4.1.106.Final compile
io.netty:netty-transport-classes-kqueue 4.1.106.Final compile
io.netty:netty-transport-native-epoll linux-x86_64:4.1.106.Final compile
io.netty:netty-transport-native-unix-common 4.1.106.Final compile
io.netty:netty-transport-rxtx 4.1.106.Final compile
io.netty:netty-transport-sctp 4.1.106.Final compile
io.netty:netty-transport-udt 4.1.106.Final compile
io.netty:netty-all 4.1.114.Final compile
io.netty:netty-buffer 4.1.114.Final compile
io.netty:netty-codec 4.1.114.Final compile
io.netty:netty-codec-dns 4.1.114.Final compile
io.netty:netty-codec-haproxy 4.1.114.Final compile
io.netty:netty-codec-http 4.1.114.Final compile
io.netty:netty-codec-http2 4.1.114.Final compile
io.netty:netty-codec-memcache 4.1.114.Final compile
io.netty:netty-codec-mqtt 4.1.114.Final compile
io.netty:netty-codec-redis 4.1.114.Final compile
io.netty:netty-codec-smtp 4.1.114.Final compile
io.netty:netty-codec-socks 4.1.114.Final compile
io.netty:netty-codec-stomp 4.1.114.Final compile
io.netty:netty-codec-xml 4.1.114.Final compile
io.netty:netty-common 4.1.114.Final compile
io.netty:netty-handler 4.1.114.Final compile
io.netty:netty-handler-proxy 4.1.114.Final compile
io.netty:netty-handler-ssl-ocsp 4.1.114.Final compile
io.netty:netty-resolver 4.1.114.Final compile
io.netty:netty-resolver-dns 4.1.114.Final compile
io.netty:netty-resolver-dns-classes-macos 4.1.114.Final compile
io.netty:netty-transport 4.1.114.Final compile
io.netty:netty-transport-classes-epoll 4.1.114.Final compile
io.netty:netty-transport-classes-kqueue 4.1.114.Final compile
io.netty:netty-transport-native-epoll linux-x86_64:4.1.114.Final compile
io.netty:netty-transport-native-unix-common 4.1.114.Final compile
io.netty:netty-transport-rxtx 4.1.114.Final compile
io.netty:netty-transport-sctp 4.1.114.Final compile
io.netty:netty-transport-udt 4.1.114.Final compile
io.opentelemetry:opentelemetry-api 1.15.0 compile
io.opentelemetry:opentelemetry-api 1.34.1 compile
io.opentelemetry:opentelemetry-context 1.15.0 compile
Expand Down Expand Up @@ -155,16 +155,16 @@ org.apache.arrow:arrow-memory-core 17.0.0 compile
org.apache.arrow:arrow-memory-netty 17.0.0 compile
org.apache.arrow:arrow-memory-netty-buffer-patch 17.0.0 compile
org.apache.arrow:arrow-vector 17.0.0 compile
org.apache.avro:avro 1.11.3 compile
org.apache.avro:avro 1.11.4 compile
org.apache.commons:commons-collections4 4.4 compile
org.apache.commons:commons-compress 1.26.0 compile
org.apache.commons:commons-configuration2 2.10.1 compile
org.apache.commons:commons-crypto 1.1.0 compile
org.apache.commons:commons-csv 1.10.0 compile
org.apache.commons:commons-dbcp2 2.11.0 compile
org.apache.commons:commons-lang3 3.14.0 compile
org.apache.commons:commons-lang3 3.15.0 compile
org.apache.commons:commons-pool2 2.12.0 compile
org.apache.commons:commons-text 1.11.0 compile
org.apache.commons:commons-text 1.12.0 compile
org.apache.curator:curator-client 5.6.0 compile
org.apache.curator:curator-framework 5.6.0 compile
org.apache.curator:curator-recipes 5.6.0 compile
Expand All @@ -191,9 +191,9 @@ org.apache.hbase:hbase-zookeeper 2.5.8-hadoop3 compile
org.apache.htrace:htrace-core 3.2.0-incubating compile
org.apache.httpcomponents:httpclient 4.5.14 compile
org.apache.httpcomponents:httpcore 4.4.16 compile
org.apache.orc:orc-core nohive:1.9.3 compile
org.apache.orc:orc-mapreduce nohive:1.9.3 compile
org.apache.orc:orc-shims 1.9.3 compile
org.apache.orc:orc-core nohive:1.9.4 compile
org.apache.orc:orc-mapreduce nohive:1.9.4 compile
org.apache.orc:orc-shims 1.9.4 compile
org.apache.parquet:parquet-column 1.13.1 compile
org.apache.parquet:parquet-common 1.13.1 compile
org.apache.parquet:parquet-encoding 1.13.1 compile
Expand Down Expand Up @@ -295,7 +295,6 @@ io.prometheus:prometheus-metrics-exporter-httpserver 1.3.1 provided
io.prometheus:prometheus-metrics-exporter-pushgateway 1.3.1 provided
javax.media:jai_core 1.1.3 provided
org.apache.accumulo:accumulo-start 2.1.3 provided
org.apache.commons:commons-text 1.10.0 provided
org.apache.hadoop:hadoop-annotations 3.4.0 provided
org.apache.hadoop:hadoop-aws 3.4.0 provided
org.apache.hadoop:hadoop-client 3.4.0 provided
Expand All @@ -319,7 +318,7 @@ org.apache.spark:spark-core_2.12 3.5.0 provided
org.apache.spark:spark-sql_2.12 3.5.0 provided
org.scala-lang:scala-compiler 2.12.19 provided
org.slf4j:slf4j-reload4j 1.7.36 provided
org.springframework.security:spring-security-core 5.8.11 provided
org.springframework.security:spring-security-core 5.8.14 provided
software.amazon.awssdk.crt:aws-crt 0.29.18 provided
software.amazon.awssdk:s3-transfer-manager 2.25.64 provided
software.amazon.awssdk:s3 2.25.64 provided
Expand Down
32 changes: 30 additions & 2 deletions docs/user/upgrade.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Dependency Compatibility

Dependency compatibility refers to the ability to update GeoMesa without updating other components
(e.g. Accumulo, HBase, Hadoop, Spark, GeoServer, etc). Generally, GeoMesa supports a range of dependency versions
(e.g. Accumulo 1.6 to 1.9). Spark versions are more tightly coupled, due to the use of private Spark APIs.
(e.g. Accumulo 2.0 to 2.1). Spark versions are more tightly coupled, due to the use of private Spark APIs.

Pre-Release Code
^^^^^^^^^^^^^^^^
Expand All @@ -93,12 +93,40 @@ Compatibility Matrix
Version 5.1.0 Upgrade Guide
+++++++++++++++++++++++++++

Version Compatibility
---------------------

GeoMesa 5.1.x is generally compatible with versions 5.0.x, 4.0.x and 3.5.x across different environments. This means that
it is possible to upgrade in parts; i.e. upgrade GeoServer to 5.1.0 but keep NiFi at 3.5.2. Please note that
previously deprecated functionality (see below) may no longer work once any part of the environment is upgraded to
5.1.0.

Dependency Version Upgrades
---------------------------

The following dependencies have been upgraded:

* arrow ``15.0.2`` -> ``16.1.0``
* accumulo ``2.1.2`` -> ``2.1.3``
* aircompressor ``0.25`` -> ``0.27``
* arrow ``15.0.2`` -> ``17.0.0``
* avro ``1.11.3`` -> ``1.11.4``
* aws-java-sdk ``1.12.625`` -> ``1.12.735``
* com.fasterxml.jackson ``2.16.1`` -> ``2.17.2``
* commons-codec ``1.16.0`` -> ``1.17.1``
* commons-io ``2.15.1`` -> ``2.16.1``
* commons-lang3 ``3.14.0`` -> ``3.15.0``
* commons-logging ``1.2`` -> ``1.3.3``
* commons-text ``1.11.0`` -> ``1.12.0``
* failureaccess ``1.0.1`` -> ``1.0.2``
* flatbuffers ``23.5.26`` -> ``24.3.25``
* geotools ``30.2`` -> ``32.0``
* guava ``32.0.0-jre`` -> ``33.2.1-jre``
* javax.measure ``2.1.2`` -> ``2.2``
* jts ``1.19.0`` -> ``1.20.0``
* micrometer ``1.11.1`` -> ``1.13.4``
* netty ``4.1.106.Final`` -> ``4.1.114.Final``
* opentelemetry ``1.27.0`` -> ``1.34.1``
* snakeyaml ``2.0`` -> ``2.2``

Audit Logger Changes
--------------------
Expand Down
16 changes: 8 additions & 8 deletions geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@

<properties>
<gs.antlr.version>4.7.1</gs.antlr.version>
<gs.checker.qual.version>3.33.0</gs.checker.qual.version>
<gs.commons.codec.version>1.15</gs.commons.codec.version>
<gs.commons.io.version>2.12.0</gs.commons.io.version>
<gs.checker.qual.version>3.42.0</gs.checker.qual.version>
<gs.commons.codec.version>1.17.1</gs.commons.codec.version>
<gs.commons.io.version>2.16.1</gs.commons.io.version>
<gs.commons.lang.version>2.5</gs.commons.lang.version>
<gs.commons.lang3.version>3.12.0</gs.commons.lang3.version>
<gs.commons.lang3.version>3.15.0</gs.commons.lang3.version>
<gs.commons.logging.version>1.2</gs.commons.logging.version>
<gs.commons.pool.version>1.5.4</gs.commons.pool.version>
<gs.commons.text.version>1.10.0</gs.commons.text.version>
<gs.error.prone.version>2.18.0</gs.error.prone.version>
<gs.jackson.version>2.15.2</gs.jackson.version>
<gs.jackson.databind.version>2.15.2</gs.jackson.databind.version>
<gs.commons.text.version>1.12.0</gs.commons.text.version>
<gs.error.prone.version>2.26.1</gs.error.prone.version>
<gs.jackson.version>2.17.2</gs.jackson.version>
<gs.jackson.databind.version>2.17.2</gs.jackson.databind.version>
</properties>

<dependencyManagement>
Expand Down
61 changes: 16 additions & 45 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@
<!-- direct dependencies -->
<accumulo.access.version>1.0.0-beta</accumulo.access.version>
<arrow.version>17.0.0</arrow.version>
<avro.version>1.11.3</avro.version>
<avro.version>1.11.4</avro.version>
<aws.sdk.version>1.12.735</aws.sdk.version> <!-- latest available as of 2024/06 -->
<aws.sdk.v2.version>2.25.64</aws.sdk.v2.version> <!-- latest available as of 2024/06 -->
<aws.crt.version>0.29.18</aws.crt.version>
<caffeine.version>3.1.8</caffeine.version>
<clearspring.analytics.version>2.9.8</clearspring.analytics.version>
<commons.codec.version>1.16.0</commons.codec.version>
<commons.codec.version>1.17.1</commons.codec.version>
<commons.compress.version>1.26.0</commons.compress.version>
<commons.csv.version>1.10.0</commons.csv.version>
<commons.dbcp.version>2.11.0</commons.dbcp.version>
<commons.io.version>2.15.1</commons.io.version>
<commons.lang3.version>3.14.0</commons.lang3.version>
<commons.io.version>2.16.1</commons.io.version>
<commons.lang3.version>3.15.0</commons.lang3.version>
<commons.logging.version>1.3.3</commons.logging.version>
<commons.pool2.version>2.12.0</commons.pool2.version>
<commons.text.version>1.11.0</commons.text.version>
<commons.text.version>1.12.0</commons.text.version>
<cqengine.version>3.6.0</cqengine.version>
<curator.version>5.6.0</curator.version>
<gson.version>2.10.1</gson.version>
Expand All @@ -92,7 +92,7 @@
<mango.version>3.0.0</mango.version>
<metrics.version>3.2.6</metrics.version>
<micrometer.version>1.13.4</micrometer.version>
<orc.version>1.9.3</orc.version>
<orc.version>1.9.4</orc.version>
<parboiled.version>1.4.1</parboiled.version>
<parboiled.scala.version>1.3.1</parboiled.scala.version>
<parquet.version>1.13.1</parquet.version>
Expand All @@ -102,18 +102,17 @@
<rhino.js.version>1.7.14</rhino.js.version>
<s2.geometry.version>1.0.1</s2.geometry.version>
<sizeof.version>0.4.3</sizeof.version>
<spring.security.version>5.8.11</spring.security.version> <!-- geoserver is still on 5.x -->
<spring.security.version>5.8.14</spring.security.version> <!-- geoserver is still on 5.x -->
<typesafe.config.version>1.4.3</typesafe.config.version>

<!-- standardized transitive dependencies -->
<aircompressor.version>0.27</aircompressor.version>
<fasterxml.jackson.version>2.16.1</fasterxml.jackson.version> <!-- used by geoserver, spark and arrow -->
<fasterxml.jackson.databind.version>2.16.1</fasterxml.jackson.databind.version> <!-- used by geoserver, spark and arrow -->
<fasterxml.jackson.version>2.17.2</fasterxml.jackson.version> <!-- used by geoserver, spark and arrow -->
<h2.version>2.2.224</h2.version>
<hsql.version>2.7.2</hsql.version>
<jna.version>5.14.0</jna.version>
<json.smart.version>2.5.1</json.smart.version> <!-- used by json-path and hadoop-auth -->
<netty.version>4.1.106.Final</netty.version>
<netty.version>4.1.114.Final</netty.version>
<commons.cli.version>1.6.0</commons.cli.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.collections4.version>4.4</commons.collections4.version>
Expand Down Expand Up @@ -154,8 +153,8 @@

<!-- guava - versions vary across environments -->
<guava.version>${geotools.guava.version}</guava.version>
<geotools.guava.version>32.0.0-jre</geotools.guava.version>
<accumulo.guava.version>28.0-jre</accumulo.guava.version>
<geotools.guava.version>33.2.1-jre</geotools.guava.version>
<accumulo.guava.version>33.0.0-jre</accumulo.guava.version>
<hbase.guava.version>27.0-jre</hbase.guava.version>
<cassandra.guava.version>18.0</cassandra.guava.version>
<hadoop.guava.version>27.0-jre</hadoop.guava.version>
Expand Down Expand Up @@ -217,7 +216,7 @@

<!-- recommended installation versions -->
<accumulo.version.recommended>2.1.3</accumulo.version.recommended>
<hbase.version.recommended>2.5.7</hbase.version.recommended>
<hbase.version.recommended>2.5.8</hbase.version.recommended>
<hbase.thirdparty.version.recommended>4.1.5</hbase.thirdparty.version.recommended>
<cassandra.server.version.recommended>3.11.14</cassandra.server.version.recommended>
<cassandra.driver.version.recommended>3.11.3</cassandra.driver.version.recommended>
Expand Down Expand Up @@ -1867,39 +1866,11 @@
<version>2.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${fasterxml.jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
Expand Down

0 comments on commit b66cb24

Please sign in to comment.