Update GDAL up to 3.1.x

.circleci/config.yml

@@ -15,18 +15,18 @@ aliases:
 executors:
   executor-gdal:
     docker:
-      - image: quay.io/azavea/openjdk-gdal:2.4-jdk8-slim
+      - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
           # https://circleci.com/docs/2.0/java-oom/
-          _JAVA_OPTIONS: "-Xms128m -Xmx1536m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
       - 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: quay.io/azavea/openjdk-gdal:2.4-jdk8-slim
+      - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms128m -Xmx1536m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
       - image: minio/minio:RELEASE.2019-05-02T19-07-09Z
         environment:
           _JAVA_OPTIONS: "-Xms1m -Xmx512m"
@@ -36,9 +36,9 @@ executors:
 
   executor-cassandra:
     docker:
-      - image: quay.io/azavea/openjdk-gdal:2.4-jdk8-slim
+      - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms128m -Xmx1536m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
       - image: cassandra:3.11.6
         environment:
           _JAVA_OPTIONS: "-Xms1m -Xmx512m"
@@ -48,9 +48,9 @@ executors:
 
   executor-hbase:
     docker:
-      - image: quay.io/azavea/openjdk-gdal:2.4-jdk8-slim
+      - image: daunnc/openjdk-gdal:3.1-jdk8-slim
         environment:
-          _JAVA_OPTIONS: "-Xms128m -Xmx1536m"
+          _JAVA_OPTIONS: "-Xms64m -Xmx1280m"
       # https://github.com/pomadchin/hbase-docker
       - image: daunnc/hbase:2.1.4
         environment:

.sbtopts

