Update dependencies

.circleci/config.yml

@@ -18,15 +18,15 @@ executors:
       - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
           # https://circleci.com/docs/2.0/java-oom/
-          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1536m"
       - image: nginx:1.18.0
         command: /bin/bash -c "cd /usr/share/nginx/html && curl -o all-ones.tif https://raw.githubusercontent.com/locationtech/geotrellis/v3.3.0/spark/src/test/resources/all-ones.tif && cd ~- && sed -i 's/listen       80;/listen       8081;/g' /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"
 
   executor-s3:
     docker:
       - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1536m"
       - image: minio/minio:RELEASE.2019-05-02T19-07-09Z
         environment:
           _JAVA_OPTIONS: "-Xms1m -Xmx512m"
@@ -38,7 +38,7 @@ executors:
     docker:
       - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1536m"
       - image: cassandra:3.11.6
         environment:
           _JAVA_OPTIONS: "-Xms1m -Xmx512m"
@@ -50,7 +50,7 @@ executors:
     docker:
       - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1536m"
       # https://github.com/pomadchin/hbase-docker
       - image: daunnc/hbase:2.1.4
         environment:

.sbtopts

@@ -1,6 +1,7 @@
--J-Xmx1280m
+-J-Xmx1536m
 -J-Xms64m
 -J-Xss2M
+-J-XX:+UseConcMarkSweepGC
 -J-XX:+CMSClassUnloadingEnabled
 -Dfile.encoding=UTF8
 -Djava.awt.headless=true

accumulo-spark/src/main/scala/geotrellis/spark/store/accumulo/AccumuloLayerManager.scala

@@ -18,16 +18,12 @@ package geotrellis.spark.store.accumulo
 
 import geotrellis.layer._
 import geotrellis.store._
-import geotrellis.store.AttributeStore.Fields
 import geotrellis.store.accumulo._
 import geotrellis.store.avro.AvroRecordCodec
 import geotrellis.store.index._
-import geotrellis.spark._
-import geotrellis.spark.store._
 import geotrellis.util._
 
 import org.apache.spark.SparkContext
-import org.apache.spark.rdd.RDD
 import io.circe._
 
 import scala.reflect.ClassTag

accumulo-spark/src/main/scala/geotrellis/spark/store/accumulo/AccumuloLayerMover.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.spark.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo._
 

accumulo-spark/src/main/scala/geotrellis/spark/store/accumulo/AccumuloLayerReindexer.scala

@@ -21,7 +21,6 @@ import geotrellis.store._
 import geotrellis.store.accumulo._
 import geotrellis.store.avro._
 import geotrellis.store.index._
-import geotrellis.spark.store._
 import geotrellis.util._
 
 import org.apache.spark.SparkContext

accumulo-spark/src/main/scala/geotrellis/spark/store/accumulo/AccumuloLayerWriter.scala

@@ -23,7 +23,6 @@ import geotrellis.store.avro._
 import geotrellis.store.avro.codecs._
 import geotrellis.store.index._
 import geotrellis.spark.store._
-import geotrellis.spark.merge._
 import geotrellis.util._
 
 import org.log4s._

accumulo-spark/src/main/scala/geotrellis/spark/store/accumulo/AccumuloSparkLayerProvider.scala

@@ -16,10 +16,8 @@
 
 package geotrellis.spark.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo._
-import geotrellis.store.accumulo.conf.AccumuloConfig
 import geotrellis.spark.store._
 import geotrellis.util.UriUtils
 

accumulo-spark/src/test/scala/geotrellis/spark/AccumuloTestEnvironment.scala

@@ -21,7 +21,7 @@ import geotrellis.spark.testkit.TestEnvironment
 
 import org.apache.spark.SparkConf
 
