diff --git a/build/dependencies.txt b/build/dependencies.txt index d03e0dba218b..01435610a3a5 100644 --- a/build/dependencies.txt +++ b/build/dependencies.txt @@ -45,10 +45,10 @@ commons-logging:commons-logging:1.3.5:compile commons-pool:commons-pool:1.6:compile io.airlift:aircompressor:0.27:compile io.dropwizard.metrics:metrics-core:3.2.6:compile -io.micrometer:micrometer-commons:1.16.0:compile -io.micrometer:micrometer-core:1.16.0:compile -io.micrometer:micrometer-observation:1.16.0:compile -io.micrometer:micrometer-registry-prometheus:1.16.0:compile +io.micrometer:micrometer-commons:1.16.4:compile +io.micrometer:micrometer-core:1.16.4:compile +io.micrometer:micrometer-observation:1.16.4:compile +io.micrometer:micrometer-registry-prometheus:1.16.4:compile io.netty:netty-all:4.1.121.Final:compile io.netty:netty-buffer:4.1.121.Final:compile io.netty:netty-codec-dns:4.1.121.Final:compile @@ -83,13 +83,13 @@ io.opentelemetry:opentelemetry-api:1.48.0:compile io.opentelemetry:opentelemetry-api:1.49.0:compile io.opentelemetry:opentelemetry-context:1.48.0:compile io.opentelemetry:opentelemetry-context:1.49.0:compile -io.prometheus:prometheus-metrics-config:1.4.3:compile -io.prometheus:prometheus-metrics-core:1.4.3:compile -io.prometheus:prometheus-metrics-exporter-common:1.4.3:compile -io.prometheus:prometheus-metrics-exporter-httpserver:1.4.3:compile -io.prometheus:prometheus-metrics-exposition-textformats:1.4.3:compile -io.prometheus:prometheus-metrics-model:1.4.3:compile -io.prometheus:prometheus-metrics-tracer-common:1.4.3:compile +io.prometheus:prometheus-metrics-config:1.5.1:compile +io.prometheus:prometheus-metrics-core:1.5.1:compile +io.prometheus:prometheus-metrics-exporter-common:1.5.1:compile +io.prometheus:prometheus-metrics-exporter-httpserver:1.5.1:compile +io.prometheus:prometheus-metrics-exposition-textformats:1.5.1:compile +io.prometheus:prometheus-metrics-model:1.5.1:compile +io.prometheus:prometheus-metrics-tracer-common:1.5.1:compile it.geosolutions.imageio-ext:imageio-ext-geocore:2.0.1:compile it.geosolutions.imageio-ext:imageio-ext-streams:2.0.1:compile it.geosolutions.imageio-ext:imageio-ext-tiff:2.0.1:compile @@ -294,24 +294,17 @@ com.github.jnr:jnr-constants:0.9.9:provided com.github.jnr:jnr-ffi:2.1.7:provided com.github.jnr:jnr-posix:3.0.44:provided com.github.jnr:jnr-x86asm:1.0.2:provided -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.inject.extensions:guice-servlet:4.2.3:provided -com.google.inject:guice:4.2.3:provided +com.google.inject.extensions:guice-servlet:5.1.0:provided +com.google.inject:guice:5.1.0:provided com.jcraft:jsch:0.1.55:provided com.lmax:disruptor:3.4.4:provided -com.nimbusds:nimbus-jose-jwt:9.37.2:provided +com.nimbusds:nimbus-jose-jwt:10.4:provided com.ning:compress-lzf:1.1.2:provided +com.sun.activation:jakarta.activation:1.2.2:provided +com.sun.istack:istack-commons-runtime:3.0.12:provided com.sun.istack:istack-commons-runtime:3.0.7:provided -com.sun.jersey.contribs:jersey-guice:1.19.4:provided -com.sun.jersey:jersey-client:1.19.4:provided -com.sun.jersey:jersey-core:1.19.4:provided -com.sun.jersey:jersey-server:1.19.4:provided -com.sun.jersey:jersey-servlet:1.19.4:provided -com.sun.xml.bind:jaxb-core:4.0.4:provided -com.sun.xml.bind:jaxb-impl:4.0.4:provided com.sun.xml.fastinfoset:FastInfoset:1.2.15:provided com.thoughtworks.paranamer:paranamer:2.8:provided com.twitter:chill-java:0.10.0:provided @@ -332,7 +325,7 @@ io.dropwizard.metrics:metrics-graphite:4.2.19:provided io.dropwizard.metrics:metrics-jmx:4.2.19:provided io.dropwizard.metrics:metrics-json:4.2.19:provided io.dropwizard.metrics:metrics-jvm:3.2.6:provided -io.micrometer:micrometer-registry-cloudwatch2:1.16.0:provided +io.micrometer:micrometer-registry-cloudwatch2:1.16.4:provided io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.121.Final:provided io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.121.Final:provided io.netty:netty-transport-native-epoll:4.1.121.Final:provided @@ -340,50 +333,49 @@ io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.121.Final:provided io.netty:netty-transport-native-epoll:linux-riscv64:4.1.121.Final:provided io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.121.Final:provided io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.121.Final:provided -io.prometheus:prometheus-metrics-exporter-pushgateway:1.4.3:provided +io.prometheus:prometheus-metrics-exporter-pushgateway:1.5.1:provided io.swagger.core.v3:swagger-annotations:2.1.10:provided jakarta.activation:jakarta.activation-api:1.2.1:provided jakarta.activation:jakarta.activation-api:1.2.2:provided +jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6:provided jakarta.servlet:jakarta.servlet-api:4.0.3:provided +jakarta.servlet:jakarta.servlet-api:4.0.4:provided jakarta.validation:jakarta.validation-api:2.0.2:provided jakarta.ws.rs:jakarta.ws.rs-api:2.1.6:provided -jakarta.xml.bind:jakarta.xml.bind-api:4.0.1:provided +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3:provided javax.activation:activation:1.1.1:provided -javax.inject:javax.inject:1:provided javax.servlet.jsp:javax.servlet.jsp-api:2.3.1:provided -javax.servlet.jsp:jsp-api:2.1:provided javax.servlet:javax.servlet-api:3.1.0:provided -javax.ws.rs:jsr311-api:1.1.1:provided -javax.xml.bind:jaxb-api:2.2.11:provided javax.xml.bind:jaxb-api:2.3.1:provided joda-time:joda-time:2.12.6:provided +net.jodah:failsafe:2.4.4:provided net.razorvine:pickle:1.3:provided net.sf.py4j:py4j:0.10.9.7:provided org.agrona:agrona:1.12.0:provided 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.avro:avro-ipc:1.11.5:provided +org.apache.avro:avro-mapred:1.11.5: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 org.apache.datasketches:datasketches-memory:2.1.0:provided -org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.4.0:provided -org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:1.4.0:provided -org.apache.hadoop:hadoop-annotations:3.4.2:provided -org.apache.hadoop:hadoop-auth:3.4.2:provided -org.apache.hadoop:hadoop-aws:3.4.2:provided -org.apache.hadoop:hadoop-client:3.4.2:provided -org.apache.hadoop:hadoop-common:3.4.2:provided -org.apache.hadoop:hadoop-distcp:3.4.2:provided -org.apache.hadoop:hadoop-hdfs-client:3.4.2:provided -org.apache.hadoop:hadoop-hdfs:3.4.2:provided -org.apache.hadoop:hadoop-mapreduce-client-common:3.4.2:provided -org.apache.hadoop:hadoop-mapreduce-client-core:3.4.2:provided -org.apache.hadoop:hadoop-mapreduce-client-jobclient:3.4.2:provided -org.apache.hadoop:hadoop-yarn-api:3.4.2:provided -org.apache.hadoop:hadoop-yarn-client:3.4.2:provided -org.apache.hadoop:hadoop-yarn-common:3.4.2:provided +org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0:provided +org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:1.5.0:provided +org.apache.hadoop:hadoop-annotations:3.5.0:provided +org.apache.hadoop:hadoop-auth:3.5.0:provided +org.apache.hadoop:hadoop-aws:3.5.0:provided +org.apache.hadoop:hadoop-client:3.5.0:provided +org.apache.hadoop:hadoop-common:3.5.0:provided +org.apache.hadoop:hadoop-distcp:3.5.0:provided +org.apache.hadoop:hadoop-hdfs-client:3.5.0:provided +org.apache.hadoop:hadoop-hdfs:3.5.0:provided +org.apache.hadoop:hadoop-mapreduce-client-common:3.5.0:provided +org.apache.hadoop:hadoop-mapreduce-client-core:3.5.0:provided +org.apache.hadoop:hadoop-mapreduce-client-jobclient:3.5.0:provided +org.apache.hadoop:hadoop-yarn-api:3.5.0:provided +org.apache.hadoop:hadoop-yarn-client:3.5.0:provided +org.apache.hadoop:hadoop-yarn-common:3.5.0:provided org.apache.hbase.thirdparty:hbase-shaded-jersey:4.1.11:provided org.apache.hbase.thirdparty:hbase-shaded-jetty:4.1.11:provided org.apache.hbase:hbase-http:2.6.3-hadoop3:provided @@ -408,8 +400,8 @@ org.apache.logging.log4j:log4j-1.2-api:2.20.0:provided org.apache.logging.log4j:log4j-api:2.20.0:provided org.apache.logging.log4j:log4j-core:2.20.0:provided org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0:provided -org.apache.orc:orc-core:shaded-protobuf:1.9.7:provided -org.apache.orc:orc-mapreduce:shaded-protobuf:1.9.7:provided +org.apache.orc:orc-core:shaded-protobuf:1.9.8:provided +org.apache.orc:orc-mapreduce:shaded-protobuf:1.9.8:provided org.apache.orc:orc-shims:1.9.8:provided org.apache.parquet:parquet-column:1.13.1:provided org.apache.parquet:parquet-common:1.13.1:provided @@ -420,18 +412,18 @@ org.apache.parquet:parquet-jackson:1.13.1:provided org.apache.parquet:parquet-jackson:1.15.2:provided org.apache.sedona:sedona-spark-3.5_2.12:1.8.1:provided org.apache.sedona:sedona-spark-common-3.5_2.12:1.8.1:provided -org.apache.spark:spark-catalyst_2.12:3.5.7:provided -org.apache.spark:spark-common-utils_2.12:3.5.7:provided -org.apache.spark:spark-core_2.12:3.5.7:provided -org.apache.spark:spark-kvstore_2.12:3.5.7:provided -org.apache.spark:spark-launcher_2.12:3.5.7:provided -org.apache.spark:spark-network-common_2.12:3.5.7:provided -org.apache.spark:spark-network-shuffle_2.12:3.5.7:provided -org.apache.spark:spark-sketch_2.12:3.5.7:provided -org.apache.spark:spark-sql-api_2.12:3.5.7:provided -org.apache.spark:spark-sql_2.12:3.5.7:provided -org.apache.spark:spark-tags_2.12:3.5.7:provided -org.apache.spark:spark-unsafe_2.12:3.5.7:provided +org.apache.spark:spark-catalyst_2.12:3.5.8:provided +org.apache.spark:spark-common-utils_2.12:3.5.8:provided +org.apache.spark:spark-core_2.12:3.5.8:provided +org.apache.spark:spark-kvstore_2.12:3.5.8:provided +org.apache.spark:spark-launcher_2.12:3.5.8:provided +org.apache.spark:spark-network-common_2.12:3.5.8:provided +org.apache.spark:spark-network-shuffle_2.12:3.5.8:provided +org.apache.spark:spark-sketch_2.12:3.5.8:provided +org.apache.spark:spark-sql-api_2.12:3.5.8:provided +org.apache.spark:spark-sql_2.12:3.5.8:provided +org.apache.spark:spark-tags_2.12:3.5.8:provided +org.apache.spark:spark-unsafe_2.12:3.5.8:provided org.apache.tomcat:tomcat-api:9.0.104:provided org.apache.tomcat:tomcat-el-api:9.0.104:provided org.apache.tomcat:tomcat-jasper-el:9.0.104:provided @@ -440,12 +432,11 @@ org.apache.tomcat:tomcat-juli:9.0.104:provided 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.bouncycastle:bcprov-jdk18on:1.82: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.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 org.eclipse.jetty.websocket:websocket-common:9.4.57.v20241219:provided @@ -466,16 +457,17 @@ org.glassfish.hk2:hk2-api:2.6.1:provided org.glassfish.hk2:hk2-locator:2.6.1:provided org.glassfish.hk2:hk2-utils:2.6.1:provided org.glassfish.hk2:osgi-resource-locator:1.0.3:provided +org.glassfish.jaxb:jaxb-runtime:2.3.9:provided org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438:provided +org.glassfish.jaxb:txw2:2.3.9:provided org.glassfish.jaxb:txw2:2.4.0-b180830.0438:provided -org.glassfish.jersey.containers:jersey-container-servlet-core:2.40:provided -org.glassfish.jersey.containers:jersey-container-servlet:2.40:provided -org.glassfish.jersey.core:jersey-client:2.40:provided -org.glassfish.jersey.core:jersey-common:2.40:provided -org.glassfish.jersey.core:jersey-server:2.40:provided -org.glassfish.jersey.inject:jersey-hk2:2.40:provided +org.glassfish.jersey.containers:jersey-container-servlet-core:2.46:provided +org.glassfish.jersey.containers:jersey-container-servlet:2.46:provided +org.glassfish.jersey.core:jersey-client:2.46:provided +org.glassfish.jersey.core:jersey-common:2.46:provided +org.glassfish.jersey.core:jersey-server:2.46:provided +org.glassfish.jersey.inject:jersey-hk2:2.46:provided org.jamon:jamon-runtime:2.4.1:provided -org.javassist:javassist:3.29.2-GA:provided org.javassist:javassist:3.30.2-GA:provided org.jetbrains:annotations:17.0.0:provided org.jline:jline:3.9.0:provided @@ -511,7 +503,7 @@ org.springframework:spring-expression:5.3.39:provided org.springframework:spring-jcl:5.3.39:provided org.threeten:threeten-extra:1.7.1:provided org.tukaani:xz:1.9:provided -org.wildfly.openssl:wildfly-openssl:2.1.4.Final:provided +org.wildfly.openssl:wildfly-openssl:2.2.5.Final:provided org.yaml:snakeyaml:2.0:provided oro:oro:2.0.8:provided software.amazon.awssdk.crt:aws-crt:0.39.4:provided @@ -548,4 +540,4 @@ software.amazon.awssdk:third-party-jackson-core:2.38.7:provided software.amazon.awssdk:utils-lite:2.38.7:provided software.amazon.awssdk:utils:2.38.7:provided software.amazon.eventstream:eventstream:1.0.1:provided -software.amazon.s3.analyticsaccelerator:analyticsaccelerator-s3:1.2.1:provided +software.amazon.s3.analyticsaccelerator:analyticsaccelerator-s3:1.3.1:provided diff --git a/docs/user/upgrade/6.0.0.rst b/docs/user/upgrade/6.0.0.rst index 4c7718d2dbcf..a3f34b5395ad 100644 --- a/docs/user/upgrade/6.0.0.rst +++ b/docs/user/upgrade/6.0.0.rst @@ -43,11 +43,12 @@ 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`` +* hadoop ``3.4.2`` -> ``3.5.0`` * jackson ``2.19.0`` -> ``2.21.1`` * kafka ``3.9.0`` -> ``3.9.2`` -* micrometer ``1.15.4`` -> ``1.16.0`` +* micrometer ``1.15.4`` -> ``1.16.4`` * nifi ``2.6.0`` -> ``2.7.2`` -* prometheus ``1.4.1`` -> ``1.4.3`` +* prometheus ``1.4.1`` -> ``1.5.1`` * rhino ``1.7.14`` -> ``1.8.1`` * scala 2.12 ``2.12.19`` -> ``2.12.20`` * scala 2.13 ``2.13.12`` -> ``2.13.16`` diff --git a/geomesa-utils-parent/geomesa-bom/pom.xml b/geomesa-utils-parent/geomesa-bom/pom.xml index e36fce809c85..35736a77fc6b 100644 --- a/geomesa-utils-parent/geomesa-bom/pom.xml +++ b/geomesa-utils-parent/geomesa-bom/pom.xml @@ -247,16 +247,6 @@ geomesa-fs-storage-convert_${scala.binary.version} ${project.version} - - org.locationtech.geomesa - geomesa-fs-storage-orc-io_${scala.binary.version} - ${project.version} - - - org.locationtech.geomesa - geomesa-fs-storage-orc_${scala.binary.version} - ${project.version} - org.locationtech.geomesa geomesa-fs-storage-parquet-io_${scala.binary.version} diff --git a/pom.xml b/pom.xml index 9a757ada3f01..d62b4147f3fb 100644 --- a/pom.xml +++ b/pom.xml @@ -90,13 +90,12 @@ 4.0.3 3.0.0 3.2.6 - 1.16.0 - 1.9.8 + 1.16.4 1.4.1 1.3.1 1.15.2 42.7.7 - 1.4.3 + 1.5.1 0.17.4 1.8.1 20250620-rc1 @@ -133,8 +132,8 @@ 0.17.0 0.12.0 0.12.0 - 3.4.2 - 3.5.7 + 3.5.0 + 3.5.8 2.6.3-hadoop3 4.1.0-incubating 2.5.0 @@ -1252,43 +1251,6 @@ parquet-avro ${parquet.version} - - org.apache.orc - orc-core - ${orc.version} - nohive - - - - org.openjdk.jol - jol-core - - - - - org.apache.orc - orc-mapreduce - ${orc.version} - nohive - - - - org.apache.orc - orc-core - - - - - org.apache.orc - orc-shims - ${orc.version} - - - org.apache.hadoop - hadoop-client-api - - - org.parboiled parboiled-scala_${scala.binary.version} @@ -2297,6 +2259,22 @@ org.apache.hadoop hadoop-client-runtime + + org.glassfish.jersey.core + * + + + org.glassfish.jersey.containers + * + + + org.glassfish.jersey.inject + * + + + org.glassfish.jaxb + * +