diff --git a/build/cqs.tsv b/build/cqs.tsv
index a74937a6af86..5ea2c186d220 100644
--- a/build/cqs.tsv
+++ b/build/cqs.tsv
@@ -44,16 +44,16 @@ commons-codec:commons-codec 1.16.0 compile
commons-dbcp:commons-dbcp 1.4 compile
commons-io:commons-io 2.15.1 compile
commons-jxpath:commons-jxpath 1.3 compile
-commons-logging:commons-logging 1.2 compile
+commons-logging:commons-logging 1.3.3 compile
commons-pool:commons-pool 1.6 compile
io.airlift:aircompressor 0.27 compile
io.dropwizard.metrics:metrics-core 3.2.6 compile
io.dropwizard.metrics:metrics-graphite 3.2.6 compile
io.dropwizard.metrics:metrics-jvm 3.2.6 compile
io.github.azagniotov:dropwizard-metrics-cloudwatch 1.0.13 compile
-io.micrometer:micrometer-commons 1.11.1 compile
-io.micrometer:micrometer-core 1.11.1 compile
-io.micrometer:micrometer-observation 1.11.1 compile
+io.micrometer:micrometer-commons 1.12.2 compile
+io.micrometer:micrometer-core 1.12.2 compile
+io.micrometer:micrometer-observation 1.12.2 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
@@ -84,11 +84,10 @@ 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.opentelemetry:opentelemetry-api 1.15.0 compile
-io.opentelemetry:opentelemetry-api 1.27.0 compile
+io.opentelemetry:opentelemetry-api 1.34.1 compile
io.opentelemetry:opentelemetry-context 1.15.0 compile
-io.opentelemetry:opentelemetry-context 1.27.0 compile
+io.opentelemetry:opentelemetry-context 1.34.1 compile
io.opentelemetry:opentelemetry-semconv 1.15.0-alpha compile
-io.opentelemetry:opentelemetry-semconv 1.27.0-alpha compile
io.prometheus:simpleclient 0.16.0 compile
io.prometheus:simpleclient_common 0.16.0 compile
io.prometheus:simpleclient_dropwizard 0.16.0 compile
@@ -148,9 +147,9 @@ net.sf.saxon:Saxon-HE 12.4 compile
org.antlr:antlr4-runtime 4.7.2 compile
org.apache.accumulo:accumulo-access 1.0.0-beta compile
org.apache.accumulo:accumulo-core 2.0.1 compile
-org.apache.accumulo:accumulo-core 2.1.2 compile
+org.apache.accumulo:accumulo-core 2.1.3 compile
org.apache.accumulo:accumulo-hadoop-mapreduce 2.0.1 compile
-org.apache.accumulo:accumulo-hadoop-mapreduce 2.1.2 compile
+org.apache.accumulo:accumulo-hadoop-mapreduce 2.1.3 compile
org.apache.arrow:arrow-format 17.0.0 compile
org.apache.arrow:arrow-memory-core 17.0.0 compile
org.apache.arrow:arrow-memory-netty 17.0.0 compile
@@ -275,7 +274,7 @@ org.slf4j:slf4j-api 1.7.36 compile
org.threeten:threeten-extra 1.7.1 compile
org.xmlresolver:xmlresolver 5.2.2 compile
org.xmlresolver:xmlresolver data:5.2.2 compile
-org.yaml:snakeyaml 2.0 compile
+org.yaml:snakeyaml 2.2 compile
picocontainer:picocontainer 1.2 compile
redis.clients:jedis 5.1.0 compile
si.uom:si-quantity 2.1 compile
@@ -291,7 +290,7 @@ com.datastax.cassandra:cassandra-driver-mapping 3.11.5 provided
io.confluent:kafka-avro-serializer 6.2.9 provided
io.confluent:kafka-schema-registry-client 6.2.9 provided
javax.media:jai_core 1.1.3 provided
-org.apache.accumulo:accumulo-start 2.1.2 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
@@ -325,7 +324,7 @@ com.sun.xml.bind:jaxb-impl 2.2.3 test
com.uber:h3 4.1.1 test
commons-lang:commons-lang 2.6 test
junit:junit 4.13.2 test
-org.apache.accumulo:accumulo-test 2.1.2 test
+org.apache.accumulo:accumulo-test 2.1.3 test
org.apache.arrow:arrow-vector tests:17.0.0 test
org.apache.cassandra:cassandra-all 3.11.14 test
org.apache.cassandra:cassandra-thrift 3.11.14 test
diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/AccumuloContainer.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/AccumuloContainer.scala
index 9f9402100f4b..6c2a0efb8c7c 100644
--- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/AccumuloContainer.scala
+++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/AccumuloContainer.scala
@@ -22,7 +22,7 @@ case object AccumuloContainer extends StrictLogging {
val ImageName =
DockerImageName.parse("ghcr.io/geomesa/accumulo-uno")
- .withTag(sys.props.getOrElse("accumulo.docker.tag", "2.1.2"))
+ .withTag(sys.props.getOrElse("accumulo.docker.tag", "2.1.3"))
val Namespace = "gm"
diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml
index d035136240e6..7de95148efcd 100644
--- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml
+++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml
@@ -100,6 +100,15 @@
org.json4s
json4s-native_${scala.binary.version}
+
+ io.netty
+ netty-handler
+
+
+ io.netty
+ netty-transport-native-epoll
+ linux-x86_64
+
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/accumulo-env.sh b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/accumulo-env.sh
index 1c5f78718ddd..848a30f6a239 100644
--- a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/accumulo-env.sh
+++ b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/accumulo-env.sh
@@ -46,10 +46,9 @@ function get_accumulo_classpath() {
if [[ -d "$ACCUMULO_LIB" ]]; then
accumulo_cp="$accumulo_cp:$(find_jars "$ACCUMULO_LIB" true)"
fi
- # for zookeeper only include the single root jar
if [[ -d "${ZOOKEEPER_HOME}" ]]; then
- ZOOKEEPER_JAR="$(find -L "$ZOOKEEPER_HOME" -maxdepth 1 -type f -name "*zookeeper*jar" | head -n 1)"
- accumulo_cp="$accumulo_cp:${ZOOKEEPER_JAR}"
+ ZK_JARS="$(find -L "$ZOOKEEPER_HOME" -maxdepth 2 -name 'zookeeper*.jar' | paste -sd: -)"
+ accumulo_cp="$accumulo_cp:${ZK_JARS}"
fi
# if there's a geomesa runtime jar in accumulo, exclude it from the classpath
echo "$accumulo_cp" | sed -E 's/[^:]*geomesa-accumulo-distributed-runtime[^:]*jar//'
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh
index c3a9c6a9a091..22d50e067128 100755
--- a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh
+++ b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh
@@ -39,37 +39,42 @@ function dependencies() {
"org.apache.accumulo:accumulo-start:${accumulo_version}:jar"
"org.apache.accumulo:accumulo-hadoop-mapreduce:${accumulo_version}:jar"
"org.apache.zookeeper:zookeeper:${zk_version}:jar"
- "org.apache.commons:commons-configuration2:2.8.0:jar"
- "org.apache.commons:commons-text:1.10.0:jar"
+ "org.apache.commons:commons-configuration2:2.10.1:jar"
+ "org.apache.commons:commons-text:1.11.0:jar"
"org.apache.commons:commons-collections4:4.4:jar"
"org.apache.commons:commons-vfs2:2.9.0:jar"
- "commons-collections:commons-collections:3.2.2:jar"
- "commons-logging:commons-logging:1.2:jar"
+ "commons-logging:commons-logging:1.3.3:jar"
"org.apache.hadoop:hadoop-auth:${hadoop_version}:jar"
"org.apache.hadoop:hadoop-common:${hadoop_version}:jar"
"org.apache.hadoop:hadoop-hdfs:${hadoop_version}:jar"
- "org.apache.htrace:htrace-core:3.1.0-incubating:jar"
- "org.apache.htrace:htrace-core4:4.1.0-incubating:jar"
"com.fasterxml.woodstox:woodstox-core:5.3.0:jar"
"org.codehaus.woodstox:stax2-api:4.2.1:jar"
"com.google.guava:guava:${guava_install_version}:jar"
- "io.netty:netty-codec:%%netty.version%%:jar"
- "io.netty:netty-handler:%%netty.version%%:jar"
- "io.netty:netty-resolver:%%netty.version%%:jar"
- "io.netty:netty-transport:%%netty.version%%:jar"
- "io.netty:netty-transport-classes-epoll:%%netty.version%%:jar"
- "io.netty:netty-transport-native-epoll:%%netty.version%%:jar:linux-x86_64"
- "io.netty:netty-transport-native-unix-common:%%netty.version%%:jar"
)
# add accumulo 2.1 jars if needed
if version_ge "${accumulo_version}" 2.1.0; then
+ local micrometer_version
+ local opentelemetry_version
+
+ if version_ge "${accumulo_version}" 2.1.3; then
+ micrometer_version="1.12.2"
+ opentelemetry_version="1.34.1"
+ else
+ # these versions seem compatible even though they're not the exact versions shipped
+ micrometer_version="1.11.1"
+ opentelemetry_version="1.27.0"
+ gavs+=(
+ "io.opentelemetry:opentelemetry-semconv:${opentelemetry_version}-alpha:jar"
+ )
+ fi
+
gavs+=(
"org.apache.thrift:libthrift:%%thrift.version%%:jar"
- "io.opentelemetry:opentelemetry-api:1.19.0:jar"
- "io.opentelemetry:opentelemetry-context:1.19.0:jar"
- "io.opentelemetry:opentelemetry-semconv:1.19.0-alpha:jar"
- "io.micrometer:micrometer-core:1.9.6:jar"
+ "io.micrometer:micrometer-core:${micrometer_version}:jar"
+ "io.micrometer:micrometer-commons:${micrometer_version}:jar"
+ "io.opentelemetry:opentelemetry-api:${opentelemetry_version}:jar"
+ "io.opentelemetry:opentelemetry-context:${opentelemetry_version}:jar"
)
else
gavs+=(
diff --git a/geomesa-fs/geomesa-fs-datastore/src/test/scala/org/locationtech/geomesa/fs/HadoopSharedCluster.scala b/geomesa-fs/geomesa-fs-datastore/src/test/scala/org/locationtech/geomesa/fs/HadoopSharedCluster.scala
index 5a262f50b489..afddc16d3c41 100644
--- a/geomesa-fs/geomesa-fs-datastore/src/test/scala/org/locationtech/geomesa/fs/HadoopSharedCluster.scala
+++ b/geomesa-fs/geomesa-fs-datastore/src/test/scala/org/locationtech/geomesa/fs/HadoopSharedCluster.scala
@@ -25,7 +25,7 @@ object HadoopSharedCluster extends StrictLogging {
val ImageName =
DockerImageName.parse("ghcr.io/geomesa/accumulo-uno")
- .withTag(sys.props.getOrElse("accumulo.docker.tag", "2.1.2"))
+ .withTag(sys.props.getOrElse("accumulo.docker.tag", "2.1.3"))
lazy val Container: HadoopContainer = tryContainer.get
diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala
index 1c42d4b9164a..bc163fee3ec0 100644
--- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala
+++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala
@@ -33,7 +33,7 @@ class ZookeeperOffsetManagerTest extends Specification with BeforeAfterAll with
override def beforeAll(): Unit = {
val image =
DockerImageName.parse("zookeeper")
- .withTag(sys.props.getOrElse("zookeeper.docker.tag", "3.6.4"))
+ .withTag(sys.props.getOrElse("zookeeper.docker.tag", "3.9.2"))
container = new GenericContainer(image)
container.addExposedPort(2181)
container.start()
diff --git a/geomesa-tools/conf-filtered/geomesa-env.sh b/geomesa-tools/conf-filtered/geomesa-env.sh
index 7a2d3d83bfeb..d495fcf96069 100644
--- a/geomesa-tools/conf-filtered/geomesa-env.sh
+++ b/geomesa-tools/conf-filtered/geomesa-env.sh
@@ -167,18 +167,14 @@ function get_classpath_version() {
# find_jars [path] [bool: do not descend into sub directories]
function find_jars() {
local home="$1"
- local jars=()
+ local jars=""
if [[ -d "${home}" ]]; then
local find_args
- find_args=("-type" "f" "-iname" "*.jar" "-not" "-iname" "*-sources.jar" "-not" "-iname" "*-tests.jar" "-print0")
+ find_args=("-type" "f" "-iname" "*.jar" "-not" "-iname" "*-sources.jar" "-not" "-iname" "*-tests.jar")
if [[ "$2" == "true" ]]; then
find_args=("-maxdepth" "1" "${find_args[@]}")
fi
- # read results of find into jars array
- # don't use mapfile to support bash < 4.4 (RHEL 7)
- while IFS= read -r -d $'\0'; do
- jars+=("$REPLY")
- done < <(find "-L" "$home" "${find_args[@]}")
+ jars="$(find "-L" "$home" "${find_args[@]}" | paste -sd: -)"
if [[ -d "${home}/native" ]]; then
# TODO this doesn't export back to the parent shell... fix it
if [[ -z "${JAVA_LIBRARY_PATH}" ]]; then
@@ -188,8 +184,7 @@ function find_jars() {
fi
fi
fi
- ret=$(IFS=: ; echo "${jars[*]}")
- echo "$ret"
+ echo "$jars"
}
# args: destination for missing jars, current classpath, gavs, '--no-prompt'
diff --git a/pom.xml b/pom.xml
index bf79fff6e6c7..496d6c0da9ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
2.11.0
2.15.1
3.14.0
+ 1.3.3
2.12.0
1.11.0
3.6.0
@@ -126,7 +127,7 @@
2.28.2
- 2.1.2
+ 2.1.3
2.0.1
3.9.2
0.17.0
@@ -199,12 +200,12 @@
${maven.test.memory} ${maven.test.opens}
2
false
- 2.1.2
+ 2.1.3
7-alpine
15.1
15-3.4
7.6.0
- 3.6.4
+ 3.9.2
@@ -213,13 +214,13 @@
2024
- 2.1.2
+ 2.1.3
2.5.7
4.1.5
3.11.14
3.11.3
3.4.0
- 3.9.1
+ 3.9.2
7.6.0
@@ -1606,6 +1607,11 @@
commons-lang3
${commons.lang3.version}
+
+ commons-logging
+ commons-logging
+ ${commons.logging.version}
+
org.apache.commons
commons-text