Update versions for move to GeoTrellis 1.2.0-rc1

README.md

@@ -16,12 +16,15 @@ the tile ingest process and demo server to query ingested data.
 To provision a VM and fetch our pre-ingested demo data:
 
 ```bash
+# Add a geotrellis-site AWS profile
+$ aws --profile geotrellis-site configure
 $ ./scripts/setup
 $ vagrant ssh
 ```
-
 This will download data into `./service/geotrellis/data/chatta-demo`. See the [ingest](#ingesting-data) sections for information about ingesting data manually using either the [local filesystem](#local-ingest) or [geodocker](geodocker-ingest).
 
+***NOTE:*** due to transient permissions issues with `NFS` and Vagrant shared folders on Linux hosts, this project uses `rsync` shared folders. In order to continuously sync your changes into the VM, open this project in another shell window/tab, and run `vagrant rsync-auto`.
+
 ## Scripts
 
 Helper and development scripts are located in the `./scripts` directory at the root of this project. These scripts are designed to encapsulate and perform commonly used actions such as starting a development server, accessing a development console, or running tests.

Vagrantfile

@@ -2,6 +2,7 @@
 # vi: set ft=ruby :
 
 ANSIBLE_VERSION = "2.3.1.0"
+
 Vagrant.configure("2") do |config|
 
     # Ubuntu 14.04 LTS
@@ -19,8 +20,13 @@ Vagrant.configure("2") do |config|
         vb.cpus = 2
     end
 
+    config.vm.synced_folder "./", "/vagrant",  type: "rsync",
+        rsync__exclude: ["deployment/ansible/roles/azavea.*/",
+                         "service/geotrellis/target/",
+                         "service/geotrellis/project/target"],
+        rsync__args: ["--verbose", "--archive", "-z"]
     config.vm.synced_folder "~/.aws", "/home/vagrant/.aws"
-    config.vm.synced_folder "./", "/home/vagrant/geotrellis-chatta-demo", type: "nfs"
+
 
     # Provisioning
     # Ansible is installed automatically by Vagrant.
@@ -35,7 +41,7 @@ Vagrant.configure("2") do |config|
 
     config.vm.provision "shell" do |s|
         s.path = 'deployment/vagrant/cd_shared_folder.sh'
-        s.args = "/home/vagrant/geotrellis-chatta-demo"
+        s.args = "/vagrant"
     end
 
 end

scripts/setup

@@ -18,7 +18,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     if [ "${1:-}" = "--help" ]; then
         usage
     else
-        vagrant up --provision
-        vagrant ssh -c "cd /home/vagrant/geotrellis-chatta-demo && ./scripts/update"
+        #vagrant up --provision
+        vagrant ssh -c "cd /vagrant && ./scripts/update"
     fi
 fi

service/geotrellis/build.sbt

@@ -16,18 +16,23 @@ publishMavenStyle := true
 publishArtifact in Test := false
 pomIncludeRepository := { _ => false }
 
-val gtVersion        = "1.1.0-RC2"
-val akkaActorVersion = "2.4.17"
-val akkaHttpVersion  = "10.0.3"
+val gtVersion        = "1.2.0-RC1"
+val akkaActorVersion = "2.5.6"
+val akkaHttpVersion  = "10.0.10"
+
+resolvers ++= Seq(
+  "locationtech-releases" at "https://repo.locationtech.org/content/groups/releases"
+)
 
 libraryDependencies ++= Seq(
   "org.locationtech.geotrellis" %% "geotrellis-spark-etl" % gtVersion,
   "com.typesafe.akka" %% "akka-actor" % akkaActorVersion,
+  "com.typesafe.akka" %% "akka-stream" % akkaActorVersion,
   "com.typesafe.akka" %% "akka-http-core" % akkaHttpVersion,
   "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
   "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion,
-  "org.apache.spark"  %% "spark-core"    % "2.1.0",
-  "org.apache.hadoop"  % "hadoop-client" % "2.7.3"
+  "org.apache.spark"  %% "spark-core"    % "2.1.1",
+  "org.apache.hadoop"  % "hadoop-client" % "2.8.2"
 )
 
 assemblyShadeRules in assembly := {

service/geotrellis/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.16

service/geotrellis/project/plugins.sbt

@@ -1,6 +1,6 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
 
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.0")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.3")
 

service/geotrellis/src/main/scala/geotrellis/chatta/package.scala

@@ -37,7 +37,7 @@ package object chatta {
       case "hbase" => {
         val instance = HBaseInstance(
           config.getString("hbase.zookeepers").split(","),
-          config.getString("accumulo.master")
+          config.getString("hbase.master")
         )
 
         (HBaseLayerReader(instance), HBaseValueReader(instance), HBaseAttributeStore(instance))
@@ -86,7 +86,7 @@ package object chatta {
       case "hbase" => {
         val instance = HBaseInstance(
           config.getString("hbase.zookeepers").split(","),
-          config.getString("accumulo.master")
+          config.getString("hbase.master")
         )
 
         (HBaseCollectionLayerReader(instance), HBaseValueReader(instance), HBaseAttributeStore(instance))