Upgraded to GeoMesa 2.0.0-rc.1

Signed-off-by: Simeon H.K. Fitch <[email protected]>

Author: metasim

core/build.sbt

@@ -4,8 +4,8 @@ moduleName := "rasterframes"
 
 libraryDependencies ++= Seq(
   "com.chuusai" %% "shapeless" % "2.3.2",
-  "org.locationtech.geomesa" %% "geomesa-z3" % "1.3.5",
-  "org.locationtech.geomesa" %% "geomesa-spark-jts" % "2.0.0-astraea.1" exclude("jgridshift", "jgridshift"),
+  "org.locationtech.geomesa" %% "geomesa-z3" % rfGeoMesaVersion.value,
+  "org.locationtech.geomesa" %% "geomesa-spark-jts" % rfGeoMesaVersion.value exclude("jgridshift", "jgridshift"),
   spark("core").value % Provided,
   spark("mllib").value % Provided,
   spark("sql").value % Provided,
@@ -19,7 +19,7 @@ libraryDependencies ++= Seq(
 )
 
 buildInfoKeys ++= Seq[BuildInfoKey](
-  name, version, scalaVersion, sbtVersion, rfGeotrellisVersion, rfSparkVersion
+  name, version, scalaVersion, sbtVersion, rfGeoTrellisVersion, rfGeoMesaVersion, rfSparkVersion
 )
 
 buildInfoPackage := "astraea.spark.rasterframes"

core/src/main/scala/astraea/spark/rasterframes/jts/Implicits.scala

@@ -29,12 +29,13 @@ import geotrellis.vector.{Point ⇒ gtPoint}
 import org.apache.spark.sql.TypedColumn
 import org.apache.spark.sql.functions._
 import org.apache.spark.sql.rf.CanBeColumn
+import org.locationtech.geomesa.spark.jts.DataFrameFunctions.SpatialConstructors
 
 /**
  * Extension methods on typed columns allowing for DSL-like queries over JTS types.
  * @since 1/10/18
  */
-trait Implicits extends SpatialFunctions {
+trait Implicits extends SpatialConstructors {
   import astraea.spark.rasterframes.encoders.SparkDefaultEncoders._
 
   implicit class ExtentColumnMethods[T <: Geometry](val self: TypedColumn[Any, T])

core/src/main/scala/astraea/spark/rasterframes/jts/SpatialFunctions.scala

@@ -4,6 +4,7 @@
 
 ### 0.6.2
 
+* Updated to GeoMesa version 2.0.0-rc.1.
 * Added for for writing GeoTIFFs from RasterFrames via with DataFrameWriter.
 * Added `spark.read.geotrellis.withNumPartitions(Int)` for setting the initial number of partitions to use when reading a layer.
 * Added `spark.read.geotrellis.withTileSubdivisions(Int)` for evenly subdividing tiles before they become rows in a RasterFrame.

docs/src/main/tut/release-notes.md

@@ -31,12 +31,12 @@ object ProjectPlugin extends AutoPlugin {
     cancelable in Global := true,
     resolvers ++= Seq(
       "locationtech-releases" at "https://repo.locationtech.org/content/groups/releases",
-      "boundless-releases" at "https://repo.boundlessgeo.com/main/",
-//      "osgeo-releases" at "http://download.osgeo.org/webdav/geotools/",
-      Resolver.bintrayRepo("s22s", "maven")
+      "boundless-releases" at "https://repo.boundlessgeo.com/main/"
     ),
+
     rfSparkVersion in ThisBuild := "2.2.1" ,
-    rfGeotrellisVersion in ThisBuild := "1.2.0",
+    rfGeoTrellisVersion in ThisBuild := "1.2.0",
+    rfGeoMesaVersion in ThisBuild := "2.0.0-rc.1",
 
     publishTo := sonatypePublishTo.value,
     publishMavenStyle := true,
@@ -69,10 +69,11 @@ object ProjectPlugin extends AutoPlugin {
 
   object autoImport {
     val rfSparkVersion = settingKey[String]("Apache Spark version")
-    val rfGeotrellisVersion = settingKey[String]("GeoTrellis version")
+    val rfGeoTrellisVersion = settingKey[String]("GeoTrellis version")
+    val rfGeoMesaVersion = settingKey[String]("GeoMesa version")
 
     def geotrellis(module: String) = Def.setting {
-      "org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeotrellisVersion.value
+      "org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeoTrellisVersion.value
     }
     def spark(module: String) = Def.setting {
       "org.apache.spark" %% s"spark-$module" % rfSparkVersion.value