diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 371db27..dd82318 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # Most recent LTS that passes tests
+          java-version: '17'  # until Spark 4 per SPARK-43831
       - name: Cache local Maven repository
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bef38da..7c8ba79 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # Most recent LTS that passes tests
+          java-version: '17'  # until Spark 4 per SPARK-43831
       - name: Cache local Maven repository
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9abde7e..7761d46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # Most recent LTS that passes tests
+          java-version: '17'  # until Spark 4 per SPARK-43831
       - name: Test without Docker
         run: build-bin/maven/maven_go_offline && build-bin/test -DexcludedGroups=docker
   test_docker:
@@ -69,7 +69,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # Most recent LTS that passes tests
+          java-version: '17'  # until Spark 4 per SPARK-43831
       - name: Test with Docker
         run: |
           build-bin/docker/configure_docker &&
diff --git a/.github/workflows/test_readme.yml b/.github/workflows/test_readme.yml
index 5543df7..626ab9a 100644
--- a/.github/workflows/test_readme.yml
+++ b/.github/workflows/test_readme.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # Most recent LTS that passes tests
+          java-version: '17'  # until Spark 4 per SPARK-43831
       - name: Cache local Maven repository
         uses: actions/cache@v3
         with:
diff --git a/README.md b/README.md
index aeff0e4..e296e55 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ are supported, including Cassandra, MySQL and Elasticsearch.
 
 ## Quick-start
 