-import org.scalatest._
+import org.scalatest.Suite
 
 trait AccumuloTestEnvironment extends TestEnvironment { self: Suite =>
   override def setKryoRegistrator(conf: SparkConf) =

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloAttributeStoreSpec.scala

@@ -16,10 +16,8 @@
 
 package geotrellis.spark.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo._
-import geotrellis.spark._
 import geotrellis.spark.store._
 import org.apache.accumulo.core.client.security.tokens.PasswordToken
 

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloLayerProviderSpec.scala

@@ -16,14 +16,14 @@
 
 package geotrellis.spark.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo._
 import geotrellis.spark.store._
 import geotrellis.spark.testkit.TestEnvironment
-import org.scalatest._
 
-class AccumuloLayerProviderSpec extends FunSpec with TestEnvironment {
+import org.scalatest.funspec.AnyFunSpec
+
+class AccumuloLayerProviderSpec extends AnyFunSpec with TestEnvironment {
   val uri = new java.net.URI("accumulo://root:@localhost/fake?attributes=attributes&layers=tiles")
   it("construct AccumuloAttributeStore from URI"){
     val store = AttributeStore(uri)

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloSpaceTimeSpec.scala

@@ -21,7 +21,6 @@ import geotrellis.raster.Tile
 import geotrellis.store.accumulo._
 import geotrellis.spark._
 import geotrellis.spark.store._
-import geotrellis.store.index._
 import geotrellis.spark.testkit.io._
 import geotrellis.spark.testkit.testfiles.TestFiles
 import geotrellis.spark.testkit.TestEnvironment

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloSpatialSpec.scala

@@ -21,7 +21,6 @@ import geotrellis.layer._
 import geotrellis.store.accumulo._
 import geotrellis.spark._
 import geotrellis.spark.store._
-import geotrellis.store.index._
 import geotrellis.spark.testkit.io._
 import geotrellis.spark.testkit.testfiles.TestFiles
 import geotrellis.spark.testkit.TestEnvironment

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala

@@ -22,7 +22,6 @@ import geotrellis.layer._
 import geotrellis.store.accumulo._
 import geotrellis.spark._
 import geotrellis.spark.store._
-import geotrellis.store.index._
 import geotrellis.spark.testkit.io._
 import geotrellis.spark.testkit.testfiles.TestTileFeatureFiles
 import geotrellis.spark.testkit.TestEnvironment

accumulo-spark/src/test/scala/geotrellis/spark/store/accumulo/AccumuloTileFeatureSpatialSpec.scala

@@ -21,7 +21,6 @@ import geotrellis.layer._
 import geotrellis.store.accumulo._
 import geotrellis.spark._
 import geotrellis.spark.store._
-import geotrellis.store.index._
 import geotrellis.spark.testkit.io._
 import geotrellis.spark.testkit.testfiles.TestTileFeatureFiles
 import geotrellis.spark.testkit.TestEnvironment

accumulo/src/main/scala/geotrellis/store/accumulo/AccumuloAttributeStore.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo.conf.AccumuloConfig
 

accumulo/src/main/scala/geotrellis/store/accumulo/AccumuloCollectionLayerProvider.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.accumulo.conf.AccumuloConfig
 import geotrellis.util.UriUtils

accumulo/src/main/scala/geotrellis/store/accumulo/AccumuloLayerDeleter.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 
 import org.log4s._

accumulo/src/main/scala/geotrellis/store/accumulo/AccumuloLayerHeader.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.accumulo
 
-import geotrellis.layer._
 import geotrellis.store._
 
 import io.circe._

accumulo/src/main/scala/geotrellis/store/accumulo/AccumuloUtils.scala

@@ -17,11 +17,8 @@
 package geotrellis.store.accumulo
 
 import geotrellis.layer._
-import geotrellis.store.accumulo._
-import geotrellis.store.index.{KeyIndexMethod, KeyIndex}
+import geotrellis.store.index.KeyIndex
 
-import org.apache.accumulo.core.data.Key
-import org.apache.hadoop.io.Text
 
 import scala.collection.JavaConverters._
 

accumulo/src/main/scala/geotrellis/store/accumulo/conf/AccumuloConfig.scala

@@ -16,11 +16,12 @@
 
 package geotrellis.store.accumulo.conf
 
+import pureconfig.ConfigSource
 import pureconfig.generic.auto._
 
 case class AccumuloConfig(catalog: String = "metadata")
 
 object AccumuloConfig {
-  lazy val conf: AccumuloConfig = pureconfig.loadConfigOrThrow[AccumuloConfig]("geotrellis.accumulo")
+  lazy val conf: AccumuloConfig = ConfigSource.default.at("geotrellis.accumulo").loadOrThrow[AccumuloConfig]
   implicit def accumuloConfigToClass(obj: AccumuloConfig.type): AccumuloConfig = conf
 }

build.sbt

@@ -1,9 +1,9 @@
 import sbt.Keys._
 import de.heikoseeberger.sbtheader._
 
-ThisBuild / scalaVersion := "2.12.11"
+ThisBuild / scalaVersion := "2.12.12"
 ThisBuild / organization := "org.locationtech.geotrellis"
-ThisBuild / crossScalaVersions := List("2.12.11", "2.11.12")
+ThisBuild / crossScalaVersions := List("2.12.12", "2.11.12")
 
 lazy val root = Project("geotrellis", file("."))
   .aggregate(

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraLayerCopier.scala

@@ -20,7 +20,6 @@ import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra._
 import geotrellis.store.avro._
-import geotrellis.spark.store._
 import geotrellis.util._
 
 import org.apache.spark.SparkContext

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraLayerManager.scala

@@ -21,7 +21,6 @@ import geotrellis.store._
 import geotrellis.store.cassandra._
 import geotrellis.store.avro.AvroRecordCodec
 import geotrellis.store.index._
-import geotrellis.spark.store._
 import geotrellis.util._
 
 import org.apache.spark.SparkContext

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraLayerMover.scala

@@ -16,10 +16,8 @@
 
 package geotrellis.spark.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra._
-import geotrellis.spark.store._
 
 import org.apache.spark.SparkContext
 

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraLayerWriter.scala

@@ -23,7 +23,6 @@ import geotrellis.store.avro.codecs._
 import geotrellis.store.cassandra._
 import geotrellis.store.index._
 import geotrellis.spark.store._
-import geotrellis.spark.merge._
 import geotrellis.util._
 
 import org.log4s._

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraRDDReader.scala

@@ -23,7 +23,6 @@ import geotrellis.store.avro.codecs.KeyValueRecordCodec
 import geotrellis.store.avro.{AvroEncoder, AvroRecordCodec}
 import geotrellis.store.index.{IndexRanges, MergeQueue}
 import geotrellis.store.util.{BlockingThreadPool, IOUtils}
-import geotrellis.spark.store._
 import geotrellis.spark.util.KryoWrapper
 
 import com.datastax.driver.core.querybuilder.QueryBuilder

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraRDDWriter.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.spark.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.avro._
 import geotrellis.store.avro.codecs._

cassandra-spark/src/main/scala/geotrellis/spark/store/cassandra/CassandraSparkLayerProvider.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.spark.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra._
 import geotrellis.store.cassandra.conf.CassandraConfig

cassandra-spark/src/test/scala/geotrellis/spark/CassandraTestEnvironment.scala

@@ -21,7 +21,8 @@ import geotrellis.spark.store.kryo.KryoRegistrator
 import geotrellis.spark.testkit.TestEnvironment
 
 import org.apache.spark.SparkConf
-import org.scalatest._
+
+import org.scalatest.Suite
 
 trait CassandraTestEnvironment extends TestEnvironment { self: Suite =>
   override def setKryoRegistrator(conf: SparkConf) =

cassandra-spark/src/test/scala/geotrellis/spark/store/cassandra/CassandraLayerProviderSpec.scala

@@ -16,15 +16,14 @@
 
 package geotrellis.spark.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra._
 import geotrellis.spark.store._
 import geotrellis.spark.CassandraTestEnvironment
-import geotrellis.spark.testkit.TestEnvironment
-import org.scalatest._
 
-class CassandraLayerProviderSpec extends FunSpec with CassandraTestEnvironment {
+import org.scalatest.funspec.AnyFunSpec
+
+class CassandraLayerProviderSpec extends AnyFunSpec with CassandraTestEnvironment {
   val uri = new java.net.URI("cassandra://127.0.0.1/geotrellis?attributes=attributes&layers=tiles")
   it("construct CassandraAttributeStore from URI"){
     val store = AttributeStore(uri)

cassandra/src/main/scala/geotrellis/store/cassandra/CassandraAttributeStore.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra.conf.CassandraConfig
 

cassandra/src/main/scala/geotrellis/store/cassandra/CassandraCollectionLayerProvider.scala

@@ -16,7 +16,6 @@
 
 package geotrellis.store.cassandra
 
-import geotrellis.layer._
 import geotrellis.store._
 import geotrellis.store.cassandra.conf.CassandraConfig
 import geotrellis.util.UriUtils

cassandra/src/main/scala/geotrellis/store/cassandra/conf/CassandraConfig.scala

@@ -16,6 +16,7 @@
 
 package geotrellis.store.cassandra.conf
 
+import pureconfig.ConfigSource
 import pureconfig.generic.auto._
 
 case class CassandraConfig(
@@ -30,6 +31,6 @@ case class CassandraConfig(
 )
 
 object CassandraConfig {
-  lazy val conf: CassandraConfig = pureconfig.loadConfigOrThrow[CassandraConfig]("geotrellis.cassandra")
+  lazy val conf: CassandraConfig = ConfigSource.default.at("geotrellis.cassandra").loadOrThrow[CassandraConfig]
   implicit def cassandraConfigToClass(obj: CassandraConfig.type): CassandraConfig = conf
 }

doc-examples/src/test/scala/geotrellis/doc/examples/spark/ShardingKeyIndexSpec.scala

@@ -22,11 +22,13 @@ import geotrellis.store.index._
 
 import _root_.io.circe._
 import _root_.io.circe.syntax._
-import org.scalatest._
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funspec.AnyFunSpec
 
 // --- //
 
-class ShardingKeyIndexSpec extends FunSpec with Matchers {
+class ShardingKeyIndexSpec extends AnyFunSpec with Matchers {
   /* Z-Curve Indices */
   val zspace: KeyIndex[SpatialKey] =
     ZCurveKeyIndexMethod.createIndex(KeyBounds(

doc-examples/src/test/scala/geotrellis/doc/examples/spark/SparkExamplesTests.scala

@@ -24,9 +24,11 @@ import geotrellis.spark.testkit._
 import geotrellis.spark.testkit.TestEnvironment
 
 import org.joda.time._
-import org.scalatest._
 
-class SparkExamplesTests extends FunSuite with Matchers with TestEnvironment with TileLayerRDDBuilders with TileBuilders {
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+
+class SparkExamplesTests extends AnyFunSuite with Matchers with TestEnvironment with TileLayerRDDBuilders with TileBuilders {
   implicit def longToTemporalKey(l: Long) = TemporalKey(l)
 
   test("Applying a threshold and then median filter on multiband imagery in an RDD layer") {