From e66122eb5eb94317fbbb8ca8b62a2679d2d08e80 Mon Sep 17 00:00:00 2001
From: CloudNiner <andy@finkmiller.com>
Date: Fri, 27 Sep 2019 09:24:40 -0400
Subject: [PATCH] Code review cleanup

---
 build.sbt          | 4 ++--
 docker-compose.yml | 5 +++--
 scripts/benchmark  | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 0024af53..789434a8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -41,8 +41,7 @@ lazy val commonSettings = Seq(
     "locationtech-snapshots" at "https://repo.locationtech.org/content/groups/snapshots",
     "osgeo" at "http://download.osgeo.org/webdav/geotools/",
     "geotrellis-staging" at "https://oss.sonatype.org/service/local/repositories/orglocationtechgeotrellis-1009/content"
-  ),
-  headerLicense := Some(HeaderLicense.ALv2("2019", "Azavea"))
+  )
 )
 
 lazy val noPublishSettings = Seq(
@@ -56,6 +55,7 @@ lazy val publishSettings = Seq(
   organizationName := "GeoTrellis",
   organizationHomepage := Some(new URL("https://geotrellis.io/")),
   description := "GeoTrellis Contrib is a place to put GeoTrellis projects that are not included in GeoTrellis Core for one reason or another.",
+  headerLicense := Some(HeaderLicense.ALv2("2019", "Azavea")),
   publishArtifact in Test := false
 ) ++ sonatypeSettings ++ credentialSettings
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b33b936..72d7f399 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "2.3"
 services:
   database:
     # When this is updated, we'll have to handle creating the postgis extension
@@ -18,7 +18,8 @@ services:
   sbt:
     image: quay.io/azavea/openjdk-gdal:2.4-jdk8-slim
     depends_on:
-      - database
+      database:
+        condition: service_healthy
     links:
       - database:database.service.internal
     environment:
diff --git a/scripts/benchmark b/scripts/benchmark
index a0f1fb58..b34d0168 100755
--- a/scripts/benchmark
+++ b/scripts/benchmark
@@ -21,6 +21,8 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
         pushd benchmark
         make
         popd
-        docker-compose run --rm benchmark "project benchmark" "jmh:run"
+        docker-compose \
+            run --rm benchmark \
+            "project benchmark" "jmh:run"
     fi
 fi