-Until [SPARK-43831](https://issues.apache.org/jira/browse/SPARK-43831), Zipkin Dependencies requires Java 11 to run.
+Until [SPARK-43831](https://issues.apache.org/jira/browse/SPARK-43831), Zipkin Dependencies requires Java 17 to run.
 
 The quickest way to get started is to fetch the [latest released job](https://search.maven.org/remote_content?g=io.zipkin.dependencies&a=zipkin-dependencies&v=LATEST) as a self-contained jar. For example:
 
diff --git a/cassandra3/pom.xml b/cassandra3/pom.xml
index 1c9db1e..00375c3 100644
--- a/cassandra3/pom.xml
+++ b/cassandra3/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.1.6-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-cassandra3</artifactId>
@@ -19,6 +19,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <jnr-posix.version>3.1.19</jnr-posix.version>
   </properties>
 
   <dependencies>
@@ -28,6 +29,13 @@
       <version>${spark-cassandra-connector.version}</version>
     </dependency>
 
+    <!-- avoid warning at startup -->
+    <dependency>
+      <groupId>com.github.jnr</groupId>
+      <artifactId>jnr-posix</artifactId>
+      <version>${jnr-posix.version}</version>
+    </dependency>
+
     <!-- integration tests -->
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
index 252fcfc..a8161d8 100644
--- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
+++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
@@ -150,6 +150,9 @@ public CassandraDependenciesJob build() {
     df.setTimeZone(TimeZone.getTimeZone("UTC"));
     this.dateStamp = df.format(new Date(builder.day));
     this.conf = new SparkConf(true).setMaster(builder.sparkMaster).setAppName(getClass().getName());
+    if (builder.sparkMaster.startsWith("local[")) {
+      conf.set("spark.driver.bindAddress", "127.0.0.1");
+    }
     conf.set("spark.cassandra.connection.host", parseHosts(builder.contactPoints));
     conf.set("spark.cassandra.connection.port", parsePort(builder.contactPoints));
     conf.set("spark.cassandra.connection.localDC", builder.localDc);
@@ -232,7 +235,7 @@ static String parseHosts(String contactPoints) {
     List<String> result = new ArrayList<>();
     for (String contactPoint : contactPoints.split(",", -1)) {
       HostAndPort parsed = HostAndPort.fromString(contactPoint);
-      result.add(parsed.getHostText());
+      result.add(parsed.getHost());
     }
     return Joiner.on(',').join(result);
   }
diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java
index c97740a..0095741 100644
--- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java
+++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java
@@ -7,12 +7,12 @@
 import com.datastax.spark.connector.japi.CassandraRow;
 import com.datastax.spark.connector.japi.UDTValue;
 import com.datastax.spark.connector.types.TypeConverter;
+import java.io.Serializable;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.spark.api.java.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import scala.Serializable;
 import zipkin2.Endpoint;
 import zipkin2.Span;
 
diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java
index b1a5ade..82add62 100644
--- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java
+++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java
@@ -5,12 +5,12 @@
 package zipkin2.dependencies.cassandra3;
 
 import com.datastax.spark.connector.japi.CassandraRow;
+import java.io.Serializable;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.spark.api.java.function.FlatMapFunction;
-import scala.Serializable;
 import zipkin2.DependencyLink;
 import zipkin2.Span;
 
diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java
index 820c722..4ccd2ac 100644
--- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java
+++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java
@@ -4,13 +4,13 @@
  */
 package zipkin2.dependencies.cassandra3;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.apache.spark.api.java.function.FlatMapFunction;
-import scala.Serializable;
 import zipkin2.DependencyLink;
 import zipkin2.Span;
 import zipkin2.internal.DependencyLinker;
diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java
index 2619661..3ea38c2 100644
--- a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java
+++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java
@@ -50,7 +50,7 @@ final class CassandraContainer extends GenericContainer<CassandraContainer> {
   );
 
   CassandraContainer() {
-    super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.2.1"));
+    super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.3.0"));
     addExposedPort(9042);
     waitStrategy = Wait.forHealthcheck();
     withLogConsumer(new Slf4jLogConsumer(LOGGER));
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 39ce48a..725ebd2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,8 +9,8 @@
 # This is defined in many places because Docker has no "env" script functionality unless you use
 # docker-compose: When updating, update everywhere.
 #
-# TODO: temporarily 11 until we can update to spark on scala 2.13
-ARG java_version=11.0.22_p7
+# Note: JDK 17 until Spark 4 per SPARK-43831
+ARG java_version=17.0.10_p7
 
 # We copy files from the context into a scratch container first to avoid a problem where docker and
 # docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
@@ -37,9 +37,9 @@ ENV VERSION=$version
 ENV MAVEN_PROJECT_BASEDIR=/code
 RUN /code/build-bin/maven/maven_build_or_unjar io.zipkin.dependencies zipkin-dependencies ${VERSION}
 
-# Try -jre again once Spark dependencies are up to date. Spark 3.0 uses old Hadoop in the
-# Elasticsearch driver which needs com.sun.security.auth.module.UnixLoginModule.
-FROM ghcr.io/openzipkin/java:11.0.22_p7 as zipkin-dependencies
+# Try -jre again once Spark 4.0 is released. Spark 3.x uses old Hadoop in the
+# Elasticsearch driver which needs com.sun.security.auth.module.UnixLoginModule
+FROM ghcr.io/openzipkin/java:17.0.10_p7 as zipkin-dependencies
 LABEL org.opencontainers.image.description="Zipkin Dependencies Aggregator on OpenJDK and Alpine Linux"
 LABEL org.opencontainers.image.source=https://github.com/openzipkin/zipkin-dependencies
 
diff --git a/docker/bin/start-zipkin-dependencies b/docker/bin/start-zipkin-dependencies
index 9323968..e6c4b3f 100755
--- a/docker/bin/start-zipkin-dependencies
+++ b/docker/bin/start-zipkin-dependencies
@@ -8,4 +8,24 @@
 # args override it (Ex. 2020-10-31)
 set -eu
 
-exec java ${JAVA_OPTS} -Djava.io.tmpdir=/tmp -cp classes zipkin2.dependencies.ZipkinDependenciesJob $@
+# Spark 3.4 module config from:
+# https://github.com/apache/spark/blob/branch-3.4/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java#L29
+exec java ${JAVA_OPTS} -Djava.io.tmpdir=/tmp \
+  -XX:+IgnoreUnrecognizedVMOptions \
+  --add-opens=java.base/java.lang=ALL-UNNAMED \
+  --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
+  --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+  --add-opens=java.base/java.io=ALL-UNNAMED \
+  --add-opens=java.base/java.net=ALL-UNNAMED \
+  --add-opens=java.base/java.nio=ALL-UNNAMED \
+  --add-opens=java.base/java.util=ALL-UNNAMED \
+  --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+  --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
+  --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED \
+  --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
+  --add-opens=java.base/sun.nio.cs=ALL-UNNAMED \
+  --add-opens=java.base/sun.security.action=ALL-UNNAMED \
+  --add-opens=java.base/sun.util.calendar=ALL-UNNAMED \
+  --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
+  -Djdk.reflect.useDirectMethodHandle=false \
+  -cp classes zipkin2.dependencies.ZipkinDependenciesJob $@
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index e84c16c..6a92241 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.1.6-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-elasticsearch</artifactId>
diff --git a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java
index 264617e..4cfd635 100644
--- a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java
+++ b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java
@@ -154,6 +154,9 @@ private static String getSystemPropertyAsFileResource(String key) {
     df.setTimeZone(TimeZone.getTimeZone("UTC"));
     this.dateStamp = df.format(new Date(builder.day));
     this.conf = new SparkConf(true).setMaster(builder.sparkMaster).setAppName(getClass().getName());
+    if (builder.sparkMaster.startsWith("local[")) {
+      conf.set("spark.driver.bindAddress", "127.0.0.1");
+    }
     if (builder.jars != null) conf.setJars(builder.jars);
     if (builder.username != null) conf.set(ES_NET_HTTP_AUTH_USER, builder.username);
     if (builder.password != null) conf.set(ES_NET_HTTP_AUTH_PASS, builder.password);
@@ -167,33 +170,27 @@ private static String getSystemPropertyAsFileResource(String key) {
   }
 
   public void run() {
-    run(
-      index + "-span-" + dateStamp,
-      index + "-dependency-" + dateStamp,
-      SpanBytesDecoder.JSON_V2);
-
-    log.info("Done");
-  }
+    String spanResource = index + "-span-" + dateStamp;
+    String dependencyLinkResource = index + "-dependency-" + dateStamp;
+    SpanBytesDecoder decoder = SpanBytesDecoder.JSON_V2;
 
-  void run(String spanResource, String dependencyLinkResource, SpanBytesDecoder decoder) {
     log.info("Processing spans from {}", spanResource);
-    JavaSparkContext sc = new JavaSparkContext(conf);
-    try {
-      JavaRDD<Map<String, Object>> links =
-        JavaEsSpark.esJsonRDD(sc, spanResource)
-          .groupBy(JSON_TRACE_ID)
-          .flatMapValues(new TraceIdAndJsonToDependencyLinks(logInitializer, decoder))
-          .values()
-          .mapToPair((PairFunction<DependencyLink, Tuple2<String, String>, DependencyLink>) l ->
-            new Tuple2<>(new Tuple2<>(l.parent(), l.child()), l))
-          .reduceByKey((l, r) -> DependencyLink.newBuilder()
-            .parent(l.parent())
-            .child(l.child())
-            .callCount(l.callCount() + r.callCount())
-            .errorCount(l.errorCount() + r.errorCount())
-            .build())
-          .values()
-          .map(DEPENDENCY_LINK_JSON);
+    JavaRDD<Map<String, Object>> links;
+    try (JavaSparkContext sc = new JavaSparkContext(conf)) {
+      links = JavaEsSpark.esJsonRDD(sc, spanResource)
+        .groupBy(JSON_TRACE_ID)
+        .flatMapValues(new TraceIdAndJsonToDependencyLinks(logInitializer, decoder))
+        .values()
+        .mapToPair((PairFunction<DependencyLink, Tuple2<String, String>, DependencyLink>) l ->
+          new Tuple2<>(new Tuple2<>(l.parent(), l.child()), l))
+        .reduceByKey((l, r) -> DependencyLink.newBuilder()
+          .parent(l.parent())
+          .child(l.child())
+          .callCount(l.callCount() + r.callCount())
+          .errorCount(l.errorCount() + r.errorCount())
+          .build())
+        .values()
+        .map(DEPENDENCY_LINK_JSON);
 
       if (links.isEmpty()) {
         log.info("No dependency links could be processed from spans in index {}", spanResource);
@@ -204,9 +201,9 @@ void run(String spanResource, String dependencyLinkResource, SpanBytesDecoder de
           dependencyLinkResource,
           Collections.singletonMap("es.mapping.id", "id")); // allows overwriting the link
       }
-    } finally {
-      sc.stop();
     }
+
+    log.info("Done");
   }
 
   /**
diff --git a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java
index b8c95ab..78fe8da 100644
--- a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java
+++ b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java
@@ -4,6 +4,7 @@
  */
 package zipkin2.dependencies.elasticsearch;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -11,7 +12,6 @@
 import org.apache.spark.api.java.function.FlatMapFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import scala.Serializable;
 import scala.Tuple2;
 import zipkin2.DependencyLink;
 import zipkin2.Span;
diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java
index e65a3bc..1f8dabd 100644
--- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java
+++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java
@@ -33,7 +33,7 @@ class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
   static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchContainer.class);
 
   ElasticsearchContainer(int majorVersion) {
-    super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.2.1"));
+    super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.3.0"));
     addExposedPort(9200);
     waitStrategy = Wait.forHealthcheck();
     withLogConsumer(new Slf4jLogConsumer(LOGGER));
diff --git a/main/pom.xml b/main/pom.xml
index e7f38ee..c61b8a6 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.1.6-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies</artifactId>
@@ -77,18 +77,6 @@
                     <include>**</include>
                   </includes>
                 </filter>
-                <filter>
-                  <artifact>org.apache.hadoop:hadoop-common</artifact>
-                  <includes>
-                    <include>**</include>
-                  </includes>
-                </filter>
-                <filter>
-                  <artifact>log4j:log4j</artifact>
-                  <includes>
-                    <include>**</include>
-                  </includes>
-                </filter>
                 <filter>
                   <artifact>io.netty:*</artifact>
                   <includes>
@@ -128,22 +116,15 @@
                   </includes>
                 </filter>
                 <filter>
-                  <!-- com.datastax.oss.driver.internal.core.metrics.DropwizardMetricsFactory -->
-                  <artifact>com.datastax.oss:java-driver-core-shaded</artifact>
+                  <!-- jnr.posix.POSIXHandler -->
+                  <artifact>com.github.jnr:jnr-posix</artifact>
                   <includes>
                     <include>**</include>
                   </includes>
                 </filter>
                 <filter>
-                  <!-- elasticsearch -->
-                  <artifact>commons-httpclient:commons-httpclient</artifact>
-                  <includes>
-                    <include>**</include>
-                  </includes>
-                </filter>
-                <filter>
-                  <!-- org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -->
-                  <artifact>xerces:xercesImpl</artifact>
+                  <!-- com.datastax.oss.driver.internal.core.metrics.DropwizardMetricsFactory -->
+                  <artifact>com.datastax.oss:java-driver-core-shaded</artifact>
                   <includes>
                     <include>**</include>
                   </includes>
diff --git a/main/src/main/resources/log4j.properties b/main/src/main/resources/log4j.properties
deleted file mode 100644
index fe2a90c..0000000
--- a/main/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Set everything to be logged to the console
-log4j.rootCategory=WARN, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
-
-# Settings to quiet third party logs that are too verbose
-log4j.logger.org.spark-project.jetty=WARN
-log4j.logger.org.spark-project.jetty.util.component.AbstractLifeCycle=ERROR
-log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
-log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
-
-# SPARK-9183: Settings to avoid annoying messages when looking up nonexistent UDFs in SparkSQL with Hive support
-log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=FATAL
-log4j.logger.org.apache.hadoop.hive.ql.exec.FunctionRegistry=ERROR
-
-# java.lang.NoClassDefFoundError: jnr/posix/POSIXHandler
-log4j.logger.com.datastax.oss.driver.internal.core.os.Native=WARN
diff --git a/main/src/main/resources/log4j2.properties b/main/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..891db76
--- /dev/null
+++ b/main/src/main/resources/log4j2.properties
@@ -0,0 +1,14 @@
+# Set everything to be logged to the console
+appenders=console
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%t] %C{2} (%F:%L) - %m%n
+
+rootLogger.level=warn
+rootLogger.appenderRefs=stdout
+rootLogger.appenderRef.stdout.ref=STDOUT
+
+# Make sure basic status is logged for all backends
+logger.zipkin2.name = zipkin2.dependencies
+logger.zipkin2.level = info
diff --git a/mysql/pom.xml b/mysql/pom.xml
index e6edec5..4bceac5 100644
--- a/mysql/pom.xml
+++ b/mysql/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.1.6-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-mysql</artifactId>
diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java b/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java
index 495c8d2..f769cab 100644
--- a/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java
+++ b/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java
@@ -158,6 +158,9 @@ public MySQLDependenciesJob build() {
     this.conf = new SparkConf(true)
         .setMaster(builder.sparkMaster)
         .setAppName(getClass().getName());
+    if (builder.sparkMaster.startsWith("local[")) {
+      conf.set("spark.driver.bindAddress", "127.0.0.1");
+    }
     if (builder.jars != null) conf.setJars(builder.jars);
     for (Map.Entry<String, String> entry : builder.sparkProperties.entrySet()) {
       conf.set(entry.getKey(), entry.getValue());
@@ -182,22 +185,24 @@ public void run() {
     String fields = "s.trace_id, s.parent_id, s.id, a.a_key, a.endpoint_service_name, a.a_type";
     if (hasTraceIdHigh) fields = "s.trace_id_high, " + fields;
     String groupByFields = fields.replace("s.parent_id, ", "");
-    String linksQuery = String.format(
-        "select distinct %s "+
-            "from zipkin_spans s left outer join zipkin_annotations a on " +
-            "  (s.trace_id = a.trace_id and s.id = a.span_id " +
-            "     and a.a_key in ('lc', 'ca', 'cs', 'sa', 'sr', 'ma', 'ms', 'mr', 'error')) " +
-            "where s.start_ts between %s and %s group by %s",
-        fields, microsLower, microsUpper, groupByFields);
+    String linksQuery = (
+      """
+      select distinct %s \
+      from zipkin_spans s left outer join zipkin_annotations a on \
+        (s.trace_id = a.trace_id and s.id = a.span_id \
+           and a.a_key in ('lc', 'ca', 'cs', 'sa', 'sr', 'ma', 'ms', 'mr', 'error')) \
+      where s.start_ts between %s and %s group by %s\
+      """).formatted(
+      fields, microsLower, microsUpper, groupByFields);
 
     options.put("dbtable", "(" + linksQuery + ") as link_spans");
 
     log.info("Running Dependencies job for {}: start_ts between {} and {}", dateStamp, microsLower,
         microsUpper);
 
-    JavaSparkContext sc = new JavaSparkContext(conf);
-
-    List<DependencyLink> links = new SQLContext(sc).read()
+    List<DependencyLink> links;
+    try (JavaSparkContext sc = new JavaSparkContext(conf)) {
+      links = new SQLContext(sc).read()
         .format("org.apache.spark.sql.execution.datasources.jdbc.JdbcRelationProvider")
         .options(options)
         .load()
@@ -213,8 +218,7 @@ public void run() {
           .errorCount(l.errorCount() + r.errorCount())
           .build())
         .values().collect();
-
-    sc.stop();
+    }
 
     log.info("Saving with day=" + dateStamp);
     saveToMySQL(links);
diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java b/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java
index 6caadc1..0278f16 100644
--- a/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java
+++ b/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java
@@ -4,6 +4,7 @@
  */
 package zipkin2.dependencies.mysql;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -11,13 +12,12 @@
 import javax.annotation.Nullable;
 import org.apache.spark.api.java.function.FlatMapFunction;
 import org.apache.spark.sql.Row;
-import scala.Serializable;
 import zipkin2.DependencyLink;
 import zipkin2.Span;
 import zipkin2.internal.DependencyLinker;
 
 final class RowsToDependencyLinks
-    implements Serializable, FlatMapFunction<Iterable<Row>, DependencyLink> {
+  implements Serializable, FlatMapFunction<Iterable<Row>, DependencyLink> {
   private static final long serialVersionUID = 0L;
 
   @Nullable final Runnable logInitializer;
@@ -31,7 +31,7 @@ final class RowsToDependencyLinks
   @Override public Iterator<DependencyLink> call(Iterable<Row> rows) {
     if (logInitializer != null) logInitializer.run();
     Iterator<Iterator<Span>> traces =
-        new DependencyLinkSpanIterator.ByTraceId(rows.iterator(), hasTraceIdHigh);
+      new DependencyLinkSpanIterator.ByTraceId(rows.iterator(), hasTraceIdHigh);
 
     if (!traces.hasNext()) return Collections.emptyIterator();
 
diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java
index 8965052..43573f6 100644
--- a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java
+++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java
@@ -24,7 +24,7 @@ final class MySQLContainer extends GenericContainer<MySQLContainer> {
   static final Logger LOGGER = LoggerFactory.getLogger(MySQLContainer.class);
 
   MySQLContainer() {
-    super(parse("ghcr.io/openzipkin/zipkin-mysql:3.2.1"));
+    super(parse("ghcr.io/openzipkin/zipkin-mysql:3.3.0"));
     addExposedPort(3306);
     waitStrategy = Wait.forHealthcheck();
     withLogConsumer(new Slf4jLogConsumer(LOGGER));
@@ -39,8 +39,8 @@ MySQLStorage.Builder newStorageBuilder() {
     final MariaDbDataSource dataSource;
 
     try {
-      dataSource = new MariaDbDataSource(String.format(
-        "jdbc:mysql://%s:%s/zipkin?permitMysqlScheme&autoReconnect=true&useUnicode=yes&characterEncoding=UTF-8",
+      dataSource = new MariaDbDataSource(
+        "jdbc:mysql://%s:%s/zipkin?permitMysqlScheme&autoReconnect=true&useUnicode=yes&characterEncoding=UTF-8".formatted(
         host(), port()));
       dataSource.setUser("zipkin");
       dataSource.setPassword("zipkin");
diff --git a/pom.xml b/pom.xml
index 60d1ffc..96c80ea 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>io.zipkin.dependencies</groupId>
   <artifactId>zipkin-dependencies-parent</artifactId>
-  <version>3.1.6-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -28,41 +28,54 @@
 
     <main.basedir>${project.basedir}</main.basedir>
 
-    <!-- All source is Java 11+ -->
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <!-- All source is Java 17+ -->
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <!-- We don't use animal-sniffer anymore as release obviates it.
          See https://github.com/mojohaus/animal-sniffer/issues/62 -->
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
 
-    <maven.compiler.testSource>11</maven.compiler.testSource>
-    <maven.compiler.testTarget>11</maven.compiler.testTarget>
+    <maven.compiler.testSource>17</maven.compiler.testSource>
+    <maven.compiler.testTarget>17</maven.compiler.testTarget>
     <!-- We don't use animal-sniffer anymore as release obviates it.
          See https://github.com/mojohaus/animal-sniffer/issues/62 -->
-    <maven.compiler.testRelease>11</maven.compiler.testRelease>
+    <maven.compiler.testRelease>17</maven.compiler.testRelease>
+
+    <!-- Spark 3.4 module config from:
+         https://github.com/apache/spark/blob/branch-3.4/launcher/src/main/java/org/apache/spark/launcher/JavaModuleOptions.java#L29 -->
+    <maven.test.argLine>
+      -XX:+IgnoreUnrecognizedVMOptions
+      --add-opens=java.base/java.lang=ALL-UNNAMED
+      --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+      --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+      --add-opens=java.base/java.io=ALL-UNNAMED
+      --add-opens=java.base/java.net=ALL-UNNAMED
+      --add-opens=java.base/java.nio=ALL-UNNAMED
+      --add-opens=java.base/java.util=ALL-UNNAMED
+      --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+      --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+      --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED
+      --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+      --add-opens=java.base/sun.nio.cs=ALL-UNNAMED
+      --add-opens=java.base/sun.security.action=ALL-UNNAMED
+      --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
+      --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED
+      -Djdk.reflect.useDirectMethodHandle=false
+    </maven.test.argLine>
 
     <!-- override to set exclusions per-project -->
     <errorprone.args />
     <errorprone.version>2.26.1</errorprone.version>
 
-    <!-- Use a common scala binary version, and the highest spark patch version.
-         Scala 2.13 is held back due to spark version conflicts until Elastic
-         updates their version. Once 2.13 works, we can also use JDK 17 per
-         https://issues.apache.org/jira/browse/SPARK-33772 and possibly 12 per
-         https://issues.apache.org/jira/browse/SPARK-43831
-
-         Another way is for datastax to add 3.3 on Scala 2.13 per
-         https://datastax-oss.atlassian.net/browse/SPARKC-709 -->
-    <scala.binary.version>2.12</scala.binary.version>
-    <!-- Latest patch of highest common minor. 3.3, not 3.5 until ES updates.
-         See https://github.com/elastic/elasticsearch-hadoop/issues/2187 -->
-    <spark.version>3.3.4</spark.version>
+    <!-- Use a common scala binary version, and the highest spark patch. -->
+    <scala.binary.version>2.13</scala.binary.version>
+    <spark.version>3.4.2</spark.version>
 
     <!-- This dependency is in elasticsearch-hadoop -->
-    <elasticsearch-spark.version>8.13.2</elasticsearch-spark.version>
+    <elasticsearch-spark.version>8.14.0-SNAPSHOT</elasticsearch-spark.version>
 
     <!-- Use latest Cassandra connector matching minor versioned of spark. -->
-    <spark-cassandra-connector.version>3.3.0</spark-cassandra-connector.version>
+    <spark-cassandra-connector.version>3.4.1</spark-cassandra-connector.version>
     <!-- Note: Zipkin uses the Apache java-driver. Watch for the connector to
          change from DataStax to this. -->
     <java-driver.version>4.17.0</java-driver.version>
@@ -70,12 +83,22 @@
     <!-- Use zipkin's version of MariaDB client -->
     <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
 
+    <!-- CVE fix versions: re-evaluate after spark bumps -->
+    <avro.version>1.11.3</avro.version>
+    <commons-compress.version>1.26.1</commons-compress.version>
+    <guava.version>32.1.3-jre</guava.version>
+    <ivy.version>2.5.2</ivy.version>
+    <protobuf.version>3.25.1</protobuf.version>
+    <scala.version>2.13.13</scala.version>
+    <snappy-java.version>1.1.10.5</snappy-java.version>
+    <zookeeper.version>3.9.2</zookeeper.version>
+
     <junit-jupiter.version>5.10.2</junit-jupiter.version>
     <testcontainers.version>1.19.7</testcontainers.version>
 
     <!-- These need to match zipkin, so that tests don't have classpath
          conflicts. When updating, also update IT*.java -->
-    <zipkin.version>3.2.1</zipkin.version>
+    <zipkin.version>3.3.0</zipkin.version>
     <armeria.version>1.28.0</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
     <netty.version>4.1.108.Final</netty.version>
@@ -156,6 +179,20 @@
     <url>https://github.com/openzipkin/zipkin-dependencies/issues</url>
   </issueManagement>
 
+  <!-- TODO: Remove on Elasticsearch 8.14.0 -->
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -187,6 +224,53 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- CVE fix versions -->
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro</artifactId>
+        <version>${avro.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>${commons-compress.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ivy</groupId>
+        <artifactId>ivy</artifactId>
+        <version>${ivy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${scala.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-reflect</artifactId>
+        <version>${scala.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.xerial.snappy</groupId>
+        <artifactId>snappy-java</artifactId>
+        <version>${snappy-java.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${zookeeper.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -329,6 +413,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <argLine>${maven.test.argLine}</argLine>
+        </configuration>
       </plugin>
 
       <plugin>
@@ -345,6 +432,7 @@
           </execution>
         </executions>
         <configuration>
+          <argLine>${maven.test.argLine}</argLine>
           <!-- Try to prevent flakes in CI -->
           <reuseForks>false</reuseForks>
           <!-- workaround to SUREFIRE-1831 -->
@@ -368,7 +456,8 @@
                 <requireJavaVersion>
                   <!-- Change this to control LTS JDK versions allowed to build
                        the project. Keep in sync with .github/workflows -->
-                  <version>[11,12)</version>
+                  <!-- Note: JDK 17 until Spark 4 per SPARK-43831 -->
+                  <version>[17,18)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -465,10 +554,11 @@
 
   <profiles>
     <profile>
-      <id>error-prone-11+</id>
+      <id>error-prone-17+</id>
       <activation>
         <!-- Only LTS versions -->
-        <jdk>[11,12)</jdk>
+        <!-- Note: JDK 17 until Spark 4 per SPARK-43831 -->
+        <jdk>[17,18)</jdk>
       </activation>
       <build>
         <plugins>
@@ -493,6 +583,17 @@
                   <compilerArgs>
                     <arg>-XDcompilePolicy=simple</arg>
                     <arg>-Xplugin:ErrorProne ${errorprone.args}</arg>
+                    <!-- below needed for JDK16+ per https://errorprone.info/docs/installation -->
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                    <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                    <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+                    <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                   </compilerArgs>
                   <annotationProcessorPaths>
                     <processorPath>