Skip to content

Commit fdbdcaf

Browse files
authored
Fix reference to spark-test module in javadocs, bom (#3463)
* Tweak spark-fs test startup
1 parent c9eb22d commit fdbdcaf

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/workflows/javadocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: redis
5454
list: geomesa-redis/geomesa-redis-datastore,geomesa-redis/geomesa-redis-dist,geomesa-redis/geomesa-redis-gs-plugin,geomesa-redis/geomesa-redis-tools
5555
- name: spark
56-
list: geomesa-spark/geomesa_pyspark,geomesa-spark/geomesa-spark-converter,geomesa-spark/geomesa-spark-core,geomesa-spark/geomesa-spark-jts,geomesa-spark/geomesa-spark-jupyter-leaflet,geomesa-spark/geomesa-spark-sql,geomesa-spark/geomesa-spark-test,geomesa-spark/geomesa-spark-test-with-sedona
56+
list: geomesa-spark/geomesa_pyspark,geomesa-spark/geomesa-spark-converter,geomesa-spark/geomesa-spark-core,geomesa-spark/geomesa-spark-jts,geomesa-spark/geomesa-spark-jupyter-leaflet,geomesa-spark/geomesa-spark-sql,geomesa-spark/geomesa-spark-test-with-sedona
5757
- name: utils
5858
list: geomesa-utils-parent/geomesa-bom,geomesa-utils-parent/geomesa-hadoop-utils,geomesa-utils-parent/geomesa-utils
5959
steps:

geomesa-fs/geomesa-fs-spark/src/test/scala/org/locationtech/geomesa/fs/spark/FileSystemRDDProviderIT.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import org.locationtech.geomesa.utils.text.WKTUtils
2121
import org.specs2.mutable.SpecificationWithJUnit
2222
import org.specs2.specification.BeforeAfterAll
2323
import org.testcontainers.containers.Network
24-
import org.testcontainers.lifecycle.Startables
2524

2625
import java.nio.file.{Files, Path}
2726
import java.util.Collections
@@ -71,7 +70,9 @@ class FileSystemRDDProviderIT extends SpecificationWithJUnit with BeforeAfterAll
7170
val formats = Seq(/*"orc",*/ "parquet") // TODO fix orc
7271

7372
override def beforeAll(): Unit = {
74-
Startables.deepStart(hadoop, cluster).get()
73+
// note: the host reach-back networking required for spark seems to mess up the hadoop networking unless hadoop starts first
74+
hadoop.start()
75+
cluster.start()
7576

7677
// note: have to create all data up front to avoid caching issues in the spark executor
7778
formats.foreach { format =>

geomesa-utils-parent/geomesa-bom/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,6 @@
465465
<artifactId>geomesa-spark-test-with-sedona_${scala.binary.version}</artifactId>
466466
<version>${project.version}</version>
467467
</dependency>
468-
<dependency>
469-
<groupId>org.locationtech.geomesa</groupId>
470-
<artifactId>geomesa-spark-test_${scala.binary.version}</artifactId>
471-
<version>${project.version}</version>
472-
</dependency>
473468
<dependency>
474469
<groupId>org.locationtech.geomesa</groupId>
475470
<artifactId>geomesa-tools_${scala.binary.version}</artifactId>

0 commit comments

Comments
 (0)