@@ -1,5 +1,5 @@
--J-Xmx1536m
--J-Xms128m
+-J-Xmx1280m
+-J-Xms64m
 -J-Xss2M
 -J-XX:+CMSClassUnloadingEnabled
 -Dfile.encoding=UTF8

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix NoData handling in the ColorMethods.color function for the RGB and RGBA Multiband Rasters [#3278](https://github.com/locationtech/geotrellis/pull/3278)
 - Fix renderJpg() color is bluer than expected [#3203](https://github.com/locationtech/geotrellis/issues/3203)
 - Fix combineDouble of ArrayTile and ConstantTile with non-commutative operator [#3257](https://github.com/locationtech/geotrellis/issues/3257)
+- Update GDAL up to 3.1 [#3279](https://github.com/locationtech/geotrellis/pull/3279)
 
 ## [3.4.1] - 2020-07-16
 

gdal/src/test/resources/vlm/aspect-tiled-bilinear.vrt

@@ -1,6 +1,6 @@
 <VRTDataset rasterXSize="1485" rasterYSize="1091" subClass="VRTWarpedDataset">
-  <SRS>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]</SRS>
-  <GeoTransform> -7.8774664346142089e+01,  1.1205739005262146e-04,  0.0000000000000000e+00,  3.5809619852165454e+01,  0.0000000000000000e+00, -1.1205739005261982e-04</GeoTransform>
+  <SRS dataAxisToSRSAxisMapping="1,2">GEOGCS["unknown",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Longitude",EAST],AXIS["Latitude",NORTH]]</SRS>
+  <GeoTransform> -7.8774664346141307e+01,  1.1205739005262034e-04,  0.0000000000000000e+00,  3.5809619852165618e+01,  0.0000000000000000e+00, -1.1205739005262034e-04</GeoTransform>
   <Metadata>
     <MDI key="AREA_OR_POINT">Area</MDI>
   </Metadata>
@@ -16,6 +16,7 @@
     <WorkingDataType>Float32</WorkingDataType>
     <Option name="ERROR_THRESHOLD">0.125</Option>
     <Option name="INIT_DEST">NO_DATA</Option>
+    <Option name="ERROR_OUT_IF_EMPTY_SOURCE_WINDOW">FALSE</Option>
     <SourceDataset relativeToVRT="1">aspect-tiled.tif</SourceDataset>
     <Transformer>
       <ApproxTransformer>
@@ -24,12 +25,15 @@
           <GenImgProjTransformer>
             <SrcGeoTransform>630000,10,0,228500,0,-10</SrcGeoTransform>
             <SrcInvGeoTransform>-63000,0.100000000000000006,0,22850,0,-0.100000000000000006</SrcInvGeoTransform>
-            <DstGeoTransform>-78.7746643461420888,0.000112057390052621456,0,35.8096198521654543,0,-0.000112057390052619816</DstGeoTransform>
-            <DstInvGeoTransform>702985,8923.99867184490176,0,319565,0,-8923.99867184503273</DstInvGeoTransform>
+            <DstGeoTransform>-78.7746643461413072,0.000112057390052620344,0,35.8096198521656177,0,-0.000112057390052620344</DstGeoTransform>
+            <DstInvGeoTransform>702985,8923.99867184499089,0,319565,0,-8923.99867184499089</DstInvGeoTransform>
             <ReprojectTransformer>
               <ReprojectionTransformer>
-                <SourceSRS>PROJCS["unnamed",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",36.16666666666666],PARAMETER["standard_parallel_2",34.33333333333334],PARAMETER["latitude_of_origin",33.75],PARAMETER["central_meridian",-79],PARAMETER["false_easting",609601.22],PARAMETER["false_northing",0],UNIT["Meter",1]]</SourceSRS>
-                <TargetSRS>GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]</TargetSRS>
+                <SourceSRS>PROJCS["unknown",GEOGCS["unknown",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["latitude_of_origin",33.75],PARAMETER["central_meridian",-79],PARAMETER["standard_parallel_1",36.1666666666667],PARAMETER["standard_parallel_2",34.3333333333333],PARAMETER["false_easting",609601.22],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH]]</SourceSRS>
+                <TargetSRS>GEOGCS["unknown",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Longitude",EAST],AXIS["Latitude",NORTH]]</TargetSRS>
+                <Options>
+                  <Option key="AREA_OF_INTEREST">-78.7746204948163,35.68750729773365,-78.60830317669155,35.80960938344992</Option>
+                </Options>
               </ReprojectionTransformer>
             </ReprojectTransformer>
           </GenImgProjTransformer>

project/Dependencies.scala

@@ -26,10 +26,10 @@ object Version {
   val geowave     = "0.9.3"
   val hadoop      = "2.8.5"
   val spark       = "2.4.4"
-  val gdal        = "2.4.0"
-  val gdalWarp    = "1.0.1"
+  val gdal        = "3.1.0"
+  val gdalWarp    = "1.1.0"
 
-  val previousVersion = "3.0.0"
+  val previousVersion = "3.4.0"
 }
 import sbt.Keys._
 
@@ -73,10 +73,10 @@ object Dependencies {
   val scalacheck          = "org.scalacheck"             %% "scalacheck"               % "1.14.0"
   val scalaXml            = "org.scala-lang.modules"     %% "scala-xml"                % "1.2.0"
   val jts                 = "org.locationtech.jts"        % "jts-core"                 % "1.16.1"
-  val proj4j              = "org.locationtech.proj4j"     % "proj4j"                   % "1.1.0"
+  val proj4j              = "org.locationtech.proj4j"     % "proj4j"                   % "1.1.1"
   val openCSV             = "com.opencsv"                 % "opencsv"                  % "4.6"
-  val spire               = "org.spire-math"            %% "spire"                    % Version.spire
-  val spireMacro          = "org.spire-math"            %% "spire-macros"             % Version.spire
+  val spire               = "org.spire-math"             %% "spire"                    % Version.spire
+  val spireMacro          = "org.spire-math"             %% "spire-macros"             % Version.spire
   val apacheIO            = "commons-io"                  % "commons-io"               % "2.6"
   val apacheMath          = "org.apache.commons"          % "commons-math3"            % "3.6.1"
   val chronoscala         = "jp.ne.opt"                  %% "chronoscala"              % "0.3.2"

project/Settings.scala

@@ -65,7 +65,6 @@ object Settings {
     Test / publishArtifact := false,
     pomIncludeRepository := { _ => false },
     autoAPIMappings := true,
-    useCoursier := false,
     Global / cancelable := true,
 
     publishTo := {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.10
+sbt.version=1.3.13

sbt

@@ -3,14 +3,42 @@
 # A more capable sbt runner, coincidentally also called sbt.
 # Author: Paul Phillips <[email protected]>
 # https://github.com/paulp/sbt-extras
+#
+# Generated from http://www.opensource.org/licenses/bsd-license.php
+# Copyright (c) 2011, Paul Phillips. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#     * Neither the name of the author nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 set -o pipefail
 
-declare -r sbt_release_version="1.3.5"
-declare -r sbt_unreleased_version="1.3.5"
+declare -r sbt_release_version="1.3.13"
+declare -r sbt_unreleased_version="1.4.0-M1"
 
-declare -r latest_213="2.13.1"
-declare -r latest_212="2.12.10"
+declare -r latest_213="2.13.3"
+declare -r latest_212="2.12.12"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"
@@ -24,7 +52,7 @@ declare -r sbt_launch_mvn_release_repo="https://repo.scala-sbt.org/scalasbt/mave
 declare -r sbt_launch_mvn_snapshot_repo="https://repo.scala-sbt.org/scalasbt/maven-snapshots"
 
 declare -r default_jvm_opts_common="-Xms512m -Xss2m -XX:MaxInlineLevel=18"
-declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
+declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy -Dsbt.coursier.home=project/.coursier"
 
 declare sbt_jar sbt_dir sbt_create sbt_version sbt_script sbt_new
 declare sbt_explicit_version
@@ -99,6 +127,7 @@ init_default_option_file() {
 }
 
 sbt_opts_file="$(init_default_option_file SBT_OPTS .sbtopts)"
+sbtx_opts_file="$(init_default_option_file SBTX_OPTS .sbtxopts)"
 jvm_opts_file="$(init_default_option_file JVM_OPTS .jvmopts)"
 
 build_props_sbt() {
@@ -230,14 +259,6 @@ default_jvm_opts() {
   fi
 }
 
-build_props_scala() {
-  if [[ -r "$buildProps" ]]; then
-    versionLine="$(grep '^build.scala.versions' "$buildProps")"
-    versionString="${versionLine##build.scala.versions=}"
-    echo "${versionString%% .*}"
-  fi
-}
-
 execRunner() {
   # print the arguments one to a line, quoting any containing spaces
   vlog "# Executing command line:" && {
@@ -419,6 +440,12 @@ are not special.
                     Note: "@"-file is overridden by local '.sbtopts' or '-sbt-opts' argument.
   -sbt-opts <path>  file containing sbt args (if not given, .sbtopts in project root is used if present)
   -S-X              add -X to sbt's scalacOptions (-S is stripped)
+
+  # passing options exclusively to this runner
+  SBTX_OPTS         environment variable holding either the sbt-extras args directly, or
+                    the reference to a file containing sbt-extras args if given path is prepended by '@' (e.g. '@/etc/sbtxopts')
+                    Note: "@"-file is overridden by local '.sbtxopts' or '-sbtx-opts' argument.
+  -sbtx-opts <path> file containing sbt-extras args (if not given, .sbtxopts in project root is used if present)
 EOM
   exit 0
 }
@@ -475,6 +502,7 @@ process_args() {
       -scala-home)  require_arg path "$1" "$2" && setThisBuild scalaHome "_root_.scala.Some(file(\"$2\"))" && shift 2 ;;
       -java-home)   require_arg path "$1" "$2" && setJavaHome "$2" && shift 2 ;;
       -sbt-opts)    require_arg path "$1" "$2" && sbt_opts_file="$2" && shift 2 ;;
+      -sbtx-opts) require_arg path "$1" "$2" && sbtx_opts_file="$2" && shift 2 ;;
       -jvm-opts)    require_arg path "$1" "$2" && jvm_opts_file="$2" && shift 2 ;;
 
       -D*)          addJava "$1" && shift ;;
@@ -512,6 +540,18 @@ else
   vlog "No extra sbt options have been defined"
 fi
 
+# if there are file/environment sbtx_opts, process again so we
+# can supply args to this runner
+if [[ -r "$sbtx_opts_file" ]]; then
+  vlog "Using sbt options defined in file $sbtx_opts_file"
+  while read -r opt; do extra_sbt_opts+=("$opt"); done < <(readConfigFile "$sbtx_opts_file")
+elif [[ -n "$SBTX_OPTS" && ! ("$SBTX_OPTS" =~ ^@.*) ]]; then
+  vlog "Using sbt options defined in variable \$SBTX_OPTS"
+  IFS=" " read -r -a extra_sbt_opts <<<"$SBTX_OPTS"
+else
+  vlog "No extra sbt options have been defined"
+fi
+
 [[ -n "${extra_sbt_opts[*]}" ]] && process_args "${extra_sbt_opts[@]}"
 
 # reset "$@" to the residual args