From adad5ea59208d933d4868f9cf320ba75f9166e9f Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Fri, 20 Apr 2018 09:02:30 -0400 Subject: [PATCH 01/33] [maven-release-plugin] prepare for next development iteration --- docs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-compute/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-datastore/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-dist/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-jobs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-native-api/pom.xml | 2 +- .../geomesa-accumulo-raster-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-raster/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-security/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-tools/pom.xml | 2 +- geomesa-accumulo/pom.xml | 2 +- geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml | 2 +- geomesa-archetypes/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-datastore/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-dist/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gt/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-jts/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-tools/pom.xml | 2 +- geomesa-arrow/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-datastore/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-dist/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-tools/pom.xml | 2 +- geomesa-bigtable/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-api/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml | 2 +- .../geomesa-blobstore-exif-handler/pom.xml | 2 +- .../geomesa-blobstore-gdal-handler/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-handlers/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-web/pom.xml | 2 +- geomesa-blobstore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-datastore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-dist/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-tools/pom.xml | 2 +- geomesa-cassandra/pom.xml | 2 +- geomesa-convert/geomesa-convert-all/pom.xml | 2 +- geomesa-convert/geomesa-convert-avro/pom.xml | 2 +- geomesa-convert/geomesa-convert-common/pom.xml | 2 +- geomesa-convert/geomesa-convert-fixedwidth/pom.xml | 2 +- geomesa-convert/geomesa-convert-jdbc/pom.xml | 2 +- geomesa-convert/geomesa-convert-json/pom.xml | 2 +- geomesa-convert/geomesa-convert-osm/pom.xml | 2 +- geomesa-convert/geomesa-convert-redis-cache/pom.xml | 2 +- geomesa-convert/geomesa-convert-scripting/pom.xml | 2 +- geomesa-convert/geomesa-convert-simplefeature/pom.xml | 2 +- geomesa-convert/geomesa-convert-text/pom.xml | 2 +- geomesa-convert/geomesa-convert-xml/pom.xml | 2 +- geomesa-convert/pom.xml | 2 +- geomesa-features/geomesa-feature-all/pom.xml | 2 +- geomesa-features/geomesa-feature-avro/pom.xml | 2 +- geomesa-features/geomesa-feature-common/pom.xml | 2 +- geomesa-features/geomesa-feature-kryo/pom.xml | 2 +- geomesa-features/geomesa-feature-nio/pom.xml | 2 +- geomesa-features/pom.xml | 2 +- geomesa-filter/pom.xml | 2 +- geomesa-fs/geomesa-fs-datastore/pom.xml | 2 +- geomesa-fs/geomesa-fs-dist/pom.xml | 2 +- geomesa-fs/geomesa-fs-gs-plugin/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark-runtime/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-common/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/pom.xml | 2 +- geomesa-fs/geomesa-fs-tools/pom.xml | 2 +- geomesa-fs/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-api/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-rest/pom.xml | 2 +- geomesa-geojson/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-datastore/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-dist/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-jobs/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-native-api/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-tools/pom.xml | 2 +- geomesa-hbase/pom.xml | 2 +- geomesa-index-api/pom.xml | 2 +- geomesa-jobs/pom.xml | 2 +- geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml | 2 +- geomesa-jupyter/geomesa-jupyter-vegas/pom.xml | 2 +- geomesa-jupyter/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-datastore/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-dist/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-tools/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-utils/pom.xml | 2 +- geomesa-kafka/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-datastore/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-dist/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-tools/pom.xml | 2 +- geomesa-lambda/pom.xml | 2 +- geomesa-memory/geomesa-cqengine-datastore/pom.xml | 2 +- geomesa-memory/geomesa-cqengine/pom.xml | 2 +- geomesa-memory/pom.xml | 2 +- geomesa-metrics/pom.xml | 2 +- geomesa-native-api/pom.xml | 2 +- geomesa-process/geomesa-process-vector/pom.xml | 2 +- geomesa-process/geomesa-process-wps/pom.xml | 2 +- geomesa-process/pom.xml | 2 +- geomesa-security/pom.xml | 2 +- geomesa-spark/geomesa-spark-converter/pom.xml | 2 +- geomesa-spark/geomesa-spark-core/pom.xml | 2 +- geomesa-spark/geomesa-spark-geotools/pom.xml | 2 +- geomesa-spark/geomesa-spark-jts/pom.xml | 2 +- geomesa-spark/geomesa-spark-sql/pom.xml | 2 +- geomesa-spark/geomesa_pyspark/pom.xml | 2 +- geomesa-spark/pom.xml | 2 +- geomesa-stream/geomesa-stream-api/pom.xml | 2 +- geomesa-stream/geomesa-stream-datastore/pom.xml | 2 +- geomesa-stream/geomesa-stream-generic/pom.xml | 2 +- geomesa-stream/geomesa-stream-gs-plugin/pom.xml | 2 +- geomesa-stream/pom.xml | 2 +- geomesa-test/pom.xml | 2 +- geomesa-tools/pom.xml | 2 +- geomesa-utils/pom.xml | 2 +- geomesa-web/geomesa-web-core/pom.xml | 2 +- geomesa-web/geomesa-web-data/pom.xml | 2 +- geomesa-web/geomesa-web-install/pom.xml | 2 +- geomesa-web/geomesa-web-stats/pom.xml | 2 +- geomesa-web/pom.xml | 2 +- geomesa-z3/pom.xml | 2 +- geomesa-zk-utils/pom.xml | 2 +- pom.xml | 4 ++-- 140 files changed, 141 insertions(+), 141 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f42a5f964460..de05593a4f20 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml index 8453e9c2ebc2..0de51b759855 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml @@ -11,7 +11,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index 15eebfa785b4..a7b85aee037c 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -13,7 +13,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT geomesa-accumulo-datastore_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index 6ab9ae5f4c84..bc459b38a434 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml index 6f7c5ed787c8..92eeb637d554 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT geomesa-accumulo-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index 56bf57808699..a6abba03d125 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index 7479ad5932b3..bcebbe20d242 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml index 64e28e8691c2..1c358c3fd206 100644 --- a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml index 0d0ffb7cac4f..3ceaa9c84b3b 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT geomesa-accumulo-raster-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml index 934ce7013434..1a7325d7e283 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-security/pom.xml b/geomesa-accumulo/geomesa-accumulo-security/pom.xml index 007a607ed08d..d29328d4b9ab 100644 --- a/geomesa-accumulo/geomesa-accumulo-security/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-security/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml index 32282938da16..fe4e3706bdd1 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index 94cf133c5da8..6eba41852e13 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml index d4dbc8b0fb6f..3b82dbd09e98 100644 --- a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index c29200dce7b1..76c7ced9047a 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index e5c647de3a23..362db9a79c19 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index d3cdc336e708..928cb3d4cf40 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -3,7 +3,7 @@ geomesa-archetypes_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index 211f5d21b429..f09450793a60 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT geomesa-archetypes_2.11 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index f4dd4a1e8c9a..ce0fe754d9a2 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index 2b74f91a7257..0e125063703c 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml index dc0990d885b6..f161b3d0cf45 100644 --- a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index f32d94d70a4e..92f7aa5f8457 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index 47761cc44268..2287e3a08964 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -4,7 +4,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index ac1104d2e7ff..00bd8685f275 100644 --- a/geomesa-arrow/geomesa-arrow-tools/pom.xml +++ b/geomesa-arrow/geomesa-arrow-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index 6bf2cfb3df75..0a2174636bb9 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml index b4d8b41094fa..ad07ed1b7f07 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-bigtable_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml index 33b0e71cad3d..b658e0e678e2 100644 --- a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml index c7418dc3c3a5..fef0cfaaa0ca 100644 --- a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml index a922ed76796c..54a3c2fafc00 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml index eaabc61e5205..bfb7d8919bda 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml index 80ccf7d01a13..7b1200f52287 100644 --- a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/pom.xml b/geomesa-bigtable/pom.xml index eea2f7e7487b..fbe59ad37010 100644 --- a/geomesa-bigtable/pom.xml +++ b/geomesa-bigtable/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml index 9acde7efe9af..fdff553ac6e4 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-api/pom.xml b/geomesa-blobstore/geomesa-blobstore-api/pom.xml index 3edf4a1e1522..fba7cc9ee8c9 100644 --- a/geomesa-blobstore/geomesa-blobstore-api/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-api/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml index 5c5d37abcbcc..2710caf99aa6 100644 --- a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml index a4ab197f8bba..bf327adbf22f 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml index 988f69887ac3..e3f1bee2ed8a 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml index 97603db78f07..9d45da690f3f 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-web/pom.xml b/geomesa-blobstore/geomesa-blobstore-web/pom.xml index 00286ea2d15a..dd85f65ff2d3 100644 --- a/geomesa-blobstore/geomesa-blobstore-web/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-web/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/pom.xml b/geomesa-blobstore/pom.xml index 44e5bc3b6263..0d5476e5ba9a 100644 --- a/geomesa-blobstore/pom.xml +++ b/geomesa-blobstore/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index d73aac64b415..97cdea414c80 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-cassandra_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index 5da1f74f4232..11c36e0c15df 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml index d86e56087c73..5c03d098b5a2 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index 92bcff70fdcf..67674f725e1b 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index fb4bdd8b7413..f33102e4f776 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 233187ea47fa..88fb3e2b7c18 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index c1e0a4a79aec..4fda8feded6e 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index 9975fa0c1828..9815b251dd0f 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index ac935001415f..02778c65b1a4 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index 060d2e5644c9..f28b936b9ab7 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index dd1e8979a08c..3afd12bac10c 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/pom.xml b/geomesa-convert/geomesa-convert-osm/pom.xml index 309e546884e8..6d46c4732d63 100644 --- a/geomesa-convert/geomesa-convert-osm/pom.xml +++ b/geomesa-convert/geomesa-convert-osm/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-convert_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-redis-cache/pom.xml b/geomesa-convert/geomesa-convert-redis-cache/pom.xml index 49b2343b133e..1dae3d93f0a7 100644 --- a/geomesa-convert/geomesa-convert-redis-cache/pom.xml +++ b/geomesa-convert/geomesa-convert-redis-cache/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-scripting/pom.xml b/geomesa-convert/geomesa-convert-scripting/pom.xml index d014fec51c89..192924780cbc 100644 --- a/geomesa-convert/geomesa-convert-scripting/pom.xml +++ b/geomesa-convert/geomesa-convert-scripting/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 5f9c0f70c249..729c6ba0719e 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index a0de433fdaff..7e5a74bf72fa 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index 783e18ccd2aa..54215c4f9a6e 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index d15bf81b106f..e3c6e61d1f65 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 0b2627025ced..7c623bd75952 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index dac46574259b..a63ab5f5a186 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index e1f3e4f4015c..78a4435dc016 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index 4f26e20d5126..82fcba8ea5f7 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-nio/pom.xml b/geomesa-features/geomesa-feature-nio/pom.xml index d2ad940a503b..2847c459b611 100644 --- a/geomesa-features/geomesa-feature-nio/pom.xml +++ b/geomesa-features/geomesa-feature-nio/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index 523cc3b5dc3a..78fe704a611d 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index 451f6a00a153..c671428187b3 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index ad907e8678a9..41365be09cf8 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index e8b70acb7eac..1a2054311cf0 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-fs_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml index 10edc5240589..6545bc51b9ce 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml index f60f7ccfbf5f..67d3f0ba54a7 100644 --- a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml +++ b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index 28533ff431a4..67bbfcf12c82 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml index 7534fef1b3d1..293e86f01c46 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml index adb8076caed0..f0cf953778c1 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml index a34831a160ed..ae680ec26291 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml index 21dc9a7560b2..d490ab782720 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml index 842e20fb7f93..8290393f1964 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index 9a8ee0c3cae0..fef33b2ffcaa 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index cab7cde178b6..b42a54fed5da 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index dc9c20b397ea..b268af21d26d 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-api/pom.xml b/geomesa-geojson/geomesa-geojson-api/pom.xml index 1c542444a8ed..c0075df0c217 100644 --- a/geomesa-geojson/geomesa-geojson-api/pom.xml +++ b/geomesa-geojson/geomesa-geojson-api/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml index 50971970cf23..c4089e408cc9 100644 --- a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml +++ b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-rest/pom.xml b/geomesa-geojson/geomesa-geojson-rest/pom.xml index 4f51e11a2ce3..ff195d1c2c9d 100644 --- a/geomesa-geojson/geomesa-geojson-rest/pom.xml +++ b/geomesa-geojson/geomesa-geojson-rest/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/pom.xml b/geomesa-geojson/pom.xml index 17539608bcc6..946ace024c3e 100644 --- a/geomesa-geojson/pom.xml +++ b/geomesa-geojson/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index c6098a5f93c5..0c24ffc348d3 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index d2e2f7230eb5..01d35f1b23a2 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml index 21e6b2c3c1c3..935a20b4c5e5 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.0 + 2.0.1-SNAPSHOT geomesa-hbase-distributed-runtime_2.11 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index 04e0bb1108cc..41e32e89e2f1 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-hbase/geomesa-hbase-jobs/pom.xml b/geomesa-hbase/geomesa-hbase-jobs/pom.xml index af5e3a021476..2700db1eddc0 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/pom.xml +++ b/geomesa-hbase/geomesa-hbase-jobs/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-native-api/pom.xml b/geomesa-hbase/geomesa-hbase-native-api/pom.xml index 8e2ae979aca8..e4568385344b 100644 --- a/geomesa-hbase/geomesa-hbase-native-api/pom.xml +++ b/geomesa-hbase/geomesa-hbase-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml index a6a75f3cd788..8c3da8136824 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index 113afa775341..860c21fff4e2 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index 15671395b0cb..233b3ab68010 100644 --- a/geomesa-hbase/geomesa-hbase-tools/pom.xml +++ b/geomesa-hbase/geomesa-hbase-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index 2b462168b091..6abd3aab7219 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index c39a5ecd2406..d67147cb0f64 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index c7bcf952c314..865d8b838b78 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml index 5dbddb4efd0b..bd5c41d9044c 100644 --- a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -3,7 +3,7 @@ geomesa-jupyter_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-vegas/pom.xml b/geomesa-jupyter/geomesa-jupyter-vegas/pom.xml index 1bd22b5a70d2..fa2a9610f19e 100644 --- a/geomesa-jupyter/geomesa-jupyter-vegas/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-vegas/pom.xml @@ -3,7 +3,7 @@ geomesa-jupyter_2.11 org.locationtech.geomesa - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-jupyter/pom.xml b/geomesa-jupyter/pom.xml index b7bc46bc33a3..3db70c0cc0d5 100644 --- a/geomesa-jupyter/pom.xml +++ b/geomesa-jupyter/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index a5ba482e58ce..ad0813a5580b 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index 27f1a8d50636..bf982309942c 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml index 5dcc52b7f83c..6be2fd47829d 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index 0a575e46456e..72d879583abc 100644 --- a/geomesa-kafka/geomesa-kafka-tools/pom.xml +++ b/geomesa-kafka/geomesa-kafka-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 8bcc5faa2563..3d44a7050650 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index b8efd2a2127f..b0c60b59799a 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index b84cdcc3a28e..1c347243aee4 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/pom.xml +++ b/geomesa-lambda/geomesa-lambda-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.0 + 2.0.1-SNAPSHOT geomesa-lambda-datastore_2.11 diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index d71c2d0e1ba8..807af7f16f9a 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 pom diff --git a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml index 87bea26983c8..800cb4d40a13 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-lambda/geomesa-lambda-tools/pom.xml b/geomesa-lambda/geomesa-lambda-tools/pom.xml index 77dcd99ae69a..e2f8294d90ea 100644 --- a/geomesa-lambda/geomesa-lambda-tools/pom.xml +++ b/geomesa-lambda/geomesa-lambda-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index 6f07c834c933..bff1758e2518 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index 4c07720430d2..7b0480d9e79f 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index e2e0905ac3aa..b32a5336322c 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index e5deec70eb72..6281c77b9190 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index 7f3998711417..414145b677b6 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-native-api/pom.xml b/geomesa-native-api/pom.xml index e00d3a9e37b7..230d4fea7dfb 100644 --- a/geomesa-native-api/pom.xml +++ b/geomesa-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index 64a3ca5e43a8..cd2b304f4ca9 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index b614e870a210..a142ccc08946 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index 7d0828b9c023..81bbcfbb5b68 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index 0875ba84eaaf..bef6aaba0eaf 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index 94b8e68f8f96..22b59c470b37 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index e795c063039a..7499945f44c6 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-geotools/pom.xml b/geomesa-spark/geomesa-spark-geotools/pom.xml index 7d7bea5a76fe..a39c9a662c02 100644 --- a/geomesa-spark/geomesa-spark-geotools/pom.xml +++ b/geomesa-spark/geomesa-spark-geotools/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index b12c9f91b4c9..7c35d5e681cb 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index 305129095817..b31d11d0a468 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index c179b3946acf..dd37fc3272d8 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index 314340e15843..252326604183 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-api/pom.xml b/geomesa-stream/geomesa-stream-api/pom.xml index 837287d1994d..c23eb93e0b39 100644 --- a/geomesa-stream/geomesa-stream-api/pom.xml +++ b/geomesa-stream/geomesa-stream-api/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-datastore/pom.xml b/geomesa-stream/geomesa-stream-datastore/pom.xml index cb0325605f13..f0e81a121efd 100644 --- a/geomesa-stream/geomesa-stream-datastore/pom.xml +++ b/geomesa-stream/geomesa-stream-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-generic/pom.xml b/geomesa-stream/geomesa-stream-generic/pom.xml index df9a7e86175b..77bd25aed6ca 100644 --- a/geomesa-stream/geomesa-stream-generic/pom.xml +++ b/geomesa-stream/geomesa-stream-generic/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml index 6125b6a17471..54f26fb6bc2a 100644 --- a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml +++ b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.0 + 2.0.1-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-stream/pom.xml b/geomesa-stream/pom.xml index d69ef144a622..5ce730dff6ef 100644 --- a/geomesa-stream/pom.xml +++ b/geomesa-stream/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-test/pom.xml b/geomesa-test/pom.xml index 36d9cfa2a9d6..31773e918cbc 100644 --- a/geomesa-test/pom.xml +++ b/geomesa-test/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index 4bf9d375317d..81dc9c433bde 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-utils/pom.xml b/geomesa-utils/pom.xml index ceafe417992d..99762e9044f5 100644 --- a/geomesa-utils/pom.xml +++ b/geomesa-utils/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-core/pom.xml b/geomesa-web/geomesa-web-core/pom.xml index 5b7ab112181e..a56470a10b1b 100644 --- a/geomesa-web/geomesa-web-core/pom.xml +++ b/geomesa-web/geomesa-web-core/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-data/pom.xml b/geomesa-web/geomesa-web-data/pom.xml index f2239da33af1..72ad06b28f9e 100644 --- a/geomesa-web/geomesa-web-data/pom.xml +++ b/geomesa-web/geomesa-web-data/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-install/pom.xml b/geomesa-web/geomesa-web-install/pom.xml index 7d482795fc64..0530a3e06df7 100644 --- a/geomesa-web/geomesa-web-install/pom.xml +++ b/geomesa-web/geomesa-web-install/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-stats/pom.xml b/geomesa-web/geomesa-web-stats/pom.xml index c03bdc32a747..2ff5785b8c76 100644 --- a/geomesa-web/geomesa-web-stats/pom.xml +++ b/geomesa-web/geomesa-web-stats/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-web/pom.xml b/geomesa-web/pom.xml index 2fb7dce77ff3..9d53453b0e68 100644 --- a/geomesa-web/pom.xml +++ b/geomesa-web/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index 1a39152c59ab..d08be7f01c19 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/geomesa-zk-utils/pom.xml b/geomesa-zk-utils/pom.xml index dd43c7ce2d56..bf71b8fbfe1d 100644 --- a/geomesa-zk-utils/pom.xml +++ b/geomesa-zk-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.0 + 2.0.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 06c9135c3b71..45966a3506ae 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.locationtech.geomesa geomesa_2.11 pom - 2.0.0 + 2.0.1-SNAPSHOT @@ -2951,7 +2951,7 @@ scm:git:git@github.com:locationtech/geomesa.git scm:git:git@github.com:locationtech/geomesa.git https://github.com/locationtech/geomesa - geomesa_2.11-2.0.0 + HEAD From 6911d7c873569833cb82912339118901286459ee Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 23 Apr 2018 17:46:29 -0400 Subject: [PATCH 02/33] GEOMESA-2262 Add gs:// to list of remote prefixes (#1939) Signed-off-by: Emilio Lahr-Vivaz --- docs/user/filesystem/architecture.rst | 2 +- .../org/locationtech/geomesa/utils/io/remote-prefixes.list | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/user/filesystem/architecture.rst b/docs/user/filesystem/architecture.rst index ebb72013f5fe..df79e3d41003 100644 --- a/docs/user/filesystem/architecture.rst +++ b/docs/user/filesystem/architecture.rst @@ -25,7 +25,7 @@ with GeoMesa FSDS are: * **HDFS** - Hadoop Distributed File System * **S3** - Amazon Simple Storage * **GCS** - Google Cloud Storage -* **WASB** - Windows Azure Blob Store +* **WASB** - Windows Azure Blob Storage * **Local** - Locally Mounted File System (e.g. local disk or NFS) Choosing a filesystem depends generally on cost and performance requirements. One thing to note is that S3, GCS, and diff --git a/geomesa-utils/src/main/resources/org/locationtech/geomesa/utils/io/remote-prefixes.list b/geomesa-utils/src/main/resources/org/locationtech/geomesa/utils/io/remote-prefixes.list index 2248c21e61d3..aaefc1f349f8 100644 --- a/geomesa-utils/src/main/resources/org/locationtech/geomesa/utils/io/remote-prefixes.list +++ b/geomesa-utils/src/main/resources/org/locationtech/geomesa/utils/io/remote-prefixes.list @@ -1,4 +1,5 @@ adl +gs hdfs s3 s3n From 10d14a10aa2e113f5caf5aa7c32f6e9f945a0813 Mon Sep 17 00:00:00 2001 From: Emilio Date: Fri, 27 Apr 2018 16:04:11 -0400 Subject: [PATCH 03/33] GEOMESA-2271 HBase - support query timeout for coprocessor calls (#1943) * ThreadManagement now interrupts the query thread before closing the result Signed-off-by: Emilio Lahr-Vivaz --- .../data/AccumuloDataStoreQueryTest.scala | 4 +- .../coprocessor/GeoMesaCoprocessor.scala | 84 ++++++++++++++++--- .../geomesa/hbase/data/HBaseQueryPlan.scala | 5 +- .../index/geotools/GeoMesaFeatureReader.scala | 27 +++--- .../index/utils/ThreadManagement.scala | 72 ++++++---------- .../utils/collection/CloseableIterator.scala | 3 + .../collection/CloseableIteratorTest.scala | 29 +++++++ 7 files changed, 152 insertions(+), 72 deletions(-) diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreQueryTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreQueryTest.scala index 580d5655cbac..88f32c464582 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreQueryTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreQueryTest.scala @@ -23,8 +23,8 @@ import org.locationtech.geomesa.accumulo.index._ import org.locationtech.geomesa.accumulo.iterators.TestData import org.locationtech.geomesa.accumulo.{AccumuloFeatureIndexType, TestWithMultipleSfts} import org.locationtech.geomesa.features.ScalaSimpleFeature -import org.locationtech.geomesa.index.conf.{QueryHints, QueryProperties} import org.locationtech.geomesa.index.conf.QueryHints._ +import org.locationtech.geomesa.index.conf.{QueryHints, QueryProperties} import org.locationtech.geomesa.index.utils.{ExplainNull, ExplainString} import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder.EncodedValues @@ -481,7 +481,7 @@ class AccumuloDataStoreQueryTest extends Specification with TestWithMultipleSfts val dsWithTimeout = DataStoreFinder.getDataStore(params).asInstanceOf[AccumuloDataStore] val reader = dsWithTimeout.getFeatureReader(new Query(defaultSft.getTypeName, Filter.INCLUDE), Transaction.AUTO_COMMIT) reader.isClosed must beFalse - reader.isClosed must eventually(10, new Duration(1000))(beTrue) // reaper thread runs every 5 seconds + reader.isClosed must eventually(20, new Duration(200))(beTrue) } "block full table scans" in { diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala index 889ae087f96c..79875336f278 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala @@ -8,21 +8,25 @@ package org.locationtech.geomesa.hbase.coprocessor -import java.io._ +import java.io.{InterruptedIOException, _} +import java.util.Collections +import java.util.concurrent._ +import com.google.common.util.concurrent.MoreExecutors import com.google.protobuf.{ByteString, RpcCallback, RpcController, Service} +import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.hbase.client.coprocessor.Batch.Call import org.apache.hadoop.hbase.client.{Scan, Table} import org.apache.hadoop.hbase.coprocessor.{CoprocessorException, CoprocessorService, RegionCoprocessorEnvironment} import org.apache.hadoop.hbase.exceptions.DeserializationException import org.apache.hadoop.hbase.filter.FilterList -import org.apache.hadoop.hbase.ipc.BlockingRpcCallback import org.apache.hadoop.hbase.protobuf.ResponseConverter import org.apache.hadoop.hbase.{Coprocessor, CoprocessorEnvironment} import org.locationtech.geomesa.hbase.coprocessor.aggregators.HBaseAggregator import org.locationtech.geomesa.hbase.coprocessor.utils.{GeoMesaHBaseCallBack, GeoMesaHBaseRpcController} import org.locationtech.geomesa.hbase.proto.GeoMesaProto import org.locationtech.geomesa.hbase.proto.GeoMesaProto.{GeoMesaCoprocessorRequest, GeoMesaCoprocessorResponse, GeoMesaCoprocessorService} +import org.locationtech.geomesa.utils.collection.CloseableIterator import scala.collection.mutable.ArrayBuffer @@ -94,10 +98,16 @@ class GeoMesaCoprocessor extends GeoMesaCoprocessorService with Coprocessor with } } -object GeoMesaCoprocessor { +object GeoMesaCoprocessor extends LazyLogging { + + import scala.collection.JavaConverters._ val AggregatorClass = "geomesa.hbase.aggregator.class" + private val executor = + MoreExecutors.getExitingExecutorService(Executors.newCachedThreadPool().asInstanceOf[ThreadPoolExecutor]) + sys.addShutdownHook(executor.shutdownNow()) + /** * Executes a geomesa coprocessor * @@ -105,25 +115,75 @@ object GeoMesaCoprocessor { * @param options configuration options * @return serialized results */ - def execute(table: Table, options: Array[Byte]): List[ByteString] = { - val requestArg = GeoMesaCoprocessorRequest.newBuilder().setOptions(ByteString.copyFrom(options)).build() + def execute(table: Table, options: Array[Byte]): CloseableIterator[ByteString] = { + + val request = GeoMesaCoprocessorRequest.newBuilder().setOptions(ByteString.copyFrom(options)).build() + + val calls = Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap[Future[_], java.lang.Boolean]()) val callable = new Call[GeoMesaCoprocessorService, java.util.List[ByteString]]() { override def call(instance: GeoMesaCoprocessorService): java.util.List[ByteString] = { val controller: RpcController = new GeoMesaHBaseRpcController() - val rpcCallback = new BlockingRpcCallback[GeoMesaCoprocessorResponse]() - instance.getResult(controller, requestArg, rpcCallback) - val response: GeoMesaCoprocessorResponse = rpcCallback.get + + val call = new Callable[java.util.List[ByteString]]() { + override def call(): java.util.List[ByteString] = { + val rpcCallback = new RpcCallbackImpl() + // note: synchronous call + instance.getResult(controller, request, rpcCallback) + rpcCallback.get() + } + } + + val future = executor.submit(call) + calls.add(future) + + // block on the result + val response = try { future.get() } catch { + case e @ (_ : InterruptedException | _ : InterruptedIOException | _: CancellationException) => + logger.warn("Cancelling remote coprocessor call") + controller.startCancel() + null + } + + calls.remove(future) + if (controller.failed()) { throw new IOException(controller.errorText()) } - response.getPayloadList + + response + } + } + + new CloseableIterator[ByteString] { + + lazy private val result = { + val callBack = new GeoMesaHBaseCallBack() + try { table.coprocessorService(classOf[GeoMesaCoprocessorService], null, null, callable, callBack) } catch { + case e @ (_ :InterruptedException | _ :InterruptedIOException) => + logger.warn("Interrupted executing coprocessor query:", e) + } + callBack.getResult.iterator } + + override def hasNext: Boolean = result.hasNext + + override def next(): ByteString = result.next + + override def close(): Unit = calls.asScala.foreach(_.cancel(true)) } + } + + /** + * Unsynchronized rpc callback + */ + class RpcCallbackImpl extends RpcCallback[GeoMesaCoprocessorResponse] { + + private var result: java.util.List[ByteString] = _ - val callBack: GeoMesaHBaseCallBack = new GeoMesaHBaseCallBack() + def get(): java.util.List[ByteString] = result - table.coprocessorService(classOf[GeoMesaCoprocessorService], null, null, callable, callBack) - callBack.getResult + override def run(parameter: GeoMesaCoprocessorResponse): Unit = + result = Option(parameter).map(_.getPayloadList).orNull } } diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseQueryPlan.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseQueryPlan.scala index bcc00b172095..be4bd932713a 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseQueryPlan.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseQueryPlan.scala @@ -111,8 +111,9 @@ case class CoprocessorPlan(filter: HBaseFilterStrategyType, ds.applySecurity(scan) val byteArray = serializeOptions(coprocessorConfig.configureScanAndFilter(scan, filterList)) - val result = GeoMesaCoprocessor.execute(hbaseTable, byteArray) - val results = result.toIterator.filter(_.size() != 0).map(r => coprocessorConfig.bytesToFeatures(r.toByteArray)) + val results = GeoMesaCoprocessor.execute(hbaseTable, byteArray).collect { + case r if r.size() > 0 => coprocessorConfig.bytesToFeatures(r.toByteArray) + } coprocessorConfig.reduce(results) } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureReader.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureReader.scala index f3ccc58dfcc2..abea53ebeb62 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureReader.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureReader.scala @@ -18,33 +18,38 @@ import org.locationtech.geomesa.index.conf.QueryHints.RichHints import org.locationtech.geomesa.index.geoserver.ViewParams import org.locationtech.geomesa.index.planning.QueryRunner import org.locationtech.geomesa.index.utils.ThreadManagement +import org.locationtech.geomesa.index.utils.ThreadManagement.ManagedQuery import org.locationtech.geomesa.utils.audit.{AuditProvider, AuditWriter} import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder import org.locationtech.geomesa.utils.stats.{MethodProfiling, TimingsImpl} import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} -abstract class GeoMesaFeatureReader(val query: Query, val timeout: Option[Long], val maxFeatures: Long) - extends SimpleFeatureReader { +abstract class GeoMesaFeatureReader(val query: Query, timeout: Option[Long], val maxFeatures: Long) + extends SimpleFeatureReader with ManagedQuery { private val closed = new AtomicBoolean(false) - private lazy val start = System.currentTimeMillis() + private val cancel = timeout.map(_ => ThreadManagement.register(this)) - timeout.foreach(t => ThreadManagement.register(this, start, t)) - - def isClosed: Boolean = closed.get() def count: Long = -1L protected def closeOnce(): Unit + override def isClosed: Boolean = closed.get() + + override def getTimeout: Long = timeout.getOrElse(-1L) + override def getFeatureType: SimpleFeatureType = query.getHints.getReturnSft - override def close(): Unit = if (!closed.getAndSet(true)) { - try { - timeout.foreach(t => ThreadManagement.unregister(this, start, t)) - } finally { - closeOnce() + override def close(): Unit = { + if (closed.compareAndSet(false, true)) { + try { closeOnce() } finally { + cancel.foreach(_.cancel(false)) + } } } + + override def debug: String = + s"query on schema '${query.getTypeName}' with filter '${filterToString(query.getFilter)}'" } object GeoMesaFeatureReader { diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala index edf58bfc8af3..0fa5e656a5eb 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala @@ -8,67 +8,49 @@ package org.locationtech.geomesa.index.utils -import java.util.concurrent.{PriorityBlockingQueue, ScheduledThreadPoolExecutor, TimeUnit} +import java.io.Closeable +import java.util.concurrent.{ScheduledFuture, ScheduledThreadPoolExecutor, TimeUnit} import com.google.common.util.concurrent.MoreExecutors import com.typesafe.scalalogging.LazyLogging -import org.locationtech.geomesa.filter.filterToString -import org.locationtech.geomesa.index.geotools.GeoMesaFeatureReader + +import scala.util.control.NonFatal /** * Singleton for registering and managing running queries. */ object ThreadManagement extends LazyLogging { - private val interval = 5000L // how often we check for expired readers - private val ordering = new Ordering[ReaderAndTime]() { - // head of queue will be ones the will timeout first - override def compare(x: ReaderAndTime, y: ReaderAndTime) = x.killAt.compareTo(y.killAt) + private val executor = { + val ex = new ScheduledThreadPoolExecutor(2) + ex.setRemoveOnCancelPolicy(true) + MoreExecutors.getExitingScheduledExecutorService(ex) } - private val openReaders = new PriorityBlockingQueue[ReaderAndTime](11, ordering) // size will grow unbounded - - private val reaper = new Runnable() { - override def run() = { - val time = System.currentTimeMillis() - var loop = true - var numClosed = 0 - while (loop) { - val holder = openReaders.poll() - if (holder == null) { - loop = false - } else if (holder.killAt < time) { - if (!holder.reader.isClosed) { - logger.warn(s"Stopping query on schema '${holder.reader.query.getTypeName}' with filter " + - s"'${filterToString(holder.reader.query.getFilter)}' based on timeout of ${holder.timeout}ms") - holder.reader.close() - numClosed += 1 - } - } else { - if (!holder.reader.isClosed) { - openReaders.offer(holder) - } - loop = false - } - } - logger.trace(s"Force closed $numClosed queries with ${openReaders.size()} queries still running.") - } - } - - private val executor = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1)) - executor.scheduleWithFixedDelay(reaper, interval, interval, TimeUnit.MILLISECONDS) sys.addShutdownHook(executor.shutdownNow()) /** * Register a query with the thread manager */ - def register(reader: GeoMesaFeatureReader, start: Long, timeout: Long): Unit = - openReaders.offer(ReaderAndTime(reader, start + timeout, timeout)) + def register(query: ManagedQuery): ScheduledFuture[_] = + executor.schedule(new QueryKiller(query), query.getTimeout, TimeUnit.MILLISECONDS) /** - * Unregister a query with the thread manager once the query has been closed - */ - def unregister(reader: GeoMesaFeatureReader, start: Long, timeout: Long): Unit = - openReaders.remove(ReaderAndTime(reader, start + timeout, timeout)) + * Trait for classes to be managed for timeouts + */ + trait ManagedQuery extends Closeable { + def getTimeout: Long + def isClosed: Boolean + def debug: String + } - case class ReaderAndTime(reader: GeoMesaFeatureReader, killAt: Long, timeout: Long) + private class QueryKiller(query: ManagedQuery) extends Runnable { + override def run(): Unit = { + if (!query.isClosed) { + logger.warn(s"Stopping ${query.debug} based on timeout of ${query.getTimeout}ms") + try { query.close() } catch { + case NonFatal(e) => logger.warn("Error cancelling query:", e) + } + } + } + } } diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/collection/CloseableIterator.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/collection/CloseableIterator.scala index 33164d120551..5d2dbe7a3f8f 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/collection/CloseableIterator.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/collection/CloseableIterator.scala @@ -70,6 +70,9 @@ trait CloseableIterator[+A] extends Iterator[A] with Closeable { override def filter(p: A => Boolean): CloseableIterator[A] = CloseableIterator(super.filter(p), self.close()) + override def collect[B](pf: PartialFunction[A, B]): CloseableIterator[B] = + CloseableIterator(super.collect(pf), self.close()) + override def ++[B >: A](that: => GenTraversableOnce[B]): CloseableIterator[B] = { lazy val applied = CloseableIterator.wrap(that) val queue = new scala.collection.mutable.Queue[() => CloseableIterator[B]] diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/collection/CloseableIteratorTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/collection/CloseableIteratorTest.scala index 883a96a5585f..207ef6caf136 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/collection/CloseableIteratorTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/collection/CloseableIteratorTest.scala @@ -26,6 +26,35 @@ class CloseableIteratorTest extends Specification with Mockito { iter.close() closed must beTrue } + "close with map" >> { + var closed = false + val iter = CloseableIterator(Iterator(0, 1), { closed = true }).map(i => i + 1) + closed must beFalse + iter.toSeq mustEqual Seq(1, 2) + closed must beFalse + iter.close() + closed must beTrue + } + "close with filter" >> { + var closed = false + val iter = CloseableIterator(Iterator(0, 1), { closed = true }).filter(i => i % 2 == 0) + closed must beFalse + iter.toSeq mustEqual Seq(0) + closed must beFalse + iter.close() + closed must beTrue + } + "close with collect" >> { + var closed = false + val iter = CloseableIterator(Iterator(0, 1), { closed = true }).collect { + case i if i % 2 == 0 => i + 1 + } + closed must beFalse + iter.toSeq mustEqual Seq(1) + closed must beFalse + iter.close() + closed must beTrue + } "close with flatmap" >> { val closed0, closed1, closed2 = new CloseCounter() val result = CloseableIterator(Iterator(0, 1), closed0.close()).flatMap { i => From 9eb42fb8b38a62a83bd9b60b20f03c319b0bba10 Mon Sep 17 00:00:00 2001 From: Atallah Hezbor Date: Mon, 30 Apr 2018 09:52:51 -0400 Subject: [PATCH 04/33] GEOMESA-2267 Spark dataframe .show or .take throws an exception with null date fields (#1938) Signed-off-by: Atallah Hezbor --- .../org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala index 4e79559ed22a..db3921052621 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala @@ -698,7 +698,12 @@ object SparkUtils { val fieldType = schema.fields(schemaIndex).dataType sf: SimpleFeature => if ( fieldType == TimestampType ) { - new Timestamp(sf.getAttribute(index).asInstanceOf[Date].getTime) + val attr = sf.getAttribute(index) + if (attr != null) { + new Timestamp(attr.asInstanceOf[Date].getTime) + } else { + null + } } else { sf.getAttribute(index) } From b9dff19201a160086b8bebc5bb8e585a8a51e253 Mon Sep 17 00:00:00 2001 From: Emilio Date: Wed, 2 May 2018 17:41:01 -0400 Subject: [PATCH 05/33] GEOMESA-2268 Adding info on gpg signatures, fixing javadoc comments required for maven central (#1937) Signed-off-by: Emilio Lahr-Vivaz --- README.md | 22 +++++++++++++++++++ build/README.md | 22 +++++++++++++++++++ .../geomesa/fs/storage/api/FileMetadata.java | 8 +++---- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d0232209a3b7..cf86751072a3 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,28 @@ geospatial analytics. **Development version: 2.1.0-SNAPSHOT**   [![Build Status](https://api.travis-ci.org/locationtech/geomesa.svg?branch=master)](https://travis-ci.org/locationtech/geomesa) +### Verifying Downloads + +Downloads hosted on GitHub include SHA-256 hashes and gpg signatures (.asc files). To verify a download using gpg, +import the appropriate key: + +```bash +$ gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys CD24F317 +``` + +Then verify the file: + +```bash +$ gpg2 --verify geomesa-accumulo_2.11-2.0.0-bin.tar.gz.asc geomesa-accumulo_2.11-2.0.0-bin.tar.gz +``` + +The keys currently used for signing are: + +| Key ID | Name | +| ------ | ---- | +| `CD24F317` | Emilio Lahr-Vivaz <elahrvivaz(-at-)ccri.com> | +| `1E679A56` | James Hughes <jnh5y(-at-)ccri.com> | + ### Upgrading To upgrade between minor releases of GeoMesa, the versions of all GeoMesa components **must** match. diff --git a/build/README.md b/build/README.md index f36be7e77c22..40962204714f 100644 --- a/build/README.md +++ b/build/README.md @@ -49,6 +49,28 @@ geospatial analytics. **Development version: ${geomesa.devel.version}**   [![Build Status](https://api.travis-ci.org/locationtech/geomesa.svg?branch=master)](https://travis-ci.org/locationtech/geomesa) +### Verifying Downloads + +Downloads hosted on GitHub include SHA-256 hashes and gpg signatures (.asc files). To verify a download using gpg, +import the appropriate key: + +```bash +$ gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys CD24F317 +``` + +Then verify the file: + +```bash +$ gpg2 --verify geomesa-accumulo_2.11-2.0.0-bin.tar.gz.asc geomesa-accumulo_2.11-2.0.0-bin.tar.gz +``` + +The keys currently used for signing are: + +| Key ID | Name | +| ------ | ---- | +| `CD24F317` | Emilio Lahr-Vivaz <elahrvivaz(-at-)ccri.com> | +| `1E679A56` | James Hughes <jnh5y(-at-)ccri.com> | + ### Upgrading To upgrade between minor releases of GeoMesa, the versions of all GeoMesa components **must** match. diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/src/main/java/org/locationtech/geomesa/fs/storage/api/FileMetadata.java b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/src/main/java/org/locationtech/geomesa/fs/storage/api/FileMetadata.java index 5b5bb946eb8e..3c4ab040674d 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/src/main/java/org/locationtech/geomesa/fs/storage/api/FileMetadata.java +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/src/main/java/org/locationtech/geomesa/fs/storage/api/FileMetadata.java @@ -87,7 +87,7 @@ public interface FileMetadata { /** * The file names of all data files, keyed by partition name * - * @return map of partition -> file names + * @return map of partition -> file names */ Map> getPartitionFiles(); @@ -110,7 +110,7 @@ public interface FileMetadata { /** * Add metadata entries for multiple files in multiple partitions * - * @param partitionsToFiles map of partition -> file names + * @param partitionsToFiles map of partition -> file names */ void addFiles(Map> partitionsToFiles); @@ -133,7 +133,7 @@ public interface FileMetadata { /** * Removes metadata entries for multiple files in multiple partitions * - * @param partitionsToFiles map of partition -> file names + * @param partitionsToFiles map of partition -> file names */ void removeFiles(Map> partitionsToFiles); @@ -149,7 +149,7 @@ public interface FileMetadata { /** * Removes any current metadata entries and replaces them with the given partitions and files * - * @param partitionsToFiles map of partition -> file names + * @param partitionsToFiles map of partition -> file names */ void setFiles(Map> partitionsToFiles); } From 3210be72cb6ad24750631a893d60d5daeeb118be Mon Sep 17 00:00:00 2001 From: Emilio Date: Wed, 2 May 2018 17:41:57 -0400 Subject: [PATCH 06/33] GEOMESA-2273 Fixing push-down spark sql date predicates (#1944) Signed-off-by: Emilio Lahr-Vivaz --- .../scala/org/apache/spark/sql/SQLRules.scala | 20 ++++++------- .../geomesa/spark/SparkSQLDataTest.scala | 30 +++++++++++++++++-- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala index 83a79fc0bd7c..a24439aa4303 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala @@ -8,23 +8,24 @@ package org.apache.spark.sql +import java.util.Date + import com.typesafe.scalalogging.LazyLogging import com.vividsolutions.jts.geom.{Envelope, Geometry} -import org.apache.spark.sql.jts.JTSTypes._ import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.logical._ import org.apache.spark.sql.catalyst.rules.Rule -import org.apache.spark.sql.execution.{ProjectExec, SparkPlan} import org.apache.spark.sql.execution.datasources.LogicalRelation -import org.apache.spark.sql.types.StructType +import org.apache.spark.sql.execution.{ProjectExec, SparkPlan} +import org.apache.spark.sql.types.{DataTypes, StructType} import org.geotools.factory.CommonFactoryFinder import org.locationtech.geomesa.spark.jts.rules.GeometryLiteral +import org.locationtech.geomesa.spark.jts.udf.SpatialRelationFunctions._ import org.locationtech.geomesa.spark.{GeoMesaJoinRelation, GeoMesaRelation, RelationUtils} import org.opengis.filter.expression.{Expression => GTExpression} import org.opengis.filter.{FilterFactory2, Filter => GTFilter} import scala.collection.JavaConversions._ -import org.locationtech.geomesa.spark.jts.udf.SpatialRelationFunctions._ object SQLRules extends LazyLogging { @transient @@ -111,12 +112,11 @@ object SQLRules extends LazyLogging { def sparkExprToGTExpr(expr: Expression): Option[GTExpression] = { expr match { - case GeometryLiteral(_, geom) => - Some(ff.literal(geom)) - case AttributeReference(name, _, _, _) if !name.equals("__fid__") => - Some(ff.property(name)) - case Literal(value, _) => - Some(ff.literal(value)) + case GeometryLiteral(_, geom) => Some(ff.literal(geom)) + case AttributeReference(name, _, _, _) if !name.equals("__fid__") => Some(ff.property(name)) + // note: timestamps are defined in microseconds + case Literal(value, DataTypes.TimestampType) => Some(ff.literal(new Date(value.asInstanceOf[Long] / 1000))) + case Literal(value, _) => Some(ff.literal(value)) case _ => logger.debug(s"Got expr: $expr. Don't know how to turn this into a GeoTools Expression.") None diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala index f01cdd77c8a6..200978787f85 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala @@ -184,9 +184,9 @@ class SparkSQLDataTest extends Specification with LazyLogging { val noPushdown = sc.sql("select geom from chicago where __fid__ = 1") val noPushdownPlan = noPushdown.queryExecution.optimizedPlan - pushdownPlan.children.head.isInstanceOf[LogicalRelation] mustEqual true // filter is pushed down - pushdownDFPlan.isInstanceOf[LogicalRelation] mustEqual true // filter is pushed down - noPushdownPlan.children.head.isInstanceOf[Filter] mustEqual true // filter remains at top level + pushdownPlan.children.head must beAnInstanceOf[LogicalRelation] // filter is pushed down + pushdownDFPlan must beAnInstanceOf[LogicalRelation] // filter is pushed down + noPushdownPlan.children.head must beAnInstanceOf[Filter] // filter remains at top level } "pushdown attribute comparison filters" >> { @@ -207,6 +207,30 @@ class SparkSQLDataTest extends Specification with LazyLogging { pushdownGte.collect().map{ r=> r.get(0) } mustEqual Array(2, 3) } + "pushdown date attribute comparison filters" >> { + val and = "select case_number from chicago where dtg > cast('2016-01-01T01:00:00Z' as timestamp) " + + "and dtg < cast('2016-01-02T01:00:00Z' as timestamp)" + val between = "select case_number from chicago where dtg between cast('2016-01-01T01:00:00Z' as timestamp) " + + "and cast('2016-01-02T01:00:00Z' as timestamp)" + + foreach(Seq(and, between)) { select => + val df = sc.sql(select) + df.queryExecution.optimizedPlan.children.head must beAnInstanceOf[LogicalRelation] + df.collect().map(_.get(0)) mustEqual Array(2) + } + } + + "pushdown spatio-temporal filters" >> { + val sql = "select case_number from chicago where " + + "st_intersects(geom, st_makeBox2d(st_point(-77.5, 37.9), st_point(-76.5, 38.1))) and " + + "dtg between cast('2016-01-01T01:00:00Z' as timestamp) and cast('2016-01-03T01:00:00Z' as timestamp)" + + val df = sc.sql(sql) + df.queryExecution.optimizedPlan.children must haveLength(1) + df.queryExecution.optimizedPlan.children.head must beAnInstanceOf[LogicalRelation] + df.collect().map(_.get(0)) mustEqual Array(2) + } + "st_translate" >> { "null" >> { sc.sql("select st_translate(null, null, null)").collect.head(0) must beNull From 28c7f89500a8a56ce2c6a1a7d0f1108963ff6974 Mon Sep 17 00:00:00 2001 From: Emilio Date: Thu, 3 May 2018 11:51:10 -0400 Subject: [PATCH 07/33] GEOMESA-2275 Disable speculative execution during ingestion (#1947) Signed-off-by: Emilio Lahr-Vivaz --- .../locationtech/geomesa/tools/ingest/AbstractIngestJob.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala index 0b4181f1d879..61448d477c0e 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala @@ -75,6 +75,7 @@ abstract class AbstractIngestJob(dsParams: Map[String, String], job.setMapOutputKeyClass(classOf[Text]) job.setOutputValueClass(classOf[ScalaSimpleFeature]) job.setNumReduceTasks(0) + job.getConfiguration.set("mapred.map.tasks.speculative.execution", "false") job.getConfiguration.set("mapred.reduce.tasks.speculative.execution", "false") job.getConfiguration.set("mapreduce.job.user.classpath.first", "true") From 1e793990887b097639b3a3c37e6db32004a45335 Mon Sep 17 00:00:00 2001 From: Austin Heyne Date: Mon, 7 May 2018 14:41:36 -0400 Subject: [PATCH 08/33] GEOMESA-2282 Fix GTD converter date format (#1950) Signed-off-by: Austin Heyne --- geomesa-tools/conf/sfts/gtd/reference.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geomesa-tools/conf/sfts/gtd/reference.conf b/geomesa-tools/conf/sfts/gtd/reference.conf index ad8a3fa7d93c..1f9c3b8e0241 100644 --- a/geomesa-tools/conf/sfts/gtd/reference.conf +++ b/geomesa-tools/conf/sfts/gtd/reference.conf @@ -33,7 +33,7 @@ geomesa { { name = "dtstr1" , transform = "concat($dtstr0, $3)" } { name = "dtstr2" , transform = "concat($dtstr1, '-')" } { name = "dtstr" , transform = "concat($dtstr2, $4)" } - { name = "dtg" , transform = "date('yyyy-MM-dd', $dtstr)" } + { name = "dtg" , transform = "date('yyyy-M-d', $dtstr)" } { name = "lat" , transform = "$5::double" } { name = "lon" , transform = "$6::double" } { name = "geom" , transform = "point($lon, $lat)" } From 64433dbc1be54eafa807af19991eba37d8f12d2c Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 7 May 2018 15:54:34 -0400 Subject: [PATCH 09/33] GEOMESA-2281 SparkSQL - handling push-down casts (#1951) * Supports date queries without a cast to timestamp * e.g "dtg between '2016-01-01T00:00:00Z' and '2016-01-01T01:00:00Z'" Signed-off-by: Emilio Lahr-Vivaz --- .travisbuild.sh | 2 +- .../scala/org/apache/spark/sql/SQLRules.scala | 46 +++++++++++++------ .../geomesa/spark/SparkSQLDataTest.scala | 18 ++++++-- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/.travisbuild.sh b/.travisbuild.sh index 830bd0d9659b..ae6409d19319 100755 --- a/.travisbuild.sh +++ b/.travisbuild.sh @@ -21,7 +21,7 @@ if [[ $RESULT -ne 0 ]]; then echo -e "[ERROR] Build failed!\n" else # now run tests - using the maven executable, as zinc uses too much memory - mvn -o surefire:test -DargLine="-Duser.timezone=UTC -Xmx4g -XX:-UseGCOverheadLimit -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dgeomesa.scan.ranges.target=500" 2>&1 | tee -a $BUILD_OUTPUT | grep -e 'Building GeoMesa' -e '\(maven-surefire-plugin\|maven-jar-plugin\|scala-maven-plugin.*:compile\)' + mvn surefire:test -DargLine="-Duser.timezone=UTC -Xmx4g -XX:-UseGCOverheadLimit -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dgeomesa.scan.ranges.target=500" 2>&1 | tee -a $BUILD_OUTPUT | grep -e 'Building GeoMesa' -e '\(maven-surefire-plugin\|maven-jar-plugin\|scala-maven-plugin.*:compile\)' RESULT=${PIPESTATUS[0]} # capture the status of the maven build # dump out the end of the build log, to show success or errors diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala index a24439aa4303..fdda7273386c 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala @@ -8,6 +8,7 @@ package org.apache.spark.sql +import java.time.{LocalDateTime, ZoneId, ZoneOffset} import java.util.Date import com.typesafe.scalalogging.LazyLogging @@ -22,7 +23,7 @@ import org.geotools.factory.CommonFactoryFinder import org.locationtech.geomesa.spark.jts.rules.GeometryLiteral import org.locationtech.geomesa.spark.jts.udf.SpatialRelationFunctions._ import org.locationtech.geomesa.spark.{GeoMesaJoinRelation, GeoMesaRelation, RelationUtils} -import org.opengis.filter.expression.{Expression => GTExpression} +import org.opengis.filter.expression.{Expression => GTExpression, Literal => GTLiteral} import org.opengis.filter.{FilterFactory2, Filter => GTFilter} import scala.collection.JavaConversions._ @@ -107,20 +108,39 @@ object SQLRules extends LazyLogging { logger.debug(s"Got expr: $expr. Don't know how to turn this into a GeoTools Expression.") None } - } - def sparkExprToGTExpr(expr: Expression): Option[GTExpression] = { - expr match { - case GeometryLiteral(_, geom) => Some(ff.literal(geom)) - case AttributeReference(name, _, _, _) if !name.equals("__fid__") => Some(ff.property(name)) - // note: timestamps are defined in microseconds - case Literal(value, DataTypes.TimestampType) => Some(ff.literal(new Date(value.asInstanceOf[Long] / 1000))) - case Literal(value, _) => Some(ff.literal(value)) - case _ => - logger.debug(s"Got expr: $expr. Don't know how to turn this into a GeoTools Expression.") - None - } + def sparkExprToGTExpr(expression: Expression): Option[GTExpression] = expression match { + case g: GeometryLiteral => + Some(ff.literal(g.geom)) + + case a: AttributeReference if a.name != "__fid__" => + Some(ff.property(a.name)) + + case c: Cast => + lazy val zone = c.timeZoneId.map(ZoneId.of).orNull + sparkExprToGTExpr(c.child).map { + case lit: GTLiteral if lit.getValue.isInstanceOf[Date] && zone != null => + val date = LocalDateTime.ofInstant(lit.getValue.asInstanceOf[Date].toInstant, zone) + ff.literal(new Date(date.atZone(ZoneOffset.UTC).toInstant.toEpochMilli)) + case e => e + } + + case lit: Literal if lit.dataType == DataTypes.StringType => + // the actual class is org.apache.spark.unsafe.types.UTF8String, we need to make it + // a normal string so that geotools can handle it + Some(ff.literal(Option(lit.value).map(_.toString).orNull)) + + case lit: Literal if lit.dataType == DataTypes.TimestampType => + // timestamps are defined as microseconds + Some(ff.literal(new Date(lit.value.asInstanceOf[Long] / 1000))) + + case lit: Literal => + Some(ff.literal(lit.value)) + + case _ => + logger.debug(s"Can't turn expression into geotools: $expression") + None } // new optimizations rules diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala index 200978787f85..b8b61e1b5678 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala @@ -58,7 +58,7 @@ class SparkSQLDataTest extends Specification with LazyLogging { .options(dsParams) .option("geomesa.feature", "chicago") .load() - logger.info(df.schema.treeString) + logger.debug(df.schema.treeString) df.createOrReplaceTempView("chicago") @@ -72,7 +72,7 @@ class SparkSQLDataTest extends Specification with LazyLogging { .option("geomesa.feature", "chicago") .option("cache", "true") .load() - logger.info(df.schema.treeString) + logger.debug(df.schema.treeString) dfIndexed.createOrReplaceTempView("chicagoIndexed") @@ -88,7 +88,7 @@ class SparkSQLDataTest extends Specification with LazyLogging { .option("spatial","true") .option("strategy", "RTREE") .load() - logger.info(df.schema.treeString) + logger.debug(df.schema.treeString) dfPartitioned.createOrReplaceTempView("chicagoPartitioned") @@ -120,7 +120,6 @@ class SparkSQLDataTest extends Specification with LazyLogging { } "basic sql partitioned" >> { - sc.sql("select * from chicagoPartitioned").show() val r = sc.sql("select * from chicagoPartitioned where st_equals(geom, st_geomFromWKT('POINT(-77 38)'))") val d = r.collect @@ -220,6 +219,17 @@ class SparkSQLDataTest extends Specification with LazyLogging { } } + "pushdown date attribute string filters" >> { + val and = "select case_number from chicago where dtg > '2016-01-01T01:00:00Z' and dtg < '2016-01-02T01:00:00Z'" + val between = "select case_number from chicago where dtg between '2016-01-01T01:00:00Z' and '2016-01-02T01:00:00Z'" + + foreach(Seq(and, between)) { select => + val df = sc.sql(select) + df.queryExecution.optimizedPlan.children.head must beAnInstanceOf[LogicalRelation] + df.collect().map(_.get(0)) mustEqual Array(2) + } + } + "pushdown spatio-temporal filters" >> { val sql = "select case_number from chicago where " + "st_intersects(geom, st_makeBox2d(st_point(-77.5, 37.9), st_point(-76.5, 38.1))) and " + From 125e7206b316fc9769b85ebc5063c1ece2336070 Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 7 May 2018 15:54:55 -0400 Subject: [PATCH 10/33] GEOMESA-2280 Fixing unbounded secondary date attribute ranges (#1949) Signed-off-by: Emilio Lahr-Vivaz --- .../index/index/z3/XZ3IndexKeySpace.scala | 20 +++++++------- .../index/index/z3/Z3IndexKeySpace.scala | 20 +++++++------- .../geomesa/index/TestGeoMesaDataStore.scala | 8 +++++- .../index/index/AttributeIndexTest.scala | 27 +++++++++++++++++-- 4 files changed, 54 insertions(+), 21 deletions(-) diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/XZ3IndexKeySpace.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/XZ3IndexKeySpace.scala index c812eb430b92..1c5255ef5ef4 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/XZ3IndexKeySpace.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/XZ3IndexKeySpace.scala @@ -104,15 +104,17 @@ trait XZ3IndexKeySpace extends IndexKeySpace[XZ3IndexValues, Z3IndexKey] { // note: intervals shouldn't have any overlaps intervals.foreach { interval => - val (lower, upper) = boundsToDates(interval.bounds) - val BinnedTime(lb, lt) = dateToIndex(lower) - val BinnedTime(ub, ut) = dateToIndex(upper) - if (lb == ub) { - updateTime(lb, lt, ut) - } else { - updateTime(lb, lt, sfc.zBounds._2) - updateTime(ub, sfc.zBounds._1, ut) - Range.inclusive(lb + 1, ub - 1).foreach(b => timesByBin(b.toShort) = sfc.zBounds) + if (interval.isBoundedBothSides) { + val (lower, upper) = boundsToDates(interval.bounds) + val BinnedTime(lb, lt) = dateToIndex(lower) + val BinnedTime(ub, ut) = dateToIndex(upper) + if (lb == ub) { + updateTime(lb, lt, ut) + } else { + updateTime(lb, lt, sfc.zBounds._2) + updateTime(ub, sfc.zBounds._1, ut) + Range.inclusive(lb + 1, ub - 1).foreach(b => timesByBin(b.toShort) = sfc.zBounds) + } } } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/Z3IndexKeySpace.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/Z3IndexKeySpace.scala index 691c29dd4296..d23a9d06e787 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/Z3IndexKeySpace.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/z3/Z3IndexKeySpace.scala @@ -105,15 +105,17 @@ trait Z3IndexKeySpace extends IndexKeySpace[Z3IndexValues, Z3IndexKey] { // note: intervals shouldn't have any overlaps intervals.foreach { interval => - val (lower, upper) = boundsToDates(interval.bounds) - val BinnedTime(lb, lt) = dateToIndex(lower) - val BinnedTime(ub, ut) = dateToIndex(upper) - if (lb == ub) { - timesByBin(lb) ++= Seq((lt, ut)) - } else { - timesByBin(lb) ++= Seq((lt, maxTime)) - timesByBin(ub) ++= Seq((minTime, ut)) - Range.inclusive(lb + 1, ub - 1).foreach(b => timesByBin(b.toShort) = z3.wholePeriod) + if (interval.isBoundedBothSides) { + val (lower, upper) = boundsToDates(interval.bounds) + val BinnedTime(lb, lt) = dateToIndex(lower) + val BinnedTime(ub, ut) = dateToIndex(upper) + if (lb == ub) { + timesByBin(lb) ++= Seq((lt, ut)) + } else { + timesByBin(lb) ++= Seq((lt, maxTime)) + timesByBin(ub) ++= Seq((minTime, ut)) + Range.inclusive(lb + 1, ub - 1).foreach(b => timesByBin(b.toShort) = z3.wholePeriod) + } } } diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/TestGeoMesaDataStore.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/TestGeoMesaDataStore.scala index 8db04d1a6608..3df1a932c90a 100644 --- a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/TestGeoMesaDataStore.scala +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/TestGeoMesaDataStore.scala @@ -10,6 +10,7 @@ package org.locationtech.geomesa.index import java.nio.charset.StandardCharsets +import com.google.common.primitives.UnsignedBytes import org.geotools.data.{Query, Transaction} import org.geotools.factory.Hints import org.locationtech.geomesa.index.TestGeoMesaDataStore.{TestWrappedFeature, TestWrite, _} @@ -53,6 +54,9 @@ class TestGeoMesaDataStore(looseBBox: Boolean) filter: Filter): TestFeatureWriterType = new TestModifyFeatureWriter(sft, this, indices, filter) + override def getQueryPlan(query: Query, index: Option[TestFeatureIndexType], explainer: Explainer): Seq[TestQueryPlan] = + super.getQueryPlan(query, index, explainer).asInstanceOf[Seq[TestQueryPlan]] + override def delete(): Unit = throw new NotImplementedError() } @@ -198,7 +202,9 @@ object TestGeoMesaDataStore { } override def explain(explainer: Explainer, prefix: String): Unit = { - explainer(s"ranges (${ranges.length}): ${ranges.take(5).map(r => s"[${r.start.mkString("")}:${r.end.mkString("")})").mkString(",")}") + explainer(s"ranges (${ranges.length}): ${ranges.take(5).map(r => + s"[${r.start.map(UnsignedBytes.toString).mkString(";")}:" + + s"${r.end.map(UnsignedBytes.toString).mkString(";")})").mkString(",")}") explainer(s"ecql: ${ecql.map(org.locationtech.geomesa.filter.filterToString).getOrElse("INCLUDE")}") } } diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala index c10b9a01e551..80ef0270828f 100644 --- a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala @@ -16,7 +16,7 @@ import org.geotools.util.Converters import org.junit.runner.RunWith import org.locationtech.geomesa.features.ScalaSimpleFeature import org.locationtech.geomesa.index.TestGeoMesaDataStore -import org.locationtech.geomesa.index.TestGeoMesaDataStore.{TestAttributeIndex, TestQueryPlan, TestRange} +import org.locationtech.geomesa.index.TestGeoMesaDataStore.{TestAttributeIndex, TestRange} import org.locationtech.geomesa.index.conf.QueryHints import org.locationtech.geomesa.index.index.IndexKeySpace.ByteRange import org.locationtech.geomesa.index.index.attribute.AttributeIndexKey @@ -91,7 +91,7 @@ class AttributeIndexTest extends Specification with LazyLogging { val q = new Query(typeName, ECQL.toFilter(filter)) // validate that ranges do not overlap foreach(ds.getQueryPlan(q, explainer = explain)) { qp => - val ranges = qp.asInstanceOf[TestQueryPlan].ranges.sortBy(_.start)(ByteRange.ByteOrdering) + val ranges = qp.ranges.sortBy(_.start)(ByteRange.ByteOrdering) forall(ranges.sliding(2)) { case Seq(left, right) => overlaps(left, right) must beFalse } } SelfClosingIterator(ds.getFeatureReader(q, Transaction.AUTO_COMMIT)).map(_.getID).toSeq @@ -107,6 +107,29 @@ class AttributeIndexTest extends Specification with LazyLogging { results must contain("bob") } + "correctly set secondary index ranges with not nulls" in { + import org.locationtech.geomesa.utils.geotools.RichSimpleFeatureType.RichSimpleFeatureType + + val ds = new TestGeoMesaDataStore(true) + ds.createSchema(sft) + + WithClose(ds.getFeatureWriterAppend(typeName, Transaction.AUTO_COMMIT)) { writer => + features.foreach { f => + FeatureUtils.copyToWriter(writer, f, useProvidedFid = true) + writer.write() + } + } + + val filter = "contains('POLYGON ((46.9 48.9, 47.1 48.9, 47.1 49.1, 46.9 49.1, 46.9 48.9))', geom) AND " + + "name = 'bob' AND dtg IS NOT NULL AND name IS NOT NULL AND INCLUDE" + val q = new Query(sft.getTypeName, ECQL.toFilter(filter)) + + ds.getQueryPlan(q).flatMap(_.ranges) must haveLength(sft.getAttributeShards) + + val results = SelfClosingIterator(ds.getFeatureReader(q, Transaction.AUTO_COMMIT)).map(_.getID).toList + results mustEqual Seq("bob") + } + "handle functions" in { val ds = new TestGeoMesaDataStore(true) ds.createSchema(sft) From bb9cb905e744cc7f745d438d8d11ffede54cf938 Mon Sep 17 00:00:00 2001 From: Emilio Date: Wed, 9 May 2018 10:47:45 -0400 Subject: [PATCH 11/33] GEOMESA-2278 Docs - document non-Accumulo spatial RDD providers (#1952) Signed-off-by: Emilio Lahr-Vivaz --- docs/tutorials/broadcast-join.rst | 4 +- docs/tutorials/dwithin-join.rst | 4 +- docs/user/filesystem/sql.rst | 2 + docs/user/index.rst | 10 +- docs/user/spark/accumulo_spark_runtime.rst | 34 ---- docs/user/spark/architecture.rst | 25 +-- docs/user/spark/core.rst | 164 ++----------------- docs/user/spark/index.rst | 4 +- docs/user/spark/providers.rst | 173 +++++++++++++++++++++ docs/user/spark/pyspark.rst | 8 +- docs/user/spark/sparksql.rst | 27 +--- 11 files changed, 223 insertions(+), 232 deletions(-) delete mode 100644 docs/user/spark/accumulo_spark_runtime.rst create mode 100644 docs/user/spark/providers.rst diff --git a/docs/tutorials/broadcast-join.rst b/docs/tutorials/broadcast-join.rst index b0c597879513..8c3398ef75d6 100644 --- a/docs/tutorials/broadcast-join.rst +++ b/docs/tutorials/broadcast-join.rst @@ -1,5 +1,5 @@ -GeoMesa Spark: Aggregating Data -=============================== +GeoMesa Spark: Broadcast Join and Aggregation +============================================= This tutorial will show you how to: diff --git a/docs/tutorials/dwithin-join.rst b/docs/tutorials/dwithin-join.rst index bc68ab6f11cb..f34c38295c39 100644 --- a/docs/tutorials/dwithin-join.rst +++ b/docs/tutorials/dwithin-join.rst @@ -1,5 +1,5 @@ -GeoMesa Spark: Aggregating Data -=============================== +GeoMesa Spark: Spatial Join and Aggregation +=========================================== This tutorial will show you how to: diff --git a/docs/user/filesystem/sql.rst b/docs/user/filesystem/sql.rst index b7b776ee3eb6..eab615a248bb 100644 --- a/docs/user/filesystem/sql.rst +++ b/docs/user/filesystem/sql.rst @@ -1,3 +1,5 @@ +.. _fsds_sparksql_example: + GeoMesa FileSystem Data Store with Spark SQL ============================================ diff --git a/docs/user/index.rst b/docs/user/index.rst index 19d342bde03f..1f9464842662 100755 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -21,14 +21,14 @@ User Manual lambda/index filesystem/index geoserver - blobstore + spark/index convert/index + process geojson - metrics - native_api nifi - process - spark/index + blobstore + native_api + metrics stream web_data upgrade diff --git a/docs/user/spark/accumulo_spark_runtime.rst b/docs/user/spark/accumulo_spark_runtime.rst deleted file mode 100644 index 087dc645a127..000000000000 --- a/docs/user/spark/accumulo_spark_runtime.rst +++ /dev/null @@ -1,34 +0,0 @@ -Using the GeoMesa Accumulo Spark Runtime -======================================== - -The ``geomesa-accumulo-spark-runtime`` module (found in the ``geomesa-accumulo`` directory in the GeoMesa source -distribution) provides a shaded JAR with all of the dependencies for Spark and Spark SQL analysis for data -stored in GeoMesa Accumulo, including the GeoMesa Accumulo data store, the GeoMesa Spark and GeoMesa Spark SQL -modules, and the ``AccumuloSpatialRDDProvider``. - -.. note:: - - In the example below, ``$VERSION`` = |release|. - -The shaded JAR can either be built from source (see :ref:`building_from_source`), or is included in -the ``dist/spark`` directory of the GeoMesa Accumulo binary distribution. This JAR may be passed as an argument -to the Spark command line tools, or to `Jupyter`_ running the `Toree`_ kernel, without having to also include the -other dependencies requred to run GeoMesa or Accumulo. - -.. _Jupyter: http://jupyter.org/ - -.. _Toree: https://toree.apache.org/ - -For example, the JAR can be used with the ``--jars`` switch of the ``spark-shell`` command: - -.. code:: - - $ spark-shell --jars /path/to/geomesa-accumulo-spark-runtime_2.11-$VERSION.jar - -You should see a logging message loading the shaded JAR as the Spark console comes up: - -.. code:: - - ... - 17/01/16 14:31:21 INFO SparkContext: Added JAR file:/path/to/geomesa-accumulo-spark-runtime_2.11-$VERSION.jar at http://192.168.3.14:40775/jars/geomesa-accumulo-spark-runtime_2.11-$VERSION.jar with timestamp 1484595081362 - ... diff --git a/docs/user/spark/architecture.rst b/docs/user/spark/architecture.rst index 313a25dfd32a..f690d3ad935d 100644 --- a/docs/user/spark/architecture.rst +++ b/docs/user/spark/architecture.rst @@ -3,24 +3,27 @@ Architecture GeoMesa Spark provides capabilities to run geospatial analysis jobs on the distributed, large-scale data processing engine `Apache Spark`_. -This provides interfaces for Spark to ingest and analyze geospatial data -stored in GeoMesa Accumulo and other data stores. +It provides interfaces for Spark to ingest and analyze geospatial data +stored in GeoMesa data stores. -GeoMesa Spark is divided into two modules. +GeoMesa provides Spark integration at several different levels. At the lowest level +is the ``geomesa-spark-jts`` module (see :doc:`./spark_jts`), which contains user-defined spatial types +and functions. This module can easily be included in other projects that want to +work with geometries in Spark, as it only depends on the JTS library. -GeoMesa :doc:`./core` (``geomesa-spark-core``) is an extension for Spark that takes +Next, the ``geomesa-spark-core`` module (see :doc:`./core`) is an extension for Spark that takes `GeoTools`_ ``Query`` objects as input and produces resilient distributed datasets -(``RDD``\ s) containing serialized versions of geometry objects. Multiple +(``RDD``\ s) containing serialized versions of SimpleFeatures. Multiple backends that target different types of feature stores are available, -including ones for GeoMesa Accumulo, other GeoTools ``DataStore``\ s, or files -readable by the :ref:`converters` library. +including ones for Accumulo, HBase, FileSystem, Kudu, files readable by the :ref:`converters` library, +and any generic GeoTools ``DataStore``\ s. -GeoMesa :doc:`./sparksql` (``geomesa-spark-sql``), in turn, stacks on GeoMesa Spark -Core to convert between ``RDD``\ s and ``DataFrame``\ s. GeoMesa SparkSQL pushes down +The ``geomesa-spark-sql`` module (see :doc:`./sparksql`) builds on top of the core module +to convert between ``RDD``\ s and ``DataFrame``\ s. GeoMesa SparkSQL pushes down filtering logic from SQL queries and converts them into GeoTools ``Query`` objects, which are then passed to the ``GeoMesaSpark`` object provided by GeoMesa Spark Core. -GeoMesa SparkSQL also provides a number of user-defined types and functions for -working with geometry objects. + +Finally, bindings are provided for integration with the Spark Python API. See :doc:`./pyspark` for details. .. image:: /user/_static/img/geomesa-spark-stack.png :align: center diff --git a/docs/user/spark/core.rst b/docs/user/spark/core.rst index b833fe84bf4c..b12337bdbd16 100644 --- a/docs/user/spark/core.rst +++ b/docs/user/spark/core.rst @@ -1,7 +1,7 @@ Spark Core ---------- -**geomesa-spark-core** is used to work directly with ``RDD``\ s of features +``geomesa-spark-core`` is used to work directly with ``RDD``\ s of features from GeoMesa and other geospatial data stores. Example @@ -36,20 +36,18 @@ against a GeoMesa data store: // ScalaSimpleFeature:4, ScalaSimpleFeature:5, ScalaSimpleFeature:6, // ScalaSimpleFeature:7, ScalaSimpleFeature:9) +.. _spark_core_config: + Configuration ^^^^^^^^^^^^^ -**geomesa-spark-core** provides an API for accessing geospatial data +``geomesa-spark-core`` provides an API for accessing geospatial data in Spark, by defining an interface called ``SpatialRDDProvider``. Different -implementations of this interface connect to GeoMesa Accumulo, generic -GeoTools-based ``DataStore``\ s, or data files in formats readable by the GeoMesa -converter library. These different providers are described in more detail -in :ref:`spark_core_usage` below. - -To use these libraries in Spark, the shaded JAR built by the -**geomesa-accumulo-spark-runtime** module (``geomesa-accumulo/geomesa-accumulo-spark-runtime`` -in the source distribution) contains all of the dependencies needed to run -the :ref:`accumulo_rdd_provider`. This shaded JAR can be passed (for example) +implementations of this interface connect to different input sources. These different +providers are described in more detail in :ref:`spark_core_usage` below. + +GeoMesa provides several JAR-with-dependencies to simplify setting up the Spark +classpath. To use these libraries in Spark, the appropriate shaded JAR can be passed (for example) to the ``spark-submit`` command via the ``--jars`` option: .. code-block:: bash @@ -59,7 +57,7 @@ to the ``spark-submit`` command via the ``--jars`` option: or passed to Spark via the appropriate mechanism in notebook servers such as Jupyter (see :doc:`jupyter`) or Zeppelin. -This shaded JAR should also provide the dependencies needed for the +The shaded JAR should also provide the dependencies needed for the :ref:`converter_rdd_provider` and :ref:`geotools_rdd_provider`, so these JARs may simply be added to ``--jars`` as well (though in the latter case additional JARs may be needed to implement the GeoTools data store accessed). @@ -70,8 +68,7 @@ Simple Feature Serialization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ To serialize ``RDD``\ s of ``SimpleFeature``\ s between nodes of a cluster, Spark -must be configured with a Kryo serialization registrator provided in -**geomesa-spark-core**. +must be configured with a Kryo serialization registrator provided in ``geomesa-spark-core``. .. note:: @@ -108,7 +105,7 @@ serializer provider. Usage ^^^^^ -The main point of entry for the functionality provided by **geomesa-spark-core** is the +The main point of entry for the functionality provided by ``geomesa-spark-core`` is the ``GeoMesaSpark`` object: .. code-block:: scala @@ -132,39 +129,6 @@ parameters passed as an argument, as shown in the Scala code below: // get the RDD, using the SparkContext configured as above val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) -.. _accumulo_rdd_provider: - -Accumulo RDD Provider -^^^^^^^^^^^^^^^^^^^^^ - -``AccumuloSpatialRDDProvider`` is provided by the ``geomesa-accumulo-spark`` module: - -.. code-block:: xml - - - org.locationtech.geomesa - geomesa-accumulo-spark_2.11 - // version, etc. - - -This provider generates and saves ``RDD``\ s of features stored in a GeoMesa -``AccumuloDataStore``. The configuration parameters passed to -``AccumuloSpatialRDDProvider`` are the same as those passed to -``AccumuloDataStoreFactory.createDataStore()`` or ``DataStoreFinder.getDataStore()``. -The feature to access in GeoMesa is passed as the type name of the query passed -to the ``rdd()`` method. For example, to load an ``RDD`` of features of type "gdelt" -from the "geomesa" Accumulo table: - -.. code-block:: scala - - val params = Map( - "accumulo.instance.id" -> "mycloud", - "accumulo.user" -> "user", - "accumulo.password" -> "password", - "accumulo.zookeepers" -> "zoo1,zoo2,zoo3", - "accumulo.catalog" -> "geomesa") - val query = new Query("gdelt") - val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) To save features, use the ``save()`` method: @@ -172,106 +136,6 @@ To save features, use the ``save()`` method: GeoMesaSpark(params).save(rdd, params, "gdelt") -.. _converter_rdd_provider: - -Converter RDD Provider -^^^^^^^^^^^^^^^^^^^^^^ - -``ConverterSpatialRDDProvider`` is provided by the ``geomesa-spark-converter`` module: - -.. code-block:: xml - - - org.locationtech.geomesa - geomesa-spark-converter_2.11 - // version, etc. - - -``ConverterSpatialRDDProvider`` reads features from one or more data files in formats -readable by the :ref:`converters` library, including delimited and fixed-width text, -Avro, JSON, and XML files. It takes the following configuration parameters: - - * ``geomesa.converter`` - the converter definition as a Typesafe Config string - * ``geomesa.converter.inputs`` - input file paths, comma-delimited - * ``geomesa.sft`` - the ``SimpleFeatureType``, as a spec string, configuration string, or environment lookup name - * ``geomesa.sft.name`` - (optional) the name of the ``SimpleFeatureType`` - -Consider the example data described in the :ref:`convert_example_usage` section of the -:ref:`converters` documentation. If the file ``example.csv`` contains the -example data, and ``example.conf`` contains the Typesafe configuration file for the -converter, the following Scala code can be used to load this data into an ``RDD``: - -.. code-block:: scala - - val exampleConf = ConfigFactory.load("example.conf").root().render() - val params = Map( - "geomesa.converter" -> exampleConf, - "geomesa.converter.inputs" -> "example.csv", - "geomesa.sft" -> "phrase:String,dtg:Date,geom:Point:srid=4326", - "geomesa.sft.name" -> "example") - val query = new Query("example") - val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) - -It is also possible to load the prepackaged converters for public data sources -(GDELT, GeoNames, etc.) via Maven or SBT. See :ref:`prepackaged_converters` for more -details. - -.. warning:: - - ``ConvertSpatialRDDProvider`` is read-only, and does not support writing features - to data files. - -.. _geotools_rdd_provider: - -GeoTools RDD Provider -^^^^^^^^^^^^^^^^^^^^^ - -``GeoToolsSpatialRDDProvider`` is provided by the ``geomesa-spark-geotools`` module: - -.. code-block:: xml - - - org.locationtech.geomesa - geomesa-spark-geotools_2.11 - // version, etc. - - -``GeoToolsSpatialRDDProvider`` generates and saves ``RDD``\ s of features stored in -a generic GeoTools ``DataStore``. The configuration parameters passed are the same as -those passed to ``DataStoreFinder.getDataStore()`` to create the data store of interest, -plus a required boolean parameter called "geotools" to indicate to the SPI to load -``GeoToolsSpatialRDDProvider``. For example, the `CSVDataStore`_ described in the -`GeoTools ContentDataStore tutorial`_ takes a single parameter called "file". To use -this data store with GeoMesa Spark, do the following: - -.. code-block:: scala - - val params = Map( - "geotools" -> "true", - "file" -> "locations.csv") - val query = new Query("locations") - val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) - -.. _GeoTools ContentDataStore tutorial: http://docs.geotools.org/latest/userguide/tutorial/datastore/index.html - -.. _CSVDataStore: http://docs.geotools.org/latest/userguide/tutorial/datastore/read.html - -The name of the feature type to access in the data store is passed as the type name of the -query passed to the ``rdd()`` method. In the example of the `CSVDataStore`_, this is the -basename of the filename passed as an argument. - -.. warning:: - - Do not use the GeoTools RDD provider with a GeoMesa Accumulo data store. The - :ref:`accumulo_rdd_provider` provides additional optimizations to improve performance - between Spark/SparkSQL and GeoMesa Accumulo data stores. - - If both the GeoTools and Accumulo RDD providers are available on the classpath, - the GeoTools provider will only be used if ``"geotools" -> "true"`` is included - as a parameter, and thus should be omitted with a GeoMesa Accumulo data store. - -If your data store supports it, use the ``save()`` method to save features: - -.. code-block:: scala +Note that some providers may be read-only. - GeoMesaSpark(params).save(rdd, params, "locations") +See :doc:`./providers` for details on specific provider implementations. diff --git a/docs/user/spark/index.rst b/docs/user/spark/index.rst index b31b5e1d25e2..772c667e2608 100644 --- a/docs/user/spark/index.rst +++ b/docs/user/spark/index.rst @@ -12,11 +12,11 @@ The current version of GeoMesa Spark supports Apache Spark |spark_version|. :maxdepth: 1 architecture - core spark_jts + core + providers sparksql sparksql_functions - accumulo_spark_runtime pyspark jupyter zeppelin diff --git a/docs/user/spark/providers.rst b/docs/user/spark/providers.rst new file mode 100644 index 000000000000..813978c807e2 --- /dev/null +++ b/docs/user/spark/providers.rst @@ -0,0 +1,173 @@ +.. _spatial_rdd_providers: + +Spatial RDD Providers +--------------------- + +.. _accumulo_rdd_provider: + +Accumulo RDD Provider +^^^^^^^^^^^^^^^^^^^^^ + +The ``AccumuloSpatialRDDProvider`` is a spatial RDD provider for Accumulo data stores. The core code is in +the ``geomesa-accumulo-spark`` module, and the shaded JAR-with-dependencies (which contains all the required +dependencies for execution) is available in the ``geomesa-accumulo-spark-runtime`` module. + +This provider can read from and write to a GeoMesa ``AccumuloDataStore``. The configuration parameters +are the same as those passed to ``DataStoreFinder.getDataStore()``. See :ref:`accumulo_parameters` for details. + +The feature type to access in GeoMesa is passed as the type name of the query passed +to the ``rdd()`` method. For example, to load an ``RDD`` of features of type ``gdelt`` +from the ``geomesa`` Accumulo table: + +.. code-block:: scala + + val params = Map( + "accumulo.instance.id" -> "mycloud", + "accumulo.user" -> "user", + "accumulo.password" -> "password", + "accumulo.zookeepers" -> "zoo1,zoo2,zoo3", + "accumulo.catalog" -> "geomesa") + val query = new Query("gdelt") + val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) + +.. _hbase_rdd_provider: + +HBase RDD Provider +^^^^^^^^^^^^^^^^^^ + +The ``HBaseSpatialRDDProvider`` is a spatial RDD provider for HBase data stores. The core code is in +the ``geomesa-hbase-spark`` module, and the shaded JAR-with-dependencies (which contains all the required +dependencies for execution) is available in the ``geomesa-hbase-spark-runtime`` module. + +This provider can read from and write to a GeoMesa ``HBaseDataStore``. The configuration parameters +are the same as those passed to ``DataStoreFinder.getDataStore()``. See :ref:`hbase_parameters` for details. + +.. note:: + + Connecting to HBase generally requires the ``hbase-site.xml`` file to be available on the Spark classpath. + This may be accomplished by specifying it with ``--jars``. For example: + + .. code-block:: bash + + $ spark-shell --jars file:///opt/geomesa/dist/spark/geomesa-hbase-spark-runtime_2.11-${VERSION}.jar,file:///usr/lib/hbase/conf/hbase-site.xml + + Alternatively, you may specify the zookeepers in the data store parameter map. However, this may not work + for every HBase setup. + + +The feature type to access in GeoMesa is passed as the type name of the query passed +to the ``rdd()`` method. For example, to load an ``RDD`` of features of type ``gdelt`` +from the ``geomesa`` HBase table: + +.. code-block:: scala + + val params = Map("hbase.zookeepers" -> "zoo1,zoo2,zoo3", "hbase.catalog" -> "geomesa") + val query = new Query("gdelt") + val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) + +.. _fsds_rdd_provider: + +FileSystem RDD Provider +^^^^^^^^^^^^^^^^^^^^^^^ + +The ``FileSystemRDDProvider`` is a spatial RDD provider for GeoMesa file system data stores. The core code is in +the ``geomesa-fs-spark`` module, and the shaded JAR-with-dependencies (which contains all the required +dependencies for execution) is available in the ``geomesa-fs-spark-runtime`` module. + +This provider can read from and write to a GeoMesa ``FileSystemDataStore``. The configuration parameters +are the same as those passed to ``DataStoreFinder.getDataStore()``. See :ref:`fsds_parameters` for details. + +The feature type to access in GeoMesa is passed as the type name of the query passed +to the ``rdd()`` method. For example, to load an ``RDD`` of features of type ``gdelt`` +from an s3 bucket: + +.. code-block:: scala + + val params = Map("fs.path" -> "s3a://mybucket/geomesa/datastore") + val query = new Query("gdelt") + val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) + +See :ref:`fsds_sparksql_example` for an example of using SparkSQL with the FileSystem data store. + +.. _converter_rdd_provider: + +Converter RDD Provider +^^^^^^^^^^^^^^^^^^^^^^ + +The ``ConverterSpatialRDDProvider`` is provided by the ``geomesa-spark-converter`` module. + +``ConverterSpatialRDDProvider`` reads features from one or more data files in formats +readable by the :ref:`converters` library, including delimited and fixed-width text, +Avro, JSON, and XML files. It takes the following configuration parameters: + + * ``geomesa.converter`` - the converter definition as a Typesafe Config string + * ``geomesa.converter.inputs`` - input file paths, comma-delimited + * ``geomesa.sft`` - the ``SimpleFeatureType``, as a spec string, configuration string, or environment lookup name + * ``geomesa.sft.name`` - (optional) the name of the ``SimpleFeatureType`` + +Consider the example data described in the :ref:`convert_example_usage` section of the +:ref:`converters` documentation. If the file ``example.csv`` contains the +example data, and ``example.conf`` contains the Typesafe configuration file for the +converter, the following Scala code can be used to load this data into an ``RDD``: + +.. code-block:: scala + + val exampleConf = ConfigFactory.load("example.conf").root().render() + val params = Map( + "geomesa.converter" -> exampleConf, + "geomesa.converter.inputs" -> "example.csv", + "geomesa.sft" -> "phrase:String,dtg:Date,geom:Point:srid=4326", + "geomesa.sft.name" -> "example") + val query = new Query("example") + val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) + +It is also possible to load the prepackaged converters for public data sources +(GDELT, GeoNames, etc.) via Maven or SBT. See :ref:`prepackaged_converters` for more +details. + +.. warning:: + + ``ConvertSpatialRDDProvider`` is read-only, and does not support writing features + to data files. + +.. _geotools_rdd_provider: + +GeoTools RDD Provider +^^^^^^^^^^^^^^^^^^^^^ + +``GeoToolsSpatialRDDProvider`` is provided by the ``geomesa-spark-geotools`` module. + +``GeoToolsSpatialRDDProvider`` generates and saves ``RDD``\ s of features stored in +a generic GeoTools ``DataStore``. The configuration parameters passed are the same as +those passed to ``DataStoreFinder.getDataStore()`` to create the data store of interest, +plus a required boolean parameter called "geotools" to indicate to the SPI to load +``GeoToolsSpatialRDDProvider``. For example, the `CSVDataStore`_ described in the +`GeoTools ContentDataStore tutorial`_ takes a single parameter called "file". To use +this data store with GeoMesa Spark, do the following: + +.. code-block:: scala + + val params = Map( + "geotools" -> "true", + "file" -> "locations.csv") + val query = new Query("locations") + val rdd = GeoMesaSpark(params).rdd(new Configuration(), sc, params, query) + +.. _GeoTools ContentDataStore tutorial: http://docs.geotools.org/latest/userguide/tutorial/datastore/index.html + +.. _CSVDataStore: http://docs.geotools.org/latest/userguide/tutorial/datastore/read.html + +The name of the feature type to access in the data store is passed as the type name of the +query passed to the ``rdd()`` method. In the example of the `CSVDataStore`_, this is the +basename of the filename passed as an argument. + +.. warning:: + + Do not use the GeoTools RDD provider with a GeoMesa data store that has a provider implementation. + The providers described above provide additional optimizations to improve read and write performance. + +If your data store supports it, use the ``save()`` method to save features: + +.. code-block:: scala + + GeoMesaSpark(params).save(rdd, params, "locations") diff --git a/docs/user/spark/pyspark.rst b/docs/user/spark/pyspark.rst index dc9514984eb1..87c914c7237d 100644 --- a/docs/user/spark/pyspark.rst +++ b/docs/user/spark/pyspark.rst @@ -1,7 +1,7 @@ GeoMesa PySpark --------------- -GeoMesa provides support for working with data stored in Accumulo using the Spark Python API. +GeoMesa provides integration with the Spark Python API for accessing data in GeoMesa data stores. Prerequisites ^^^^^^^^^^^^^ @@ -14,9 +14,9 @@ Installation ^^^^^^^^^^^^ The ``geomesa_pyspark`` package is not available for download. Build the artifact locally with the profile -``-Ppython``. Then install using ``pip`` or ``pip3`` as below. You will also need to put the -geomesa-accumulo-spark-runtime JAR in a convenient location. This JAR bundles together the client libraries -for GeoMesa Spark. +``-Ppython``. Then install using ``pip`` or ``pip3`` as below. You will also need an appropriate +``geomesa-spark-runtime`` JAR. We assume the use of Accumulo here, but you may alternatively use any of +the providers outlined in :ref:`spatial_rdd_providers`. .. code-block:: bash diff --git a/docs/user/spark/sparksql.rst b/docs/user/spark/sparksql.rst index f061cef8c54e..bae15985955d 100644 --- a/docs/user/spark/sparksql.rst +++ b/docs/user/spark/sparksql.rst @@ -67,32 +67,15 @@ via SparkSQL: Configuration ^^^^^^^^^^^^^ -Because GeoMesa SparkSQL stacks on top of the ``geomesa-spark-core`` module, -one or more of the ``SpatialRDDProvider`` implementations, as described in -:doc:`/user/spark/core`, must be included on the classpath. The shaded JAR built by the -**geomesa-accumulo-spark-runtime** module (``geomesa-accumulo/geomesa-accumulo-spark-runtime`` -in the source distribution) contains all of the dependencies needed to run -the :ref:`accumulo_rdd_provider` as well as **geomesa-spark-sql**. This shaded -JAR can be passed (for example) to the ``spark-submit`` command via the ``--jars`` -option: - -.. code-block:: bash - - --jars file://path/to/geomesa-accumulo-spark-runtime_2.11-$VERSION.jar -or passed to Spark via the appropriate mechanism in notebook servers such as -Jupyter (see :doc:`jupyter`) or Zeppelin. - -This shaded JAR should also provide the dependencies needed for the -:ref:`converter_rdd_provider` and :ref:`geotools_rdd_provider`, so these JARs -may simply be added to ``--jars`` as well (though in the latter -case additional JARs may be needed to implement the GeoTools data store accessed). +Because GeoMesa SparkSQL stacks on top of the ``geomesa-spark-core`` module, +one or more of the ``SpatialRDDProvider`` implementations must be included on the +classpath. See :ref:`spark_core_config` for details on setting up the Spark classpath. .. note:: - When using the :ref:`accumulo_rdd_provider` or :ref:`converter_rdd_provider` - with **geomesa-spark-sql**, it is not necessary to set up the Kryo serialization - described in :ref:`spark_sf_serialization`. However, this may be required when + In most cases, it is not necessary to set up the Kryo serialization described in + :ref:`spark_sf_serialization` when using SparkSQL. However, this may be required when using the :ref:`geotools_rdd_provider`. If you will be ``JOIN``-ing multiple ``DataFrame``\s together, it will be necessary From cbfef8a0eef40890d7d7cfa9b3c8c0efd59c4d76 Mon Sep 17 00:00:00 2001 From: Emilio Date: Thu, 10 May 2018 14:47:19 -0400 Subject: [PATCH 12/33] GEOMESA-2277 Docs - version compatibility (#1953) Signed-off-by: Emilio Lahr-Vivaz --- docs/user/accumulo/data_management.rst | 120 +++++++++++++++++++------ docs/user/cassandra/index.rst | 1 + docs/user/cassandra/index_config.rst | 59 ++++++++++++ docs/user/cli/export.rst | 2 + docs/user/cli/index.rst | 2 + docs/user/cli/ingest.rst | 2 + docs/user/datastores/data.rst | 39 ++++++++ docs/user/datastores/index.rst | 1 + docs/user/datastores/index_basics.rst | 14 +++ docs/user/hbase/index_config.rst | 63 +++++++++++++ docs/user/upgrade.rst | 74 ++++++++++++++- 11 files changed, 345 insertions(+), 32 deletions(-) create mode 100644 docs/user/cassandra/index_config.rst create mode 100644 docs/user/datastores/data.rst diff --git a/docs/user/accumulo/data_management.rst b/docs/user/accumulo/data_management.rst index a676343a9eb1..45d0f771bcef 100644 --- a/docs/user/accumulo/data_management.rst +++ b/docs/user/accumulo/data_management.rst @@ -78,34 +78,6 @@ Table sharing can be disabled by setting the user data ``geomesa.table.sharing`` See :ref:`set_sft_options` for more details on how to set user data values. -Moving and Migrating Data -------------------------- - -If you want an offline copy of your data, or you want to move data between networks, you can -export compressed Avro files containing your simple features. To do this using the command line -tools, use the export command with the ``format`` and ``gzip`` options: - -.. code-block:: bash - - $ geomesa-accumulo export -c myTable -f mySft --format avro --gzip 6 -o myFeatures.avro - -To re-import the data into another environment, you may use the ingest command. Because the Avro file -is self-describing, you do not need to specify any converter config or simple feature type definition: - -.. code-block:: bash - - $ geomesa-accumulo ingest -c myTable -f mySft myFeatures.avro - -If your data is too large for a single file, you may run multiple exports and use CQL -filters to separate your data. - -If you prefer to not use Avro files, you may do the same process with delimited text files: - -.. code-block:: bash - - $ geomesa-accumulo export -c myTable -f mySft --format tsv --gzip 6 -o myFeatures.tsv.gz - $ geomesa-accumulo ingest -c myTable -f mySft myFeatures.tsv.gz - .. _index_upgrades: Upgrading Existing Indices @@ -116,7 +88,8 @@ the index format for a given schema is fixed when it is first created. Updating will provide bug fixes and new features, but will not update existing data to new index formats. The exact version of an index used for each schema can be read from the ``SimpleFeatureType`` user data, -or by simple examining the name of the index tables created by GeoMesa. +or by simple examining the name of the index tables created by GeoMesa. See below for a description of +current index versions. Using the GeoMesa command line tools, you can add or update an index to a newer version using ``add-index``. For example, you could add the XZ3 index to replace the Z3 index for a feature type with non-point geometries. @@ -125,3 +98,92 @@ only populate features matching a CQL filter (e.g. the last month), or choose to data. The update is seamless, and clients can continue to query and ingest while it runs. See :ref:`add_index_command` for more details on the command line tools. + +.. _accumulo_index_versions: + +Accumulo Index Versions +----------------------- + +See :ref:`index_versioning` for an explanation of index versions. The following versions are available in Accumulo: + +.. tabs:: + + .. tab:: Z3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.1.0 Initial implementation + 2 1.2.1 Support for non-point geometries + + Support for shards + 3 1.2.5 Removed support for non-point geometries in favor of xz + + Removed redundant feature ID in row value to reduce size on disk + + Support for per-attribute visibility + 4 1.3.1 Support for table sharing + 5 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: Z2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.2.2 Initial implementation + 2 1.2.5 Removed support for non-point geometries in favor of xz + + Removed redundant feature ID in row value to reduce size on disk + + Support for per-attribute visibility + 3 1.3.1 Optimized deletes + 4 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: XZ3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.2.5 Initial implementation + ============= =============== ================================================================= + + .. tab:: XZ2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.2.5 Initial implementation + ============= =============== ================================================================= + + .. tab:: Attribute + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.0.0 Initial implementation + 2 1.1.0 Added secondary date index + 3 1.2.5 Removed redundant feature ID in row value to reduce size on disk + + Support for per-attribute visibility + 4 1.3.1 Added secondary Z index + 5 1.3.2 Support for shards + 6 2.0.0-m.1 Internal row layout change + 7 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: ID + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.0.0 Initial implementation + 2 1.2.5 Removed redundant feature ID in row value to reduce size on disk + + Support for per-attribute visibility + 3 2.0.0 Standardized index identifier to 'id' + ============= =============== ================================================================= + +Note that GeoMesa versions prior to 1.2.2 included a geohash index. That index has been replaced with +the Z indices and is no longer supported. diff --git a/docs/user/cassandra/index.rst b/docs/user/cassandra/index.rst index b316836b9572..dcc1f7edcc81 100755 --- a/docs/user/cassandra/index.rst +++ b/docs/user/cassandra/index.rst @@ -16,4 +16,5 @@ source distribution. geoserver commandline heatmaps + index_config runtime_config diff --git a/docs/user/cassandra/index_config.rst b/docs/user/cassandra/index_config.rst new file mode 100644 index 000000000000..34bb693d7fa4 --- /dev/null +++ b/docs/user/cassandra/index_config.rst @@ -0,0 +1,59 @@ +.. _cassandra_index_versions: + +Cassandra Index Versions +======================== + +See :ref:`index_versioning` for an explanation of index versions. The following versions are available in Cassandra: + +.. tabs:: + + .. tab:: Z3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.2.0 Initial implementation + 2 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: Z2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + 2 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: XZ3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= + + .. tab:: XZ2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= + + .. tab:: Attribute + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + 2 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: ID + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= diff --git a/docs/user/cli/export.rst b/docs/user/cli/export.rst index d325927d0433..8caf72c5e07b 100644 --- a/docs/user/cli/export.rst +++ b/docs/user/cli/export.rst @@ -56,6 +56,8 @@ See :ref:`cli_export` for a description of the arguments. Export features in a variety of formats. +See :ref:`data_migration` for details on how the export/import commands can be used to move data between clusters. + ======================== ========================================================= Argument Description ======================== ========================================================= diff --git a/docs/user/cli/index.rst b/docs/user/cli/index.rst index 1a098bd8ed96..f2623235cbbc 100644 --- a/docs/user/cli/index.rst +++ b/docs/user/cli/index.rst @@ -1,3 +1,5 @@ +.. _command_line_tools: + Command-Line Tools ================== diff --git a/docs/user/cli/ingest.rst b/docs/user/cli/ingest.rst index dde41a9c4b28..3b44090aee65 100644 --- a/docs/user/cli/ingest.rst +++ b/docs/user/cli/ingest.rst @@ -28,6 +28,8 @@ supports common input formats such as delimited text (TSV, CSV), fixed width fil The converter framework is extensible via Java SPI, to allow support for custom formats. See :ref:`converters` for more information on converters. +See :ref:`data_migration` for details on how the export/import commands can be used to move data between clusters. + ====================== ========================================================= Argument Description ====================== ========================================================= diff --git a/docs/user/datastores/data.rst b/docs/user/datastores/data.rst new file mode 100644 index 000000000000..c56beedacec3 --- /dev/null +++ b/docs/user/datastores/data.rst @@ -0,0 +1,39 @@ +.. _data_migration: + +Moving and Migrating Data +========================= + +If you want an offline copy of your data, or you want to move data between networks, you can +export compressed Avro files containing your simple features. + +.. note:: + + The following examples assume an Accumulo install. For other back-ends, the command + will vary slightly. See :ref:`command_line_tools` for more details. + +To do this using the command line tools, use the export command with the ``format`` and ``gzip`` options: + +.. code-block:: bash + + $ geomesa-accumulo export ... -f mySft --format avro --gzip 6 -o myFeatures.avro + +To re-import the data into another environment, you may use the ingest command. Because the Avro file +is self-describing, you do not need to specify any converter config or simple feature type definition: + +.. code-block:: bash + + $ geomesa-accumulo ingest ... -f mySft myFeatures.avro + +If your data is too large for a single file, you may run multiple exports and use CQL +filters to separate your data. + +If you prefer to not use Avro files, you may do the same process with delimited text files: + +.. code-block:: bash + + $ geomesa-accumulo export ... -f mySft --format tsv --gzip 6 -o myFeatures.tsv.gz + $ geomesa-accumulo ingest ... -f mySft myFeatures.tsv.gz + +If the schema does not already exist in the destination cluster, it will be created with the latest index formats +available in GeoMesa, which may perform better. You could use this technique to migrate data between tables +in a single cluster, as a way to benefit from indexing improvements. See :ref:`index_versioning` for more information. diff --git a/docs/user/datastores/index.rst b/docs/user/datastores/index.rst index 2212f3393e0a..611ed8843a47 100644 --- a/docs/user/datastores/index.rst +++ b/docs/user/datastores/index.rst @@ -18,6 +18,7 @@ about GeoMesa data stores. analytic_queries authorizations auditing + data reserved_words General information on the GeoMesa command-line tools are described in the next chapter: diff --git a/docs/user/datastores/index_basics.rst b/docs/user/datastores/index_basics.rst index 133672f95ca1..68f04acf8b7c 100644 --- a/docs/user/datastores/index_basics.rst +++ b/docs/user/datastores/index_basics.rst @@ -63,3 +63,17 @@ If you are using the GeoMesa ``SftBuilder``, you may call the overloaded attribu Setting the user data can be done in multiple ways. See :ref:`set_sft_options` for more details. To prioritize certain attributes over others, see :ref:`attribute_cardinality`. + +.. _index_versioning: + +Index Versioning +================ + +In order to ensure cross-compatibility, each index created by GeoMesa has a version number that identifies +the layout of data on disk, which is fixed at the time of creation. Updating GeoMesa versions +will provide bug fixes and new features, but will not update existing data to new index formats. + +The exact version of an index used for each schema can be read from the ``SimpleFeatureType`` user data, +or by simple examining the name of the index tables created by GeoMesa. The particular +version numbers vary across the different back-end implementations. See :ref:`accumulo_index_versions`, +:ref:`hbase_index_versions` and :ref:`cassandra_index_versions` for the differences between index versions. diff --git a/docs/user/hbase/index_config.rst b/docs/user/hbase/index_config.rst index 0793555566c1..060d9ee2fff9 100644 --- a/docs/user/hbase/index_config.rst +++ b/docs/user/hbase/index_config.rst @@ -22,3 +22,66 @@ are ``snappy``, ``lzo``, ``gz``, ``bzip2``, ``lz4`` or ``zstd``. geomesa-hbase create-schema --compression snappy ... For more information on how to set schema options, see :ref:`set_sft_options`. + +.. _hbase_index_versions: + +HBase Index Versions +==================== + +See :ref:`index_versioning` for an explanation of index versions. The following versions are available in HBase: + +.. tabs:: + + .. tab:: Z3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.1.0 Initial implementation + 2 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: Z2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + 2 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: XZ3 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= + + .. tab:: XZ2 + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= + + .. tab:: Attribute + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + 2 1.3.1 Added secondary Z index + 3 1.3.2 Support for shards + 4 2.0.0-m.1 Internal row layout change + 5 2.0.0 Uses fixed Z-curve implementation + ============= =============== ================================================================= + + .. tab:: ID + + ============= =============== ================================================================= + Index Version GeoMesa Version Notes + ============= =============== ================================================================= + 1 1.3.0 Initial implementation + ============= =============== ================================================================= diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst index c55b2df0daf4..ee74953f32fd 100644 --- a/docs/user/upgrade.rst +++ b/docs/user/upgrade.rst @@ -3,10 +3,78 @@ Upgrade Guide ============= -This section describes code and configuration changes required when upgrading GeoMesa versions. +This section contains general information on version upgrades, as well as version-specific changes that may +affect the end user. -Version 2.0.0 -+++++++++++++ +Compatibility Across Versions ++++++++++++++++++++++++++++++ + +Semantic Versioning +------------------- + +Starting with 2.0.0, GeoMesa is trying to adhere to `semantic versioning `__. Essentially, +releases are broken down into major, minor and patch versions. For a version number like 2.0.1, 2 is the major +version, 2.0 is the minor version, and 2.0.1 is the patch version. + +Major version updates contain breaking client API changes. Minor version updates contain new or updated functionality +that is backwards-compatible. Patch versions contain only backwards-compatible bug fixes. This delineation allows +users to gauge the potential impact of updating versions. + +.. warning:: + + Versions prior to 2.0.0 do not follow semantic versioning, and each release should be + considered a major version change. + +Compatibility +------------- + +Semantic versioning only makes guarantees about the public API of a project, however the GeoMesa public API is not +currently well defined. In addition, GeoMesa has several other compatibility vectors to consider: + +Data Compatibility +^^^^^^^^^^^^^^^^^^ + +Data compatibility refers to the ability to read and write data written with older versions of GeoMesa. GeoMesa +fully supports data written with version 1.2.2 or later, and mostly supports data written with 1.1.0 or later. + +Note that although later versions can read earlier data, the reverse is not necessarily true. Data written +with a newer client may not be readable by an older client. + +Data written with 1.2.1 or earlier can be migrated to a newer data format. See :ref:`index_upgrades` for details. +Note that this functionality is currently only implemented for Accumulo. + +Distributed Runtime Compatibility +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For data stores with a distributed component (e.g. Accumulo or HBase), distributed runtime compatibility refers +to the ability to write or query data with a client that is a different version than the distributed code. +Similarly, this also covers the ability to have different versions of the distributed code on different machines in +a single cluster. + +GeoMesa currently requires that all client and server JARs are the same minor version. + +Dependency Compatibility +^^^^^^^^^^^^^^^^^^^^^^^^ + +Dependency compatibility refers to the ability to update GeoMesa without updating other components +(e.g. Accumulo, HBase, Hadoop, Spark, GeoServer, etc). Generally, GeoMesa supports a range of dependency versions +(e.g. Accumulo 1.6 to 1.9). Spark versions are more tightly coupled, due to the use of private Spark APIs. + +Compatibility Matrix +-------------------- + ++---------------------+-------+-------+-------+ +| | Major | Minor | Patch | ++=====================+=======+=======+=======+ +| Data | Y | Y | Y | ++---------------------+-------+-------+-------+ +| Distributed runtime | N | N | Y | ++---------------------+-------+-------+-------+ +| Dependencies | N | N | Y | ++---------------------+-------+-------+-------+ + +Version 2.0.0 Upgrade Guide ++++++++++++++++++++++++++++ GeoTools 18 and GeoServer 2.12 ------------------------------ From bbf7ed8332d2eda0a15f7e057bc5db1f252df5b6 Mon Sep 17 00:00:00 2001 From: Austin Heyne Date: Fri, 11 May 2018 08:36:15 -0400 Subject: [PATCH 13/33] GEOMESA-2176 Create python conversion for JTS Geometry instances (#1936) Signed-off-by: Austin Heyne --- .../spark/sql/jts/AbstractGeometryUDT.scala | 2 ++ .../jts/util/JavaAbstractGeometryUDT.scala | 22 +++++++++++++ .../src/main/python/geomesa_pyspark/spark.py | 31 ++++++++++++++++++- .../geomesa_pyspark/src/main/python/setup.py | 2 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 geomesa-spark/geomesa-spark-jts/src/main/scala/org/locationtech/geomesa/spark/jts/util/JavaAbstractGeometryUDT.scala diff --git a/geomesa-spark/geomesa-spark-jts/src/main/scala/org/apache/spark/sql/jts/AbstractGeometryUDT.scala b/geomesa-spark/geomesa-spark-jts/src/main/scala/org/apache/spark/sql/jts/AbstractGeometryUDT.scala index a1650e1e73f2..3cd7fd5d304b 100644 --- a/geomesa-spark/geomesa-spark-jts/src/main/scala/org/apache/spark/sql/jts/AbstractGeometryUDT.scala +++ b/geomesa-spark/geomesa-spark-jts/src/main/scala/org/apache/spark/sql/jts/AbstractGeometryUDT.scala @@ -24,6 +24,8 @@ import scala.reflect._ abstract class AbstractGeometryUDT[T >: Null <: Geometry: ClassTag](override val simpleString: String) extends UserDefinedType[T] { + override def pyUDT: String = "geomesa_pyspark.spark.GeometryUDT" + override def serialize(obj: T): InternalRow = { new GenericInternalRow(Array[Any](WKBUtils.write(obj))) } diff --git a/geomesa-spark/geomesa-spark-jts/src/main/scala/org/locationtech/geomesa/spark/jts/util/JavaAbstractGeometryUDT.scala b/geomesa-spark/geomesa-spark-jts/src/main/scala/org/locationtech/geomesa/spark/jts/util/JavaAbstractGeometryUDT.scala new file mode 100644 index 000000000000..cc2f9771cb6a --- /dev/null +++ b/geomesa-spark/geomesa-spark-jts/src/main/scala/org/locationtech/geomesa/spark/jts/util/JavaAbstractGeometryUDT.scala @@ -0,0 +1,22 @@ +/*********************************************************************** + * Copyright (c) 2013-2018 Commonwealth Computer Research, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License, Version 2.0 + * which accompanies this distribution and is available at + * http://www.opensource.org/licenses/apache2.0.php. + ***********************************************************************/ + +package org.locationtech.geomesa.spark.jts.util + +import com.vividsolutions.jts.geom.Geometry + +class JavaAbstractGeometryUDT { + def deserializer(datum: Array[Byte]): Geometry = { + WKBUtils.read(datum) + } +} + +object JavaAbstractGeometryUDT { + val jagu = new JavaAbstractGeometryUDT() + def deserialize(datum: Array[Byte]): Geometry = jagu.deserializer(datum) +} diff --git a/geomesa-spark/geomesa_pyspark/src/main/python/geomesa_pyspark/spark.py b/geomesa-spark/geomesa_pyspark/src/main/python/geomesa_pyspark/spark.py index dc9969fc01cb..9ba621f6c560 100644 --- a/geomesa-spark/geomesa_pyspark/src/main/python/geomesa_pyspark/spark.py +++ b/geomesa-spark/geomesa_pyspark/src/main/python/geomesa_pyspark/spark.py @@ -1,5 +1,7 @@ from py4j.java_gateway import java_import -from pyspark import RDD +from pyspark import RDD, SparkContext +from pyspark.sql.types import UserDefinedType, StructField, BinaryType +from pyspark.sql import Row class GeoMesaSpark: @@ -49,3 +51,30 @@ def __jrdd(self, typename, ecql): def __pyrdd(self, jrdd): return RDD(self.jvm.SerDe.javaToPython(jrdd), self.sc) + + +class GeometryUDT(UserDefinedType): + jvm = None + + @classmethod + def sqlType(self): + return StructField("wkb", BinaryType(), False) + + @classmethod + def module(cls): + return 'geomesa_pyspark' + + @classmethod + def scalaUDT(cls): + return 'org.apache.spark.sql.jts.GeometryUDT' + + def serialize(self, obj): + if obj is None: + return None + return Row(obj.toBytes) + + def deserialize(self, datum): + if self.jvm is None: + self.jvm = SparkContext._active_spark_context._gateway.jvm + java_import(self.jvm, "org.locationtech.geomesa.spark.jts.util.JavaAbstractGeometryUDT") + return self.jvm.JavaAbstractGeometryUDT.deserialize(datum[0]) diff --git a/geomesa-spark/geomesa_pyspark/src/main/python/setup.py b/geomesa-spark/geomesa_pyspark/src/main/python/setup.py index 3957a2027efd..840be7a5d38f 100644 --- a/geomesa-spark/geomesa_pyspark/src/main/python/setup.py +++ b/geomesa-spark/geomesa_pyspark/src/main/python/setup.py @@ -5,5 +5,5 @@ version='${python.version}', url='http://www.geomesa.org', packages=find_packages(), - install_requires=['pytz','pyspark'] + install_requires=['pytz','pyspark>=2.1.1,<2.3.0'] ) From 89cfd80757c74cc6d331038b201828dcd53e6cba Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Fri, 11 May 2018 08:47:00 -0400 Subject: [PATCH 14/33] Updating release version Signed-off-by: Emilio Lahr-Vivaz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45966a3506ae..187dbeffe115 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ UTF-8 - 2.0.0 + 2.0.1 2.1.0-SNAPSHOT From f91d753aa556c154628849843affcc1d0920b098 Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Fri, 11 May 2018 08:54:17 -0400 Subject: [PATCH 15/33] [maven-release-plugin] prepare release geomesa_2.11-2.0.1 --- docs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-compute/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-datastore/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-dist/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-jobs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-native-api/pom.xml | 2 +- .../geomesa-accumulo-raster-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-raster/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-security/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-tools/pom.xml | 2 +- geomesa-accumulo/pom.xml | 2 +- geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml | 2 +- geomesa-archetypes/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-datastore/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-dist/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gt/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-jts/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-tools/pom.xml | 2 +- geomesa-arrow/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-datastore/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-dist/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-tools/pom.xml | 2 +- geomesa-bigtable/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-api/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml | 2 +- .../geomesa-blobstore-exif-handler/pom.xml | 2 +- .../geomesa-blobstore-gdal-handler/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-handlers/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-web/pom.xml | 2 +- geomesa-blobstore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-datastore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-dist/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-tools/pom.xml | 2 +- geomesa-cassandra/pom.xml | 2 +- geomesa-convert/geomesa-convert-all/pom.xml | 2 +- geomesa-convert/geomesa-convert-avro/pom.xml | 2 +- geomesa-convert/geomesa-convert-common/pom.xml | 2 +- geomesa-convert/geomesa-convert-fixedwidth/pom.xml | 2 +- geomesa-convert/geomesa-convert-jdbc/pom.xml | 2 +- geomesa-convert/geomesa-convert-json/pom.xml | 2 +- geomesa-convert/geomesa-convert-osm/pom.xml | 2 +- geomesa-convert/geomesa-convert-redis-cache/pom.xml | 2 +- geomesa-convert/geomesa-convert-scripting/pom.xml | 2 +- geomesa-convert/geomesa-convert-simplefeature/pom.xml | 2 +- geomesa-convert/geomesa-convert-text/pom.xml | 2 +- geomesa-convert/geomesa-convert-xml/pom.xml | 2 +- geomesa-convert/pom.xml | 2 +- geomesa-features/geomesa-feature-all/pom.xml | 2 +- geomesa-features/geomesa-feature-avro/pom.xml | 2 +- geomesa-features/geomesa-feature-common/pom.xml | 2 +- geomesa-features/geomesa-feature-kryo/pom.xml | 2 +- geomesa-features/geomesa-feature-nio/pom.xml | 2 +- geomesa-features/pom.xml | 2 +- geomesa-filter/pom.xml | 2 +- geomesa-fs/geomesa-fs-datastore/pom.xml | 2 +- geomesa-fs/geomesa-fs-dist/pom.xml | 2 +- geomesa-fs/geomesa-fs-gs-plugin/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark-runtime/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-common/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/pom.xml | 2 +- geomesa-fs/geomesa-fs-tools/pom.xml | 2 +- geomesa-fs/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-api/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-rest/pom.xml | 2 +- geomesa-geojson/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-datastore/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-dist/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-jobs/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-native-api/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-tools/pom.xml | 2 +- geomesa-hbase/pom.xml | 2 +- geomesa-index-api/pom.xml | 2 +- geomesa-jobs/pom.xml | 2 +- geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml | 2 +- geomesa-jupyter/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-datastore/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-dist/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-tools/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-utils/pom.xml | 2 +- geomesa-kafka/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-datastore/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-dist/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-tools/pom.xml | 2 +- geomesa-lambda/pom.xml | 2 +- geomesa-memory/geomesa-cqengine-datastore/pom.xml | 2 +- geomesa-memory/geomesa-cqengine/pom.xml | 2 +- geomesa-memory/pom.xml | 2 +- geomesa-metrics/pom.xml | 2 +- geomesa-native-api/pom.xml | 2 +- geomesa-process/geomesa-process-vector/pom.xml | 2 +- geomesa-process/geomesa-process-wps/pom.xml | 2 +- geomesa-process/pom.xml | 2 +- geomesa-security/pom.xml | 2 +- geomesa-spark/geomesa-spark-converter/pom.xml | 2 +- geomesa-spark/geomesa-spark-core/pom.xml | 2 +- geomesa-spark/geomesa-spark-geotools/pom.xml | 2 +- geomesa-spark/geomesa-spark-jts/pom.xml | 2 +- geomesa-spark/geomesa-spark-sql/pom.xml | 2 +- geomesa-spark/geomesa_pyspark/pom.xml | 2 +- geomesa-spark/pom.xml | 2 +- geomesa-stream/geomesa-stream-api/pom.xml | 2 +- geomesa-stream/geomesa-stream-datastore/pom.xml | 2 +- geomesa-stream/geomesa-stream-generic/pom.xml | 2 +- geomesa-stream/geomesa-stream-gs-plugin/pom.xml | 2 +- geomesa-stream/pom.xml | 2 +- geomesa-test/pom.xml | 2 +- geomesa-tools/pom.xml | 2 +- geomesa-utils/pom.xml | 2 +- geomesa-web/geomesa-web-core/pom.xml | 2 +- geomesa-web/geomesa-web-data/pom.xml | 2 +- geomesa-web/geomesa-web-install/pom.xml | 2 +- geomesa-web/geomesa-web-stats/pom.xml | 2 +- geomesa-web/pom.xml | 2 +- geomesa-z3/pom.xml | 2 +- geomesa-zk-utils/pom.xml | 2 +- pom.xml | 4 ++-- 139 files changed, 140 insertions(+), 140 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index de05593a4f20..92d9ca8b167c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml index 0de51b759855..b8192bc6709d 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml @@ -11,7 +11,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index a7b85aee037c..d016bbd1d7c4 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -13,7 +13,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 geomesa-accumulo-datastore_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index bc459b38a434..278d358382af 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml index 92eeb637d554..7859c1ff4f4a 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 geomesa-accumulo-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index a6abba03d125..cb882bb581e1 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index bcebbe20d242..4367ecedcad6 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml index 1c358c3fd206..7531da7a4f0e 100644 --- a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml index 3ceaa9c84b3b..83440ac4420e 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 geomesa-accumulo-raster-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml index 1a7325d7e283..24fac1725211 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-security/pom.xml b/geomesa-accumulo/geomesa-accumulo-security/pom.xml index d29328d4b9ab..0a4e084eeac8 100644 --- a/geomesa-accumulo/geomesa-accumulo-security/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-security/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml index fe4e3706bdd1..931ce0ee5223 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index 6eba41852e13..0f1df9fb2c0f 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml index 3b82dbd09e98..d8ade02e83d8 100644 --- a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index 76c7ced9047a..f34134c9a950 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index 362db9a79c19..88538e709e49 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 928cb3d4cf40..3101a2869765 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -3,7 +3,7 @@ geomesa-archetypes_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index f09450793a60..ed0eba0da855 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 geomesa-archetypes_2.11 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index ce0fe754d9a2..7c06a40bc38a 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index 0e125063703c..cee33589364d 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml index f161b3d0cf45..62b49cc9d282 100644 --- a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index 92f7aa5f8457..ff608e2a3723 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index 2287e3a08964..fb41dc52c98c 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -4,7 +4,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index 00bd8685f275..79f12ef84154 100644 --- a/geomesa-arrow/geomesa-arrow-tools/pom.xml +++ b/geomesa-arrow/geomesa-arrow-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index 0a2174636bb9..f649748dfda7 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml index ad07ed1b7f07..d8c2ec1ecd46 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-bigtable_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml index b658e0e678e2..db3bd6bcbf70 100644 --- a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml index fef0cfaaa0ca..1348676681f3 100644 --- a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml index 54a3c2fafc00..e77d2402928f 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml index bfb7d8919bda..f99ba024e3c9 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml index 7b1200f52287..809e614f8dd9 100644 --- a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-bigtable/pom.xml b/geomesa-bigtable/pom.xml index fbe59ad37010..88c5058a283f 100644 --- a/geomesa-bigtable/pom.xml +++ b/geomesa-bigtable/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml index fdff553ac6e4..7fc1159dcf43 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-api/pom.xml b/geomesa-blobstore/geomesa-blobstore-api/pom.xml index fba7cc9ee8c9..7306aab9bcdd 100644 --- a/geomesa-blobstore/geomesa-blobstore-api/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-api/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml index 2710caf99aa6..5ce6fa1ab1bd 100644 --- a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml index bf327adbf22f..9ae097f28065 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml index e3f1bee2ed8a..b8fcbe5abdc2 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml index 9d45da690f3f..19046008a6e0 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-web/pom.xml b/geomesa-blobstore/geomesa-blobstore-web/pom.xml index dd85f65ff2d3..5b07ba325acc 100644 --- a/geomesa-blobstore/geomesa-blobstore-web/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-web/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-blobstore/pom.xml b/geomesa-blobstore/pom.xml index 0d5476e5ba9a..426de87feb71 100644 --- a/geomesa-blobstore/pom.xml +++ b/geomesa-blobstore/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index 97cdea414c80..35c841c84ef9 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-cassandra_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index 11c36e0c15df..aaf7d9db0271 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml index 5c03d098b5a2..2360144f714a 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index 67674f725e1b..e410b46a20ea 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index f33102e4f776..e091c1260318 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 88fb3e2b7c18..762532abb2fa 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index 4fda8feded6e..3d88c0f1be0f 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index 9815b251dd0f..c532125fa328 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index 02778c65b1a4..8c6e5170d86e 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index f28b936b9ab7..8a4122e5fdff 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index 3afd12bac10c..f57f8b898139 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/pom.xml b/geomesa-convert/geomesa-convert-osm/pom.xml index 6d46c4732d63..6a03387daa37 100644 --- a/geomesa-convert/geomesa-convert-osm/pom.xml +++ b/geomesa-convert/geomesa-convert-osm/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-convert_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-redis-cache/pom.xml b/geomesa-convert/geomesa-convert-redis-cache/pom.xml index 1dae3d93f0a7..80ea00bc4a20 100644 --- a/geomesa-convert/geomesa-convert-redis-cache/pom.xml +++ b/geomesa-convert/geomesa-convert-redis-cache/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-scripting/pom.xml b/geomesa-convert/geomesa-convert-scripting/pom.xml index 192924780cbc..5d178fc539c3 100644 --- a/geomesa-convert/geomesa-convert-scripting/pom.xml +++ b/geomesa-convert/geomesa-convert-scripting/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 729c6ba0719e..47a9edeb3fbf 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index 7e5a74bf72fa..f22a0fe25944 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index 54215c4f9a6e..844074bc97c2 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index e3c6e61d1f65..e2e6c43db784 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 7c623bd75952..17a1bc885f58 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index a63ab5f5a186..06a9c12ea52b 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index 78a4435dc016..ad3a7221acf0 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index 82fcba8ea5f7..d08a8bf2d005 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/geomesa-feature-nio/pom.xml b/geomesa-features/geomesa-feature-nio/pom.xml index 2847c459b611..cea8ea47115e 100644 --- a/geomesa-features/geomesa-feature-nio/pom.xml +++ b/geomesa-features/geomesa-feature-nio/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index 78fe704a611d..dbd1aecd5551 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index c671428187b3..34ee5a5322f3 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index 41365be09cf8..678bcd75c085 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index 1a2054311cf0..d3d78fbbd8b0 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-fs_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml index 6545bc51b9ce..c1b34cd4b76f 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml index 67d3f0ba54a7..143408773bf2 100644 --- a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml +++ b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index 67bbfcf12c82..a4c2493a7758 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml index 293e86f01c46..086bdc365c1a 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml index f0cf953778c1..2b31a2efb748 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml index ae680ec26291..0f1a55871e13 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml index d490ab782720..81b8567660dc 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml index 8290393f1964..84a668ccf964 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index fef33b2ffcaa..5912c70ab066 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index b42a54fed5da..81f092c39597 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index b268af21d26d..ce59e4f51cf0 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-api/pom.xml b/geomesa-geojson/geomesa-geojson-api/pom.xml index c0075df0c217..009829f81bb6 100644 --- a/geomesa-geojson/geomesa-geojson-api/pom.xml +++ b/geomesa-geojson/geomesa-geojson-api/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml index c4089e408cc9..90944af57365 100644 --- a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml +++ b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-rest/pom.xml b/geomesa-geojson/geomesa-geojson-rest/pom.xml index ff195d1c2c9d..e7e71234b23c 100644 --- a/geomesa-geojson/geomesa-geojson-rest/pom.xml +++ b/geomesa-geojson/geomesa-geojson-rest/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-geojson/pom.xml b/geomesa-geojson/pom.xml index 946ace024c3e..0bba0b186098 100644 --- a/geomesa-geojson/pom.xml +++ b/geomesa-geojson/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index 0c24ffc348d3..1a159466a516 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index 01d35f1b23a2..991796864001 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml index 935a20b4c5e5..8127e6078132 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1-SNAPSHOT + 2.0.1 geomesa-hbase-distributed-runtime_2.11 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index 41e32e89e2f1..5c923dceb307 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-hbase/geomesa-hbase-jobs/pom.xml b/geomesa-hbase/geomesa-hbase-jobs/pom.xml index 2700db1eddc0..aa44cb0d2c44 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/pom.xml +++ b/geomesa-hbase/geomesa-hbase-jobs/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-native-api/pom.xml b/geomesa-hbase/geomesa-hbase-native-api/pom.xml index e4568385344b..d9706dfc9f02 100644 --- a/geomesa-hbase/geomesa-hbase-native-api/pom.xml +++ b/geomesa-hbase/geomesa-hbase-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml index 8c3da8136824..faba3221f293 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index 860c21fff4e2..472585466326 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index 233b3ab68010..1c21cfa044e9 100644 --- a/geomesa-hbase/geomesa-hbase-tools/pom.xml +++ b/geomesa-hbase/geomesa-hbase-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index 6abd3aab7219..b2172690ce40 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index d67147cb0f64..3c076e368675 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index 865d8b838b78..b12446232095 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml index bd5c41d9044c..b927b32e69a5 100644 --- a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -3,7 +3,7 @@ geomesa-jupyter_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-jupyter/pom.xml b/geomesa-jupyter/pom.xml index 3db70c0cc0d5..1d27b2cfcabb 100644 --- a/geomesa-jupyter/pom.xml +++ b/geomesa-jupyter/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index ad0813a5580b..52dc00abe270 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index bf982309942c..c36bc49e4c81 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml index 6be2fd47829d..279f15ccff7f 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index 72d879583abc..7c7bf74d6d52 100644 --- a/geomesa-kafka/geomesa-kafka-tools/pom.xml +++ b/geomesa-kafka/geomesa-kafka-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 3d44a7050650..7595e90956ad 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index b0c60b59799a..cd777cd4ed0b 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index 1c347243aee4..756bc07d2fb6 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/pom.xml +++ b/geomesa-lambda/geomesa-lambda-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1-SNAPSHOT + 2.0.1 geomesa-lambda-datastore_2.11 diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index 807af7f16f9a..9a2065be014c 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 pom diff --git a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml index 800cb4d40a13..b373cf3cec25 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-lambda/geomesa-lambda-tools/pom.xml b/geomesa-lambda/geomesa-lambda-tools/pom.xml index e2f8294d90ea..56b990567131 100644 --- a/geomesa-lambda/geomesa-lambda-tools/pom.xml +++ b/geomesa-lambda/geomesa-lambda-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index bff1758e2518..fcefe0092ee5 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index 7b0480d9e79f..c9651dbe5c64 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index b32a5336322c..99a78e2f6b4b 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index 6281c77b9190..664028c7588d 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index 414145b677b6..2cb75d96d652 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-native-api/pom.xml b/geomesa-native-api/pom.xml index 230d4fea7dfb..0135d1ef74d5 100644 --- a/geomesa-native-api/pom.xml +++ b/geomesa-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index cd2b304f4ca9..5a6d07b7ab4b 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index a142ccc08946..40f5c4e9b6fa 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index 81bbcfbb5b68..8fede3884ffc 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index bef6aaba0eaf..c802fcf3a4de 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index 22b59c470b37..5e3fef2448da 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index 7499945f44c6..5b73f8542ef9 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa-spark-geotools/pom.xml b/geomesa-spark/geomesa-spark-geotools/pom.xml index a39c9a662c02..d3ce0fd18591 100644 --- a/geomesa-spark/geomesa-spark-geotools/pom.xml +++ b/geomesa-spark/geomesa-spark-geotools/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index 7c35d5e681cb..3332fc820846 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index b31d11d0a468..9b4cdd9e479c 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index dd37fc3272d8..215472880c98 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index 252326604183..e67760f07bf9 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-stream/geomesa-stream-api/pom.xml b/geomesa-stream/geomesa-stream-api/pom.xml index c23eb93e0b39..81d2c4856805 100644 --- a/geomesa-stream/geomesa-stream-api/pom.xml +++ b/geomesa-stream/geomesa-stream-api/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-stream/geomesa-stream-datastore/pom.xml b/geomesa-stream/geomesa-stream-datastore/pom.xml index f0e81a121efd..4206fb241758 100644 --- a/geomesa-stream/geomesa-stream-datastore/pom.xml +++ b/geomesa-stream/geomesa-stream-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-stream/geomesa-stream-generic/pom.xml b/geomesa-stream/geomesa-stream-generic/pom.xml index 77bd25aed6ca..4a385403cc2f 100644 --- a/geomesa-stream/geomesa-stream-generic/pom.xml +++ b/geomesa-stream/geomesa-stream-generic/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml index 54f26fb6bc2a..2dff0429e850 100644 --- a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml +++ b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1-SNAPSHOT + 2.0.1 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-stream/pom.xml b/geomesa-stream/pom.xml index 5ce730dff6ef..b5258a0f92da 100644 --- a/geomesa-stream/pom.xml +++ b/geomesa-stream/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-test/pom.xml b/geomesa-test/pom.xml index 31773e918cbc..29de70f05050 100644 --- a/geomesa-test/pom.xml +++ b/geomesa-test/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index 81dc9c433bde..e8a270e39af4 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-utils/pom.xml b/geomesa-utils/pom.xml index 99762e9044f5..035f70205578 100644 --- a/geomesa-utils/pom.xml +++ b/geomesa-utils/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-web/geomesa-web-core/pom.xml b/geomesa-web/geomesa-web-core/pom.xml index a56470a10b1b..0dd4f1215647 100644 --- a/geomesa-web/geomesa-web-core/pom.xml +++ b/geomesa-web/geomesa-web-core/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-web/geomesa-web-data/pom.xml b/geomesa-web/geomesa-web-data/pom.xml index 72ad06b28f9e..d125dd0250a7 100644 --- a/geomesa-web/geomesa-web-data/pom.xml +++ b/geomesa-web/geomesa-web-data/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-web/geomesa-web-install/pom.xml b/geomesa-web/geomesa-web-install/pom.xml index 0530a3e06df7..8bc5aaae61b5 100644 --- a/geomesa-web/geomesa-web-install/pom.xml +++ b/geomesa-web/geomesa-web-install/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-web/geomesa-web-stats/pom.xml b/geomesa-web/geomesa-web-stats/pom.xml index 2ff5785b8c76..6e1ec2b55880 100644 --- a/geomesa-web/geomesa-web-stats/pom.xml +++ b/geomesa-web/geomesa-web-stats/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-web/pom.xml b/geomesa-web/pom.xml index 9d53453b0e68..e69ad7b5d729 100644 --- a/geomesa-web/pom.xml +++ b/geomesa-web/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index d08be7f01c19..db8dee9cf866 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/geomesa-zk-utils/pom.xml b/geomesa-zk-utils/pom.xml index bf71b8fbfe1d..4897ab90623e 100644 --- a/geomesa-zk-utils/pom.xml +++ b/geomesa-zk-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1-SNAPSHOT + 2.0.1 4.0.0 diff --git a/pom.xml b/pom.xml index 187dbeffe115..f137a6bb76f4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.locationtech.geomesa geomesa_2.11 pom - 2.0.1-SNAPSHOT + 2.0.1 @@ -2951,7 +2951,7 @@ scm:git:git@github.com:locationtech/geomesa.git scm:git:git@github.com:locationtech/geomesa.git https://github.com/locationtech/geomesa - HEAD + geomesa_2.11-2.0.1 From 62a37af68d171d5b584845202194cb23a40ac89a Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Fri, 11 May 2018 08:54:23 -0400 Subject: [PATCH 16/33] [maven-release-plugin] prepare for next development iteration --- docs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-compute/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-datastore/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-dist/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-jobs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-native-api/pom.xml | 2 +- .../geomesa-accumulo-raster-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-raster/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-security/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-tools/pom.xml | 2 +- geomesa-accumulo/pom.xml | 2 +- geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml | 2 +- geomesa-archetypes/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-datastore/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-dist/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gt/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-jts/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-tools/pom.xml | 2 +- geomesa-arrow/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-datastore/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-dist/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-tools/pom.xml | 2 +- geomesa-bigtable/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-api/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml | 2 +- .../geomesa-blobstore-exif-handler/pom.xml | 2 +- .../geomesa-blobstore-gdal-handler/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-handlers/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-web/pom.xml | 2 +- geomesa-blobstore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-datastore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-dist/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-tools/pom.xml | 2 +- geomesa-cassandra/pom.xml | 2 +- geomesa-convert/geomesa-convert-all/pom.xml | 2 +- geomesa-convert/geomesa-convert-avro/pom.xml | 2 +- geomesa-convert/geomesa-convert-common/pom.xml | 2 +- geomesa-convert/geomesa-convert-fixedwidth/pom.xml | 2 +- geomesa-convert/geomesa-convert-jdbc/pom.xml | 2 +- geomesa-convert/geomesa-convert-json/pom.xml | 2 +- geomesa-convert/geomesa-convert-osm/pom.xml | 2 +- geomesa-convert/geomesa-convert-redis-cache/pom.xml | 2 +- geomesa-convert/geomesa-convert-scripting/pom.xml | 2 +- geomesa-convert/geomesa-convert-simplefeature/pom.xml | 2 +- geomesa-convert/geomesa-convert-text/pom.xml | 2 +- geomesa-convert/geomesa-convert-xml/pom.xml | 2 +- geomesa-convert/pom.xml | 2 +- geomesa-features/geomesa-feature-all/pom.xml | 2 +- geomesa-features/geomesa-feature-avro/pom.xml | 2 +- geomesa-features/geomesa-feature-common/pom.xml | 2 +- geomesa-features/geomesa-feature-kryo/pom.xml | 2 +- geomesa-features/geomesa-feature-nio/pom.xml | 2 +- geomesa-features/pom.xml | 2 +- geomesa-filter/pom.xml | 2 +- geomesa-fs/geomesa-fs-datastore/pom.xml | 2 +- geomesa-fs/geomesa-fs-dist/pom.xml | 2 +- geomesa-fs/geomesa-fs-gs-plugin/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark-runtime/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-common/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/pom.xml | 2 +- geomesa-fs/geomesa-fs-tools/pom.xml | 2 +- geomesa-fs/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-api/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-rest/pom.xml | 2 +- geomesa-geojson/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-datastore/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-dist/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-jobs/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-native-api/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-tools/pom.xml | 2 +- geomesa-hbase/pom.xml | 2 +- geomesa-index-api/pom.xml | 2 +- geomesa-jobs/pom.xml | 2 +- geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml | 2 +- geomesa-jupyter/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-datastore/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-dist/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-tools/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-utils/pom.xml | 2 +- geomesa-kafka/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-datastore/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-dist/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-tools/pom.xml | 2 +- geomesa-lambda/pom.xml | 2 +- geomesa-memory/geomesa-cqengine-datastore/pom.xml | 2 +- geomesa-memory/geomesa-cqengine/pom.xml | 2 +- geomesa-memory/pom.xml | 2 +- geomesa-metrics/pom.xml | 2 +- geomesa-native-api/pom.xml | 2 +- geomesa-process/geomesa-process-vector/pom.xml | 2 +- geomesa-process/geomesa-process-wps/pom.xml | 2 +- geomesa-process/pom.xml | 2 +- geomesa-security/pom.xml | 2 +- geomesa-spark/geomesa-spark-converter/pom.xml | 2 +- geomesa-spark/geomesa-spark-core/pom.xml | 2 +- geomesa-spark/geomesa-spark-geotools/pom.xml | 2 +- geomesa-spark/geomesa-spark-jts/pom.xml | 2 +- geomesa-spark/geomesa-spark-sql/pom.xml | 2 +- geomesa-spark/geomesa_pyspark/pom.xml | 2 +- geomesa-spark/pom.xml | 2 +- geomesa-stream/geomesa-stream-api/pom.xml | 2 +- geomesa-stream/geomesa-stream-datastore/pom.xml | 2 +- geomesa-stream/geomesa-stream-generic/pom.xml | 2 +- geomesa-stream/geomesa-stream-gs-plugin/pom.xml | 2 +- geomesa-stream/pom.xml | 2 +- geomesa-test/pom.xml | 2 +- geomesa-tools/pom.xml | 2 +- geomesa-utils/pom.xml | 2 +- geomesa-web/geomesa-web-core/pom.xml | 2 +- geomesa-web/geomesa-web-data/pom.xml | 2 +- geomesa-web/geomesa-web-install/pom.xml | 2 +- geomesa-web/geomesa-web-stats/pom.xml | 2 +- geomesa-web/pom.xml | 2 +- geomesa-z3/pom.xml | 2 +- geomesa-zk-utils/pom.xml | 2 +- pom.xml | 4 ++-- 139 files changed, 140 insertions(+), 140 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 92d9ca8b167c..bf11f47728f9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml index b8192bc6709d..2e68dea8a5d4 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml @@ -11,7 +11,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index d016bbd1d7c4..c7f8fc38221c 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -13,7 +13,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT geomesa-accumulo-datastore_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index 278d358382af..d6db2a8982b2 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml index 7859c1ff4f4a..4c2f79ef0a0f 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT geomesa-accumulo-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index cb882bb581e1..aa66a2a29324 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index 4367ecedcad6..f652b7404a11 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml index 7531da7a4f0e..10b75c971e62 100644 --- a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml index 83440ac4420e..8f32c7a70d2e 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT geomesa-accumulo-raster-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml index 24fac1725211..5816ed2f7729 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-security/pom.xml b/geomesa-accumulo/geomesa-accumulo-security/pom.xml index 0a4e084eeac8..bc63bd41b6f3 100644 --- a/geomesa-accumulo/geomesa-accumulo-security/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-security/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml index 931ce0ee5223..b2e79e9daf32 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index 0f1df9fb2c0f..d92c3425b93a 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml index d8ade02e83d8..b8619efdc999 100644 --- a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index f34134c9a950..df7cb7cf2115 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index 88538e709e49..80f21d33ac32 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 3101a2869765..19698bad6bea 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -3,7 +3,7 @@ geomesa-archetypes_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index ed0eba0da855..b20ed002c361 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT geomesa-archetypes_2.11 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index 7c06a40bc38a..da1162830b1a 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index cee33589364d..23f51253b317 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml index 62b49cc9d282..edb6fe04ddaa 100644 --- a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index ff608e2a3723..b77e1a7fe311 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index fb41dc52c98c..8fae32193099 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -4,7 +4,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index 79f12ef84154..2cbf83d95b62 100644 --- a/geomesa-arrow/geomesa-arrow-tools/pom.xml +++ b/geomesa-arrow/geomesa-arrow-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index f649748dfda7..bb1dbef8aa54 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml index d8c2ec1ecd46..586a14bd7912 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-bigtable_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml index db3bd6bcbf70..7a056629ec90 100644 --- a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml index 1348676681f3..41cbc71914b0 100644 --- a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml index e77d2402928f..fbf92fba33c1 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml index f99ba024e3c9..4d9f5f6eea75 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml index 809e614f8dd9..47af158155ad 100644 --- a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-bigtable/pom.xml b/geomesa-bigtable/pom.xml index 88c5058a283f..f4c7c90783ce 100644 --- a/geomesa-bigtable/pom.xml +++ b/geomesa-bigtable/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml index 7fc1159dcf43..154913bea33f 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-api/pom.xml b/geomesa-blobstore/geomesa-blobstore-api/pom.xml index 7306aab9bcdd..1eb668e95002 100644 --- a/geomesa-blobstore/geomesa-blobstore-api/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-api/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml index 5ce6fa1ab1bd..2c8b96bd310e 100644 --- a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml index 9ae097f28065..04d26c177f80 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml index b8fcbe5abdc2..0b3f41931363 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml index 19046008a6e0..083521707f9a 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-web/pom.xml b/geomesa-blobstore/geomesa-blobstore-web/pom.xml index 5b07ba325acc..da20e5be6f5c 100644 --- a/geomesa-blobstore/geomesa-blobstore-web/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-web/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-blobstore/pom.xml b/geomesa-blobstore/pom.xml index 426de87feb71..a91ad2be4552 100644 --- a/geomesa-blobstore/pom.xml +++ b/geomesa-blobstore/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index 35c841c84ef9..d5b43f5b8117 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-cassandra_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index aaf7d9db0271..e645222394df 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml index 2360144f714a..0ed93c5f91d2 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index e410b46a20ea..a4e9035b4793 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index e091c1260318..043d73fb148a 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 762532abb2fa..68f6faab30ca 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index 3d88c0f1be0f..41a8c410e74f 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index c532125fa328..e82775f005c0 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index 8c6e5170d86e..283c810d51ad 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index 8a4122e5fdff..f6b87ecdc744 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index f57f8b898139..200c1612ff83 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/pom.xml b/geomesa-convert/geomesa-convert-osm/pom.xml index 6a03387daa37..911b024e9a87 100644 --- a/geomesa-convert/geomesa-convert-osm/pom.xml +++ b/geomesa-convert/geomesa-convert-osm/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-convert_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-redis-cache/pom.xml b/geomesa-convert/geomesa-convert-redis-cache/pom.xml index 80ea00bc4a20..bed5b291b63a 100644 --- a/geomesa-convert/geomesa-convert-redis-cache/pom.xml +++ b/geomesa-convert/geomesa-convert-redis-cache/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-scripting/pom.xml b/geomesa-convert/geomesa-convert-scripting/pom.xml index 5d178fc539c3..67b863448706 100644 --- a/geomesa-convert/geomesa-convert-scripting/pom.xml +++ b/geomesa-convert/geomesa-convert-scripting/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 47a9edeb3fbf..68dd365e2902 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index f22a0fe25944..696178ddc057 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index 844074bc97c2..cad9b9dcdd19 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index e2e6c43db784..dc850e0943f6 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 17a1bc885f58..2f8023d9a371 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index 06a9c12ea52b..6a4a2af01989 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index ad3a7221acf0..e248b41fa037 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index d08a8bf2d005..34997c26e462 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-nio/pom.xml b/geomesa-features/geomesa-feature-nio/pom.xml index cea8ea47115e..fb1c54b58396 100644 --- a/geomesa-features/geomesa-feature-nio/pom.xml +++ b/geomesa-features/geomesa-feature-nio/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index dbd1aecd5551..d72b030b051f 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index 34ee5a5322f3..27d286fdfbd9 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index 678bcd75c085..16e62f585466 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index d3d78fbbd8b0..8cf5e8369110 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-fs_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml index c1b34cd4b76f..47f840320cbe 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml index 143408773bf2..9c8ffffef951 100644 --- a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml +++ b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index a4c2493a7758..e002ef988f33 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml index 086bdc365c1a..94789cb368d8 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml index 2b31a2efb748..cfbd76cdc91c 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml index 0f1a55871e13..cbf74a0fac64 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml index 81b8567660dc..72084e8cb9ea 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml index 84a668ccf964..fdeb433ab364 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index 5912c70ab066..2841e6688da4 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index 81f092c39597..7e7c4d6270d7 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index ce59e4f51cf0..2c572d55ed95 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-api/pom.xml b/geomesa-geojson/geomesa-geojson-api/pom.xml index 009829f81bb6..6759910cde04 100644 --- a/geomesa-geojson/geomesa-geojson-api/pom.xml +++ b/geomesa-geojson/geomesa-geojson-api/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml index 90944af57365..ed2c9b70026c 100644 --- a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml +++ b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-rest/pom.xml b/geomesa-geojson/geomesa-geojson-rest/pom.xml index e7e71234b23c..31c73cecd42d 100644 --- a/geomesa-geojson/geomesa-geojson-rest/pom.xml +++ b/geomesa-geojson/geomesa-geojson-rest/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-geojson/pom.xml b/geomesa-geojson/pom.xml index 0bba0b186098..4059c702655a 100644 --- a/geomesa-geojson/pom.xml +++ b/geomesa-geojson/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index 1a159466a516..7f8eedb3fbf1 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index 991796864001..d0afd81f9f8e 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml index 8127e6078132..392f6027316b 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1 + 2.0.2-SNAPSHOT geomesa-hbase-distributed-runtime_2.11 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index 5c923dceb307..9bcc44b39841 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-hbase/geomesa-hbase-jobs/pom.xml b/geomesa-hbase/geomesa-hbase-jobs/pom.xml index aa44cb0d2c44..06c9b8123967 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/pom.xml +++ b/geomesa-hbase/geomesa-hbase-jobs/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-native-api/pom.xml b/geomesa-hbase/geomesa-hbase-native-api/pom.xml index d9706dfc9f02..46f8802f68b4 100644 --- a/geomesa-hbase/geomesa-hbase-native-api/pom.xml +++ b/geomesa-hbase/geomesa-hbase-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml index faba3221f293..0cabe151b476 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index 472585466326..18667d122d76 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index 1c21cfa044e9..7ede7708fcd2 100644 --- a/geomesa-hbase/geomesa-hbase-tools/pom.xml +++ b/geomesa-hbase/geomesa-hbase-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index b2172690ce40..5ce720d9ba4e 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index 3c076e368675..09c85a8b0687 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index b12446232095..a3b5927d7e47 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml index b927b32e69a5..54af56e77393 100644 --- a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -3,7 +3,7 @@ geomesa-jupyter_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-jupyter/pom.xml b/geomesa-jupyter/pom.xml index 1d27b2cfcabb..8d4f171ed854 100644 --- a/geomesa-jupyter/pom.xml +++ b/geomesa-jupyter/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index 52dc00abe270..28eedd38d8d1 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index c36bc49e4c81..ec521945a7fc 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml index 279f15ccff7f..35f0b84f17c4 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index 7c7bf74d6d52..2e3359849d53 100644 --- a/geomesa-kafka/geomesa-kafka-tools/pom.xml +++ b/geomesa-kafka/geomesa-kafka-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 7595e90956ad..e7dcc9f3279e 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index cd777cd4ed0b..77d610fbe606 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index 756bc07d2fb6..135c2b52920a 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/pom.xml +++ b/geomesa-lambda/geomesa-lambda-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1 + 2.0.2-SNAPSHOT geomesa-lambda-datastore_2.11 diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index 9a2065be014c..039a38d95257 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 pom diff --git a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml index b373cf3cec25..90003de9ba18 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-lambda/geomesa-lambda-tools/pom.xml b/geomesa-lambda/geomesa-lambda-tools/pom.xml index 56b990567131..651aa55af719 100644 --- a/geomesa-lambda/geomesa-lambda-tools/pom.xml +++ b/geomesa-lambda/geomesa-lambda-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index fcefe0092ee5..8b5c32f98974 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index c9651dbe5c64..1f83d2ddc38a 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index 99a78e2f6b4b..02e82c73198a 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index 664028c7588d..026a86a0229c 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index 2cb75d96d652..d9e091b99aae 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-native-api/pom.xml b/geomesa-native-api/pom.xml index 0135d1ef74d5..38bffb4425a3 100644 --- a/geomesa-native-api/pom.xml +++ b/geomesa-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index 5a6d07b7ab4b..e53e55a87892 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index 40f5c4e9b6fa..72a51d872097 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index 8fede3884ffc..b562dafe7c8f 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index c802fcf3a4de..f4bae9ff1828 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index 5e3fef2448da..8567c6b42375 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index 5b73f8542ef9..d664a784f534 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-geotools/pom.xml b/geomesa-spark/geomesa-spark-geotools/pom.xml index d3ce0fd18591..669e79cd20a1 100644 --- a/geomesa-spark/geomesa-spark-geotools/pom.xml +++ b/geomesa-spark/geomesa-spark-geotools/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index 3332fc820846..bf98eb543efb 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index 9b4cdd9e479c..4df6266481f4 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index 215472880c98..16a7e8dfecbe 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index e67760f07bf9..76f7fbf0d034 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-api/pom.xml b/geomesa-stream/geomesa-stream-api/pom.xml index 81d2c4856805..8d9ae83c64c7 100644 --- a/geomesa-stream/geomesa-stream-api/pom.xml +++ b/geomesa-stream/geomesa-stream-api/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-datastore/pom.xml b/geomesa-stream/geomesa-stream-datastore/pom.xml index 4206fb241758..d6b3be560cbf 100644 --- a/geomesa-stream/geomesa-stream-datastore/pom.xml +++ b/geomesa-stream/geomesa-stream-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-generic/pom.xml b/geomesa-stream/geomesa-stream-generic/pom.xml index 4a385403cc2f..f855e1553bec 100644 --- a/geomesa-stream/geomesa-stream-generic/pom.xml +++ b/geomesa-stream/geomesa-stream-generic/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml index 2dff0429e850..119f1b787f4e 100644 --- a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml +++ b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.1 + 2.0.2-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-stream/pom.xml b/geomesa-stream/pom.xml index b5258a0f92da..1aeac0b8abb0 100644 --- a/geomesa-stream/pom.xml +++ b/geomesa-stream/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-test/pom.xml b/geomesa-test/pom.xml index 29de70f05050..85110c4b5167 100644 --- a/geomesa-test/pom.xml +++ b/geomesa-test/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index e8a270e39af4..1ebc081f9453 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-utils/pom.xml b/geomesa-utils/pom.xml index 035f70205578..60deb2085271 100644 --- a/geomesa-utils/pom.xml +++ b/geomesa-utils/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-core/pom.xml b/geomesa-web/geomesa-web-core/pom.xml index 0dd4f1215647..7bc5aebcfc03 100644 --- a/geomesa-web/geomesa-web-core/pom.xml +++ b/geomesa-web/geomesa-web-core/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-data/pom.xml b/geomesa-web/geomesa-web-data/pom.xml index d125dd0250a7..ad814e627510 100644 --- a/geomesa-web/geomesa-web-data/pom.xml +++ b/geomesa-web/geomesa-web-data/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-install/pom.xml b/geomesa-web/geomesa-web-install/pom.xml index 8bc5aaae61b5..60ee4f381900 100644 --- a/geomesa-web/geomesa-web-install/pom.xml +++ b/geomesa-web/geomesa-web-install/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-web/geomesa-web-stats/pom.xml b/geomesa-web/geomesa-web-stats/pom.xml index 6e1ec2b55880..8c753122ef82 100644 --- a/geomesa-web/geomesa-web-stats/pom.xml +++ b/geomesa-web/geomesa-web-stats/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-web/pom.xml b/geomesa-web/pom.xml index e69ad7b5d729..fefb6cd33bae 100644 --- a/geomesa-web/pom.xml +++ b/geomesa-web/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index db8dee9cf866..51a8d9bc42ad 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/geomesa-zk-utils/pom.xml b/geomesa-zk-utils/pom.xml index 4897ab90623e..94b163bf8f3d 100644 --- a/geomesa-zk-utils/pom.xml +++ b/geomesa-zk-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.1 + 2.0.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f137a6bb76f4..c8fab0c93523 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.locationtech.geomesa geomesa_2.11 pom - 2.0.1 + 2.0.2-SNAPSHOT @@ -2951,7 +2951,7 @@ scm:git:git@github.com:locationtech/geomesa.git scm:git:git@github.com:locationtech/geomesa.git https://github.com/locationtech/geomesa - geomesa_2.11-2.0.1 + HEAD From 32e0a4bdf8ff854be548fdc60184bf900156d50d Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 10:31:42 -0400 Subject: [PATCH 17/33] GEOMESA-2241 HBase Spark queries can drop part of FID (#1958) Signed-off-by: Emilio Lahr-Vivaz --- .../accumulo/AccumuloSpatialRDDProvider.scala | 1 - .../hbase/index/HBaseIndexAdapter.scala | 2 +- .../hbase/data/HBaseDataStoreTest.scala | 9 +- .../hbase/jobs/GeoMesaHBaseInputFormat.scala | 114 ++++++------------ .../spark/hbase/HBaseSpatialRDDProvider.scala | 83 ++++++++----- .../geomesa/spark/GeoMesaSparkSQL.scala | 13 +- .../geomesa/spark/SparkSQLDataTest.scala | 10 +- 7 files changed, 107 insertions(+), 125 deletions(-) diff --git a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala index 874eb99760f6..f3a3cd7d721a 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +++ b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala @@ -38,7 +38,6 @@ import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} import org.opengis.filter.Filter import scala.collection.JavaConversions._ -import scala.util.Try class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { import org.locationtech.geomesa.spark.CaseInsensitiveMapFix._ diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseIndexAdapter.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseIndexAdapter.scala index 167ce2677c02..72d6c05c19df 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseIndexAdapter.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseIndexAdapter.scala @@ -138,7 +138,7 @@ trait HBaseIndexAdapter extends HBaseFeatureIndexType * @param returnSft return simple feature type (transform, etc) * @return */ - private [index] def resultsToFeatures(sft: SimpleFeatureType, + private [hbase] def resultsToFeatures(sft: SimpleFeatureType, returnSft: SimpleFeatureType): Iterator[Result] => Iterator[SimpleFeature] = { // Perform a projecting decode of the simple feature val getId = getIdFromRow(sft) diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala index 349385c56dd4..32ad91d8b064 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala @@ -27,6 +27,7 @@ import org.opengis.feature.simple.SimpleFeature import org.opengis.filter.Filter import org.specs2.matcher.MatchResult +import scala.collection.{GenTraversableOnce, immutable} import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ @@ -72,7 +73,7 @@ class HBaseDataStoreTest extends HBaseTest with LazyLogging { val ids = fs.addFeatures(new ListFeatureCollection(sft, toAdd)) ids.asScala.map(_.getID) must containTheSameElementsAs((0 until 10).map(_.toString)) - val transformsList = Seq(null, Array("geom"), Array("geom", "dtg"), Array("name")) + val transformsList = Seq(null, Array("geom"), Array("geom", "dtg"), Array("name"), Array("dtg", "geom", "attr", "name")) foreach(Seq(true, false)) { remote => foreach(Seq(true, false)) { loose => @@ -99,9 +100,9 @@ class HBaseDataStoreTest extends HBaseTest with LazyLogging { } } - def testTransforms(ds: HBaseDataStore) = { - val transforms = Array("derived=strConcat('hello',name)", "geom") + def testTransforms(ds: HBaseDataStore): MatchResult[_] = { forall(Seq(("INCLUDE", toAdd), ("bbox(geom,42,48,52,62)", toAdd.drop(2)))) { case (filter, results) => + val transforms = Array("derived=strConcat('hello',name)", "geom") val fr = ds.getFeatureReader(new Query(typeName, ECQL.toFilter(filter), transforms), Transaction.AUTO_COMMIT) val features = SelfClosingIterator(fr).toList features.headOption.map(f => SimpleFeatureTypes.encodeType(f.getFeatureType)) must @@ -116,7 +117,7 @@ class HBaseDataStoreTest extends HBaseTest with LazyLogging { testTransforms(ds) - def testProcesses(ds: HBaseDataStore) = { + def testProcesses(ds: HBaseDataStore): MatchResult[_] = { val source = ds.getFeatureSource(typeName) val input = new ListFeatureCollection(sft, Array[SimpleFeature](toAdd(4))) diff --git a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala index 28598ca553c9..b69ca647a670 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala +++ b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala @@ -17,15 +17,12 @@ import org.apache.hadoop.hbase.mapreduce.{MultiTableInputFormat, TableInputForma import org.apache.hadoop.io.Text import org.apache.hadoop.mapreduce._ import org.geotools.filter.identity.FeatureIdImpl -import org.geotools.filter.text.ecql.ECQL import org.geotools.process.vector.TransformProcess import org.locationtech.geomesa.hbase.data.HBaseConnectionPool -import org.locationtech.geomesa.hbase.index.HBaseFeatureIndex +import org.locationtech.geomesa.hbase.index.{HBaseFeatureIndex, HBaseIndexAdapter} import org.locationtech.geomesa.jobs.GeoMesaConfigurator import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} -import org.opengis.filter.Filter -import scala.collection.JavaConversions._ import scala.util.control.NonFatal /** @@ -36,11 +33,11 @@ class GeoMesaHBaseInputFormat extends InputFormat[Text, SimpleFeature] with Lazy val delegate = new MultiTableInputFormat var sft: SimpleFeatureType = _ - var table: HBaseFeatureIndex = _ + var table: HBaseIndexAdapter = _ private def init(conf: Configuration): Unit = if (sft == null) { sft = GeoMesaConfigurator.getSchema(conf) - table = HBaseFeatureIndex.index(GeoMesaConfigurator.getIndexIn(conf)) + table = HBaseFeatureIndex.index(GeoMesaConfigurator.getIndexIn(conf)).asInstanceOf[HBaseIndexAdapter] delegate.setConf(conf) // see TableMapReduceUtil.java HBaseConfiguration.merge(conf, HBaseConfiguration.create(conf)) @@ -62,96 +59,59 @@ class GeoMesaHBaseInputFormat extends InputFormat[Text, SimpleFeature] with Lazy context: TaskAttemptContext): RecordReader[Text, SimpleFeature] = { init(context.getConfiguration) val rr = delegate.createRecordReader(split, context) - val transformSchema = GeoMesaConfigurator.getTransformSchema(context.getConfiguration) - val schema = transformSchema.getOrElse(sft) - val q = GeoMesaConfigurator.getFilter(context.getConfiguration).map { f => ECQL.toFilter(f) } + val transform = GeoMesaConfigurator.getTransformSchema(context.getConfiguration) // transforms are pushed down in HBase - new HBaseGeoMesaRecordReader(schema, table, rr, q, None) + new HBaseGeoMesaRecordReader(table, sft, transform, rr) } } -class HBaseGeoMesaRecordReader(sft: SimpleFeatureType, - table: HBaseFeatureIndex, - reader: RecordReader[ImmutableBytesWritable, Result], - filterOpt: Option[Filter], - transformSchema: Option[SimpleFeatureType]) +class HBaseGeoMesaRecordReader(table: HBaseIndexAdapter, + sft: SimpleFeatureType, + transform: Option[SimpleFeatureType], + reader: RecordReader[ImmutableBytesWritable, Result]) extends RecordReader[Text, SimpleFeature] with LazyLogging { - private var staged: SimpleFeature = _ + private val results = new Iterator[Result] { + + private var current: Result = _ - private val nextFeature = - (filterOpt, transformSchema) match { - case (Some(filter), Some(ts)) => - val indices = ts.getAttributeDescriptors.map { ad => sft.indexOf(ad.getLocalName) } - val fn = table.toFeaturesWithFilterTransform(sft, filter, Array.empty[TransformProcess.Definition], indices.toArray, ts) - nextFeatureFromOptional(fn) - - case (Some(filter), None) => - val fn = table.toFeaturesWithFilter(sft, filter) - nextFeatureFromOptional(fn) - - case (None, Some(ts)) => - val indices = ts.getAttributeDescriptors.map { ad => sft.indexOf(ad.getLocalName) } - val fn = table.toFeaturesWithTransform(sft, Array.empty[TransformProcess.Definition], indices.toArray, ts) - nextFeatureFromDirect(fn) - - case (None, None) => - val fn = table.toFeaturesDirect(sft) - nextFeatureFromDirect(fn) + override def hasNext: Boolean = { + if (current != null) { + true + } else if (reader.nextKeyValue()) { + current = reader.getCurrentValue + true + } else { + false + } } - private val getId = table.getIdFromRow(sft) + override def next(): Result = { + val res = current + current = null + res + } + } + + private val features = table.resultsToFeatures(sft, transform.getOrElse(sft))(results) + private var staged: SimpleFeature = _ override def initialize(split: InputSplit, context: TaskAttemptContext): Unit = reader.initialize(split, context) override def getProgress: Float = reader.getProgress - override def nextKeyValue(): Boolean = nextKeyValueInternal() - - override def getCurrentValue: SimpleFeature = staged - - override def getCurrentKey = new Text(staged.getID) - - override def close(): Unit = reader.close() - - /** - * Get the next key value from the underlying reader, incrementing the reader when required - */ - private def nextKeyValueInternal(): Boolean = { - nextFeature() - if (staged != null) { - val row = reader.getCurrentKey - val offset = row.getOffset - val length = row.getLength - staged.getIdentifier.asInstanceOf[FeatureIdImpl].setID(getId(row.get(), offset, length, staged)) + override def nextKeyValue(): Boolean = { + if (features.hasNext) { + staged = features.next true } else { false } } - private def nextFeatureFromOptional(toFeature: Result => Option[SimpleFeature]) = () => { - staged = null - while (staged == null && reader.nextKeyValue()) { - try { - toFeature(reader.getCurrentValue) match { - case Some(feature) => staged = feature - case None => staged = null - } - } catch { - case NonFatal(e) => logger.error(s"Error reading row: ${reader.getCurrentValue}", e) - } - } - } + override def getCurrentValue: SimpleFeature = staged - private def nextFeatureFromDirect(toFeature: Result => SimpleFeature) = () => { - staged = null - while (staged == null && reader.nextKeyValue()) { - try { - staged = toFeature(reader.getCurrentValue) - } catch { - case NonFatal(e) => logger.error(s"Error reading row: ${reader.getCurrentValue}", e) - } - } - } + override def getCurrentKey = new Text(staged.getID) + + override def close(): Unit = reader.close() } \ No newline at end of file diff --git a/geomesa-hbase/geomesa-hbase-spark/src/main/scala/org/locationtech/geomesa/spark/hbase/HBaseSpatialRDDProvider.scala b/geomesa-hbase/geomesa-hbase-spark/src/main/scala/org/locationtech/geomesa/spark/hbase/HBaseSpatialRDDProvider.scala index 719e08912aa0..9442bbdffa3f 100644 --- a/geomesa-hbase/geomesa-hbase-spark/src/main/scala/org/locationtech/geomesa/spark/hbase/HBaseSpatialRDDProvider.scala +++ b/geomesa-hbase/geomesa-hbase-spark/src/main/scala/org/locationtech/geomesa/spark/hbase/HBaseSpatialRDDProvider.scala @@ -17,8 +17,7 @@ import org.apache.hadoop.io.Text import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD import org.geotools.data.{Query, Transaction} -import org.geotools.filter.text.ecql.ECQL -import org.locationtech.geomesa.hbase.data.{EmptyPlan, HBaseDataStore, HBaseDataStoreFactory} +import org.locationtech.geomesa.hbase.data.{EmptyPlan, HBaseDataStore, HBaseDataStoreFactory, HBaseQueryPlan} import org.locationtech.geomesa.hbase.jobs.GeoMesaHBaseInputFormat import org.locationtech.geomesa.index.conf.QueryHints import org.locationtech.geomesa.jobs.GeoMesaConfigurator @@ -29,6 +28,8 @@ import org.opengis.feature.simple.SimpleFeature class HBaseSpatialRDDProvider extends SpatialRDDProvider { + import org.locationtech.geomesa.index.conf.QueryHints._ + override def canProcess(params: java.util.Map[String, java.io.Serializable]): Boolean = HBaseDataStoreFactory.canProcess(params) @@ -36,47 +37,63 @@ class HBaseSpatialRDDProvider extends SpatialRDDProvider { sc: SparkContext, dsParams: Map[String, String], origQuery: Query): SpatialRDD = { - import org.locationtech.geomesa.index.conf.QueryHints._ + val ds = DataStoreConnector.loadingMap.get(dsParams).asInstanceOf[HBaseDataStore] - // force loose bbox to be false - origQuery.getHints.put(QueryHints.LOOSE_BBOX, false) // get the query plan to set up the iterators, ranges, etc lazy val sft = ds.getSchema(origQuery.getTypeName) - lazy val qp = ds.getQueryPlan(origQuery).head - - if (ds == null || sft == null || qp.isInstanceOf[EmptyPlan]) { - val transform = origQuery.getHints.getTransformSchema - SpatialRDD(sc.emptyRDD[SimpleFeature], transform.getOrElse(sft)) - } else { - val transform = ds.queryPlanner.configureQuery(sft, origQuery).getHints.getTransformSchema - GeoMesaConfigurator.setSchema(conf, sft) - GeoMesaConfigurator.setSerialization(conf) - GeoMesaConfigurator.setIndexIn(conf, qp.filter.index) - GeoMesaConfigurator.setTable(conf, qp.table.getNameAsString) - transform.foreach(GeoMesaConfigurator.setTransformSchema(conf, _)) - qp.filter.secondary.foreach { f => GeoMesaConfigurator.setFilter(conf, ECQL.toCQL(f)) } - val scans = qp.ranges.map { s => - val scan = s - // need to set the table name in each scan - scan.setAttribute(Scan.SCAN_ATTRIBUTES_TABLE_NAME, qp.table.getName) - convertScanToString(scan) + lazy val qps = { + // force loose bbox to be false + origQuery.getHints.put(QueryHints.LOOSE_BBOX, false) + ds.getQueryPlan(origQuery) + } + lazy val transform = ds.queryPlanner.configureQuery(sft, origQuery).getHints.getTransformSchema + + def queryPlanToRDD(qp: HBaseQueryPlan, conf: Configuration): RDD[SimpleFeature] = { + if (qp.isInstanceOf[EmptyPlan]) { + sc.emptyRDD[SimpleFeature] + } else { + GeoMesaConfigurator.setSchema(conf, sft) + GeoMesaConfigurator.setSerialization(conf) + GeoMesaConfigurator.setIndexIn(conf, qp.filter.index) + GeoMesaConfigurator.setTable(conf, qp.table.getNameAsString) + transform.foreach(GeoMesaConfigurator.setTransformSchema(conf, _)) + // note: secondary filter is handled by scan push-down filter + val scans = qp.ranges.map { scan => + // need to set the table name in each scan + scan.setAttribute(Scan.SCAN_ATTRIBUTES_TABLE_NAME, qp.table.getName) + convertScanToString(scan) + } + conf.setStrings(MultiTableInputFormat.SCANS, scans: _*) + + sc.newAPIHadoopRDD(conf, classOf[GeoMesaHBaseInputFormat], classOf[Text], classOf[SimpleFeature]).map(_._2) } - conf.setStrings(MultiTableInputFormat.SCANS, scans: _*) + } - val rdd = sc.newAPIHadoopRDD(conf, classOf[GeoMesaHBaseInputFormat], classOf[Text], classOf[SimpleFeature]).map(U => U._2) - SpatialRDD(rdd, transform.getOrElse(sft)) + try { + if (ds == null || sft == null || qps.isEmpty || qps.forall(_.isInstanceOf[EmptyPlan])) { + SpatialRDD(sc.emptyRDD[SimpleFeature], origQuery.getHints.getTransformSchema.getOrElse(sft)) + } else { + // can return a union of the RDDs because the query planner *should* + // be rewriting ORs to make them logically disjoint + // e.g. "A OR B OR C" -> "A OR (B NOT A) OR ((C NOT A) NOT B)" + val rdd = if (qps.lengthCompare(1) == 0) { + queryPlanToRDD(qps.head, conf) // no union needed for single query plan + } else { + sc.union(qps.map(queryPlanToRDD(_, new Configuration(conf)))) + } + SpatialRDD(rdd, transform.getOrElse(sft)) + } + } finally { + if (ds != null) { + ds.dispose() + } } } private def convertScanToString(scan: org.apache.hadoop.hbase.client.Query): String = scan match { - case g: Get => - val proto = ProtobufUtil.toGet(g) - Base64.encodeBytes(proto.toByteArray) - - case s: Scan => - val proto = ProtobufUtil.toScan(s) - Base64.encodeBytes(proto.toByteArray) + case g: Get => Base64.encodeBytes(ProtobufUtil.toGet(g).toByteArray) + case s: Scan => Base64.encodeBytes(ProtobufUtil.toScan(s).toByteArray) } /** diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala index db3921052621..c8dd69bc40f2 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala @@ -696,17 +696,16 @@ object SparkUtils { val index = requiredAttributes.indexOf(col) val schemaIndex = schema.fieldIndex(col) val fieldType = schema.fields(schemaIndex).dataType - sf: SimpleFeature => - if ( fieldType == TimestampType ) { + if (fieldType == TimestampType) { + sf: SimpleFeature => { val attr = sf.getAttribute(index) - if (attr != null) { + if (attr == null) { null } else { new Timestamp(attr.asInstanceOf[Date].getTime) - } else { - null } - } else { - sf.getAttribute(index) } + } else { + sf: SimpleFeature => sf.getAttribute(index) + } } } diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala index b8b61e1b5678..7c99a2d5eae0 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala @@ -13,14 +13,14 @@ import java.util.{Map => JMap} import com.typesafe.scalalogging.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, GeometryFactory, Point} -import org.apache.spark.sql.{DataFrame, SQLContext, SparkSession} +import org.apache.spark.sql.{Column, DataFrame, SQLContext, SQLTypes, SparkSession} import org.geotools.data.{DataStore, DataStoreFinder} import org.geotools.geometry.jts.JTSFactoryFinder import org.junit.runner.RunWith import org.locationtech.geomesa.utils.interop.WKTUtils import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner -import org.apache.spark.sql.SQLTypes +import org.apache.spark.sql.catalyst.expressions.Literal import org.apache.spark.sql.catalyst.plans.logical.Filter import org.apache.spark.sql.execution.datasources.LogicalRelation @@ -241,6 +241,12 @@ class SparkSQLDataTest extends Specification with LazyLogging { df.collect().map(_.get(0)) mustEqual Array(2) } + "preserve feature ID through dataframe ops" >> { + val sql = "select * from chicago where __fid__ = '1'" + sc.sql(sql).collect().map(_.getAs[String]("__fid__")) mustEqual Array("1") + sc.sql(sql).withColumn("label", new Column(Literal(1))).collect().map(_.getAs[String]("__fid__")) mustEqual Array("1") + } + "st_translate" >> { "null" >> { sc.sql("select st_translate(null, null, null)").collect.head(0) must beNull From ee1b259120a9dcf2c39e9dc309ad87fad844fed7 Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 13:56:46 -0400 Subject: [PATCH 18/33] GEOMESA-1730,GEOMESA-1479 GPX tutorial shouldn't depend on external code, docs fixes (#1964) * Updated osm-gpx converter to work with Saxon * Fixing references to 'mapreduce' as 'map-reduce' * Adding note on support for ORC in FSDS Signed-off-by: Emilio Lahr-Vivaz --- docs/user/accumulo/install.rst | 2 +- docs/user/cli/filesystems.rst | 2 +- docs/user/convert/extending.rst | 2 +- docs/user/convert/function_overview.rst | 4 +- docs/user/convert/premade/osm-gpx.rst | 57 +++++++++---------- docs/user/filesystem/architecture.rst | 10 ++-- docs/user/hbase/install.rst | 2 +- geomesa-tools/conf/sfts/osm-gpx/README.md | 27 ++++++--- .../conf/sfts/osm-gpx/reference.conf | 11 ++-- 9 files changed, 66 insertions(+), 51 deletions(-) diff --git a/docs/user/accumulo/install.rst b/docs/user/accumulo/install.rst index 40041924506f..513eafc7621d 100644 --- a/docs/user/accumulo/install.rst +++ b/docs/user/accumulo/install.rst @@ -182,7 +182,7 @@ Update and re-source your ``~/.bashrc`` file to include the ``$GEOMESA_ACCUMULO_ GeoMesa provides the ability to provide additional jars on the classpath using the environmental variable ``$GEOMESA_EXTRA_CLASSPATHS``. GeoMesa will prepend the contents of this environmental variable to the computed classpath giving it highest precedence in the classpath. Users can provide directories of jar files or individual - files using a colon (``:``) as a delimiter. These entries will also be added the the mapreduce libjars variable. + files using a colon (``:``) as a delimiter. These entries will also be added the the map-reduce libjars variable. Use the ``geomesa-accumulo classpath`` command to print the final classpath that will be used when executing geomesa commands. diff --git a/docs/user/cli/filesystems.rst b/docs/user/cli/filesystems.rst index e6049fde67ed..aef3fcd6e6c8 100644 --- a/docs/user/cli/filesystems.rst +++ b/docs/user/cli/filesystems.rst @@ -63,7 +63,7 @@ For ``s3n``: mapreduce.application.classpath $HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*:$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*:$HADOOP_MAPRED_HOME/share/hadoop/tools/lib/* - The classpath specifically for mapreduce jobs. This override is needed so that s3 URLs work on hadoop 2.6.0+ + The classpath specifically for map-reduce jobs. This override is needed so that s3 URLs work on hadoop 2.6.0+ fs.s3n.impl diff --git a/docs/user/convert/extending.rst b/docs/user/convert/extending.rst index 7fe057cf45fc..4a6523f04860 100644 --- a/docs/user/convert/extending.rst +++ b/docs/user/convert/extending.rst @@ -53,7 +53,7 @@ Adding Functions to the Geomesa Classpath After creating a JAR file with your transformation function and factory you can add these to the ``GEOMESA_EXTRA_CLASSPATHS`` environmental variable -in order to expose them to the command line tools and distributed (mapreduce) +in order to expose them to the command line tools and distributed (map-reduce) ingest jobs. A example of ingest with a transforms on the classpath is below: diff --git a/docs/user/convert/function_overview.rst b/docs/user/convert/function_overview.rst index 46e5ba460b38..1a6e23a1e1fa 100644 --- a/docs/user/convert/function_overview.rst +++ b/docs/user/convert/function_overview.rst @@ -102,7 +102,7 @@ Installing Custom Scripts ~~~~~~~~~~~~~~~~~~~~~~~~~ Custom scripting functions are made available to GeoMesa comamnd line tools or -distributed (mapreduce) ingest via including them on the classpath or +distributed (map-reduce) ingest via including them on the classpath or setting a system property. For local usage, geomesa defines the system property ``geomesa.convert.scripts.path`` @@ -134,7 +134,7 @@ inside the archive containing the scripts: 42 2 files For either zip or jar files add them to the extra classpaths in your environment to -make them available for the tools or mapreduce ingest: +make them available for the tools or map-reduce ingest: .. code-block:: bash diff --git a/docs/user/convert/premade/osm-gpx.rst b/docs/user/convert/premade/osm-gpx.rst index 60c825450091..14984181c01e 100644 --- a/docs/user/convert/premade/osm-gpx.rst +++ b/docs/user/convert/premade/osm-gpx.rst @@ -1,54 +1,53 @@ OpenStreetMap GPX Data ====================== -This directory provides GPS data traces from the OpenStreetMap project. +This converter handles GPS data traces from the OpenStreetMap project. The GPS traces are a series of latitude/longitude pairs collected by OSM or uploaded by users. The datasets were last updated in 2013. -Getting OSM-GPX data +Getting OSM-GPX Data -------------------- The OSM-GPX data set can be downloaded using the provided -``download-data.sh`` script in ``$GEOMESA_ACCUMULO_HOME/bin/`` as such +``download-data.sh`` script in ``$GEOMESA_HOME/bin/``: -:: +.. code-block:: bash - ./download-data.sh osm-gpx + $ ./download-data.sh osm-gpx -providing a desired region when prompted. - -Alternatively, download OSM\_GPX data -`here `__. It is formatted in a -GPX 1.0 format, which is an XML format described by this -`XSD `__. Regional extracts -of the dataset can be found +Alternatively, download OSM\_GPX data `here `__. It is formatted in the +GPX 1.0 format, which is an XML format described by this `XSD `__. +Regional extracts of the dataset can be found `here `__. -Cleaning the data ------------------ +Extracting the Data +------------------- + +Extract the downloaded tar.xz file into an appropriate directory. Note that it is important to keep the file +structure of the extracted data, as it contains information on the track IDs that isn't available in the raw XML. + +.. code-block:: bash -Before ingest, the .gpx files can be converted to CSV files through the use -of `this converter `__. + $ cd /tmp + $ tar -xvf gpx-planet-2013-04-09.tar.xz -Ingest Commands ---------------- +Ingest Command +-------------- -Check that the ``osm-gpx`` simple feature type is available on the GeoMesa -tools classpath. This is the default case. +Check that the ``osm-gpx`` simple feature type is available on the GeoMesa tools classpath. This is the default case. -:: +.. code-block:: bash $ geomesa-accumulo env | grep osm-gpx -If it is not, merge the contents of ``reference.conf`` with -``$GEOMESA_ACCUMULO_HOME/conf/application.conf``, or ensure that -``reference.conf`` is in ``$GEOMESA_ACCUMULO_HOME/conf/sfts/osm-gpx``. +If it is not, merge the contents of ``reference.conf`` with ``$GEOMESA_HOME/conf/application.conf``, or ensure that +``reference.conf`` is in ``$GEOMESA_HOME/conf/sfts/osm-gpx``. -Run the ingest. You may optionally point to a different accumulo -instance using ``-i`` and ``-z`` options. See ``geomesa-accumulo help ingest`` -for more detail. +Run the ingest. The exact command name will vary based on your back-end distribution. Try +`geomesa help ingest` for available options. -:: +.. code-block:: bash - $ geomesa-accumulo ingest -u USERNAME -c CATALOGNAME -s osm-gpx -C osm-gpx osm-data.csv + $ geomesa ingest -s osm-gpx -C osm-gpx '/tmp/gpx-planet-2013-04-09/**/*.gpx' +Note: be sure to use single quotes around the path to prevent the shell from expanding the wildcards. diff --git a/docs/user/filesystem/architecture.rst b/docs/user/filesystem/architecture.rst index df79e3d41003..5a00746d0421 100644 --- a/docs/user/filesystem/architecture.rst +++ b/docs/user/filesystem/architecture.rst @@ -61,11 +61,13 @@ More information on defining partition schemes can be found in :ref:`fsds_partit Storage Formats --------------- -* **Apache Parquet** - Apache Parquet is the leading interoperable columnar format in the Hadoop ecosystem. It provides - efficient compression, storage, and query of structured data. Apache Parquet is currently the only format that can be - used for writing data into the FileSystem datastore. +* **Apache Parquet** - Apache Parquet is the leading interoperable columnar format in the Hadoop ecosystem. It + provides efficient compression, storage, and query of structured data. + +* **Apache ORC** - Apache ORC is a self-describing type-aware columnar file format designed for Hadoop workloads. It + is optimized for large streaming reads, but with integrated support for finding required rows quickly. * **Converter Storage** - The converter storage format is a synthetic format which allows you to overlay a GeoMesa converter on top of a filesystem using a defined partition scheme. This allows you to utilize existing data storage layouts of data stored in JSON, CSV, TSV, Avro, or other formats. Converters are pluggable allowing users to expose their own - custom storage formats if desired. + custom storage formats if desired. Converter storage is a read-only format. diff --git a/docs/user/hbase/install.rst b/docs/user/hbase/install.rst index fe366d1b2f6b..6784861ee823 100644 --- a/docs/user/hbase/install.rst +++ b/docs/user/hbase/install.rst @@ -401,7 +401,7 @@ used by your installation. GeoMesa provides the ability to provide additional jars on the classpath using the environmental variable ``$GEOMESA_EXTRA_CLASSPATHS``. GeoMesa will prepend the contents of this environmental variable to the computed classpath giving it highest precedence in the classpath. Users can provide directories of jar files or individual - files using a colon (``:``) as a delimiter. These entries will also be added the the mapreduce libjars variable. + files using a colon (``:``) as a delimiter. These entries will also be added the the map-reduce libjars variable. Use the ``geomesa-hbase classpath`` command to print the final classpath that will be used when executing geomesa commands. diff --git a/geomesa-tools/conf/sfts/osm-gpx/README.md b/geomesa-tools/conf/sfts/osm-gpx/README.md index 2703aa22fb7e..1b08a0224fed 100644 --- a/geomesa-tools/conf/sfts/osm-gpx/README.md +++ b/geomesa-tools/conf/sfts/osm-gpx/README.md @@ -1,6 +1,7 @@ # OpenStreetMap GPX Data for GeoMesa -This directory provides GPS data traces from the OpenStreetMap project. The GPS traces are a series of latitude/longitude pairs collected by OSM or uploaded by users. The datasets were last updated in 2013. +This converter handles GPS data traces from the OpenStreetMap project. The GPS traces are a series of +latitude/longitude pairs collected by OSM or uploaded by users. The datasets were last updated in 2013. This readme describes the full process from original source data to GeoMesa ingest. @@ -12,20 +13,30 @@ The OSM-GPX data set can be downloaded using the provided ```download-data.sh``` providing a desired region when prompted. -Alternatively, download OSM_GPX data [here](http://planet.openstreetmap.org/gps/). It is formatted in a GPX 1.0 format, which is an XML format described by this [XSD](http://www.topografix.com/GPX/1/0/gpx.xsd). Regional extracts of the dataset can be found [here](http://zverik.osm.rambler.ru/gps/files/extracts/index.html) +Alternatively, download OSM_GPX data [here](http://planet.openstreetmap.org/gps/). It is formatted in a GPX 1.0 +format, which is an XML format described by this [XSD](http://www.topografix.com/GPX/1/0/gpx.xsd). Regional extracts +of the dataset can be found [here](http://zverik.osm.rambler.ru/gps/files/extracts/index.html) -## Cleaning the data +## Extracting the Data -Before ingest, the .gpx files can be converted to CSV files through use of [this converter](https://github.com/jahhulbert-ccri/osm-parsers) +Extract the downloaded tar.xz file into an appropriate directory. Note that it is important to keep the file +structure of the extracted data, as it contains information on the track IDs that isn't available in the raw XML. -## Ingest Commands + cd /tmp + tar -xvf gpx-planet-2013-04-09.tar.xz + +## Ingest Command Check that `osm-gpx` simple feature type is available on the GeoMesa tools classpath. This is the default case. geomesa env | grep osm-gpx -If it is not, merge the contents of `reference.conf` with `$GEOMESA_HOME/conf/application.conf`, or ensure that `reference.conf` is in `$GEOMESA_HOME/conf/sfts/osm-gpx` +If it is not, merge the contents of `reference.conf` with `$GEOMESA_HOME/conf/application.conf`, or ensure +that `reference.conf` is in `$GEOMESA_HOME/conf/sfts/osm-gpx` + +Run the ingest. The exact command name will vary based on your back-end distribution. Try +`geomesa help ingest` for available options. -Run the ingest. You may optionally point to a different accumulo instance using `-i` and `-z` options. See `geomesa help ingest` for more detail. + geomesa ingest -s osm-gpx -C osm-gpx '/tmp/gpx-planet-2013-04-09/**/*.gpx' - geomesa ingest -u USERNAME -c CATALOGNAME -s osm-gpx -C osm-gpx osm-data.csv +Note: be sure to use single quotes around the path to prevent the shell from expanding the wildcards. diff --git a/geomesa-tools/conf/sfts/osm-gpx/reference.conf b/geomesa-tools/conf/sfts/osm-gpx/reference.conf index 30cbec5e9594..77a46f726a80 100644 --- a/geomesa-tools/conf/sfts/osm-gpx/reference.conf +++ b/geomesa-tools/conf/sfts/osm-gpx/reference.conf @@ -17,19 +17,22 @@ geomesa { osm-gpx = { type = xml id-field = "md5(stringToBytes(concat(regexReplace('.*?(\\\\d+)\\\\.gpx'::r, '$1', $inputFilePath), xml2string($0))))" - feature-path = "trk/trkseg/trkpt" + feature-path = "gpx:trk/gpx:trkseg/gpx:trkpt" options { line-mode = "multi" } fields = [ - { name = trackId, path = "../../number/text()", transform = "concat(regexReplace('.*?(\\\\d+)\\\\.gpx'::r, '$1-', $inputFilePath), $0)" } + { name = trackId, path = "../../gpx:number/text()", transform = "concat(regexReplace('.*?(\\\\d+)\\\\.gpx'::r, '$1-', $inputFilePath), $0)" } // TODO some nodes don't have elevation which fails this element - // { name = elevation, path = "ele/text()", transform = "$0::double" } - { name = dtg, path = "time/text()", transform = "datetime(regexReplace('(:\\\\d{2})Z'::r, '$1.000Z', regexReplace('\\\\.\\\\d+Z'::r, 'Z', $0)))" } + // { name = elevation, path = "gpx:ele/text()", transform = "$0::double" } + { name = dtg, path = "gpx:time/text()", transform = "datetime(regexReplace('(:\\\\d{2})Z'::r, '$1.000Z', regexReplace('\\\\.\\\\d+Z'::r, 'Z', $0)))" } { name = lat, path = "@lat", transform = "$0::double" } { name = lon, path = "@lon", transform = "$0::double" } { name = geom, transform = "point($lon, $lat)" } ] + xml-namespaces = { + gpx = "http://www.topografix.com/GPX/1/0" + } } } } From 5fb333f0f63380654369ff5044901106bc4b2437 Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 16:50:37 -0400 Subject: [PATCH 19/33] GEOMESA-2133 JsonPath converter treats missing elements as null (#1963) Signed-off-by: Emilio Lahr-Vivaz --- .../json/JsonSimpleFeatureConverter.scala | 22 +++++-------- .../convert/json/JsonConverterTest.scala | 33 +++++++++++++++++++ 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonSimpleFeatureConverter.scala b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonSimpleFeatureConverter.scala index d745a9cb4f59..6ea269597049 100644 --- a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonSimpleFeatureConverter.scala +++ b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonSimpleFeatureConverter.scala @@ -11,9 +11,9 @@ package org.locationtech.geomesa.convert.json import java.io.InputStream import java.nio.charset.StandardCharsets -import com.google.gson.{JsonArray, JsonElement, JsonObject} +import com.google.gson.{JsonArray, JsonElement, JsonNull, JsonObject} import com.jayway.jsonpath.spi.json.GsonJsonProvider -import com.jayway.jsonpath.{Configuration, JsonPath} +import com.jayway.jsonpath.{Configuration, JsonPath, PathNotFoundException} import com.typesafe.config.Config import com.vividsolutions.jts.geom._ import com.vividsolutions.jts.geom.impl.CoordinateArraySequence @@ -137,24 +137,18 @@ trait BaseJsonField[T] extends Field { override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = { mutableArray(0) = getAs(evaluateJsonPath(args)) - - if(transform == null) mutableArray(0) - else super.eval(mutableArray) - } - - def evalWithTransform(args: Array[Any])(implicit ec: EvaluationContext): Any = { - mutableArray(0) = evaluateJsonPath(args) - super.eval(mutableArray) + if (transform == null) { mutableArray(0) } else { super.eval(mutableArray) } } // If the expression path is the 'root' path, we read from the second, argument. // In order for there to be two arguments passed in, one must be using a feature-path. // Without a feature-path, just use 'path' rather than 'root-path'. - def evaluateJsonPath(args: Array[Any]): JsonElement = { - val arg = if (pathIsRoot) args(1) else args(0) - expression.read[JsonElement](arg, jsonConfig) + private def evaluateJsonPath(args: Array[Any]): JsonElement = { + val arg = if (pathIsRoot) { args(1) } else { args(0) } + try { expression.read[JsonElement](arg, jsonConfig) } catch { + case _: PathNotFoundException => JsonNull.INSTANCE + } } - } case class BooleanJsonField(name: String, expression: JsonPath, jsonConfig: Configuration, transform: Expr, pathIsRoot: Boolean) diff --git a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala index 60c122b8e94a..22cd916bc6cf 100644 --- a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala +++ b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala @@ -9,6 +9,7 @@ package org.locationtech.geomesa.convert.json import java.io.ByteArrayInputStream +import java.nio.charset.StandardCharsets import java.util.{Date, UUID} import com.typesafe.config.ConfigFactory @@ -1112,6 +1113,38 @@ class JsonConverterTest extends Specification { f.get[Boolean]("b") mustEqual false } + "parse missing values as null" >> { + val sft = SimpleFeatureTypes.createType("foo", "name:String,*geom:Point:srid=4326") + val json = Seq( + """{ "lat": 0, "lon": 0, "properties": { "name": "name1" } }""", + """{ "lat": 0, "lon": 0, "properties": { "name": null } }""", + """{ "lat": 0, "lon": 0, "properties": {} }""", + """{ "lat": 0, "lon": 0 }""" + ).mkString("\n") + + val parserConf = ConfigFactory.parseString( + """ + | { + | type = "json" + | options = { + | line-mode = "single" + | } + | fields = [ + | { name = "name", json-type = "string", path = "$.properties.name", } + | { name = "lat", json-type = "double", path = "$.lat", } + | { name = "lon", json-type = "double", path = "$.lon", } + | { name = "geom", transform = "point($lon, $lat)" } + | ] + | } + """.stripMargin) + + val converter = SimpleFeatureConverters.build[String](sft, parserConf) + val in = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)) + val features = converter.process(in).toList + features must haveLength(4) + features.map(_.getAttribute("name")) mustEqual Seq("name1", null, null, null) + } + "handle invalid input" >> { val typeSft = SimpleFeatureTypes.createType("foo", "i:Long") From 6e6a5594269c268be0ae70dcfe8593d37f42181a Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 16:52:40 -0400 Subject: [PATCH 20/33] GEOMESA-2225 Fixing converter parseMap example in docs, adding unit test (#1959) Signed-off-by: Emilio Lahr-Vivaz --- docs/user/convert/function_usage.rst | 2 +- .../convert/common/TransformersTest.scala | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/user/convert/function_usage.rst b/docs/user/convert/function_usage.rst index 57b5bdf8bcef..62c19daac0cc 100644 --- a/docs/user/convert/function_usage.rst +++ b/docs/user/convert/function_usage.rst @@ -643,7 +643,7 @@ delimiters for a map: :: - { name = "numbers", transform = "parseMap('int -> string', $2, ',', '->')" } + { name = "numbers", transform = "parseMap('int -> string', $2, '->', ',')" } Enrichment Functions diff --git a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert/common/TransformersTest.scala b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert/common/TransformersTest.scala index 7b221e31a362..987f8d9fb5b8 100644 --- a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert/common/TransformersTest.scala +++ b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert/common/TransformersTest.scala @@ -797,6 +797,27 @@ class TransformersTest extends Specification { } } + "parse maps" >> { + "default delimiter" >> { + val trans = Transformers.parseTransform("parseMap('String->Int', $0)") + val res = trans.eval(Array("a->1,b->2,c->3")) + res must beAnInstanceOf[java.util.Map[String, Int]] + res.asInstanceOf[java.util.Map[String, Int]].size mustEqual 3 + res.asInstanceOf[java.util.Map[String, Int]].toMap mustEqual Map("a" -> 1, "b" -> 2, "c" -> 3) + } + "custom delimiter" >> { + val trans = Transformers.parseTransform("parseMap('String->Int', $0, '%', ';')") + val res = trans.eval(Array("a%1;b%2;c%3")) + res must beAnInstanceOf[java.util.Map[String, Int]] + res.asInstanceOf[java.util.Map[String, Int]].size mustEqual 3 + res.asInstanceOf[java.util.Map[String, Int]].toMap mustEqual Map("a" -> 1, "b" -> 2, "c" -> 3) + } + "throw exception for invalid values" >> { + val trans = Transformers.parseTransform("parseMap('String->Int', $0)") + trans.eval(Array("a->1,b->2,c->d")) must throwAn[IllegalArgumentException] + } + } + "handle default values" >> { val trans = Transformers.parseTransform("withDefault($0, 'foo')") trans.eval(Array(null)) mustEqual "foo" From c7a4c3ff20a6b56bf1b19c4cadd2730080aa45eb Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 17:28:54 -0400 Subject: [PATCH 21/33] GEOMESA-2274 Supporting query reprojections (#1955) Signed-off-by: Emilio Lahr-Vivaz --- geomesa-index-api/pom.xml | 5 ++ .../index/planning/InMemoryQueryRunner.scala | 9 ++- .../geomesa/index/planning/QueryPlanner.scala | 7 +- .../geomesa/index/utils/Reprojection.scala | 59 +++++++++++++++++ .../index/geotools/GeoMesaDataStoreTest.scala | 65 +++++++++++++++++++ .../geomesa/utils/geometry/Geometry.scala | 4 ++ 6 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Reprojection.scala create mode 100644 geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/geotools/GeoMesaDataStoreTest.scala diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index 09c85a8b0687..b8af93a2c17d 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -54,6 +54,11 @@ org.slf4j slf4j-log4j12 + + org.geotools + gt-epsg-hsql + test + diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/InMemoryQueryRunner.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/InMemoryQueryRunner.scala index 93f75b03161c..12aeabcbe0e3 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/InMemoryQueryRunner.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/InMemoryQueryRunner.scala @@ -23,7 +23,7 @@ import org.locationtech.geomesa.features.{ScalaSimpleFeature, TransformSimpleFea import org.locationtech.geomesa.filter.factory.FastFilterFactory import org.locationtech.geomesa.index.iterators.{ArrowScan, DensityScan, StatsScan} import org.locationtech.geomesa.index.stats.GeoMesaStats -import org.locationtech.geomesa.index.utils.Explainer +import org.locationtech.geomesa.index.utils.{Explainer, Reprojection} import org.locationtech.geomesa.security.{AuthorizationsProvider, SecurityUtils, VisibilityEvaluator} import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder.EncodingOptions @@ -71,7 +71,12 @@ abstract class InMemoryQueryRunner(stats: GeoMesaStats, authProvider: Option[Aut val filter = Option(query.getFilter).filter(_ != Filter.INCLUDE) val iter = features(sft, filter).filter(isVisible(_, auths)) - CloseableIterator(transform(iter, sft, stats, query.getHints, filter)) + val result = CloseableIterator(transform(iter, sft, stats, query.getHints, filter)) + + Reprojection(query) match { + case None => result + case Some(r) => result.map(r.reproject) + } } override protected def optimizeFilter(sft: SimpleFeatureType, filter: Filter): Filter = diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala index c5ec05240ccc..acae49e94f52 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala @@ -22,7 +22,7 @@ import org.locationtech.geomesa.index.api.{GeoMesaFeatureIndex, QueryPlan, Wrapp import org.locationtech.geomesa.index.conf.QueryHints import org.locationtech.geomesa.index.conf.QueryHints.RichHints import org.locationtech.geomesa.index.geotools.GeoMesaDataStore -import org.locationtech.geomesa.index.utils.{ExplainLogging, Explainer} +import org.locationtech.geomesa.index.utils.{ExplainLogging, Explainer, Reprojection} import org.locationtech.geomesa.utils.cache.SoftThreadLocal import org.locationtech.geomesa.utils.collection.{CloseableIterator, SelfClosingIterator} import org.locationtech.geomesa.utils.index.IndexMode @@ -93,7 +93,10 @@ class QueryPlanner[DS <: GeoMesaDataStore[DS, F, W], F <: WrappedFeature, W](ds: iterator = new SortingSimpleFeatureIterator(iterator, sort) } - iterator + Reprojection(query) match { + case None => iterator + case Some(r) => iterator.map(r.reproject) + } } /** diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Reprojection.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Reprojection.scala new file mode 100644 index 000000000000..955de5691a54 --- /dev/null +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Reprojection.scala @@ -0,0 +1,59 @@ +/*********************************************************************** + * Copyright (c) 2013-2018 Commonwealth Computer Research, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License, Version 2.0 + * which accompanies this distribution and is available at + * http://www.opensource.org/licenses/apache2.0.php. + ***********************************************************************/ + +package org.locationtech.geomesa.index.utils + +import com.vividsolutions.jts.geom.Geometry +import org.geotools.data.Query +import org.geotools.feature.FeatureTypes +import org.geotools.geometry.jts.GeometryCoordinateSequenceTransformer +import org.geotools.referencing.CRS +import org.locationtech.geomesa.features.ScalaSimpleFeature +import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} + +class Reprojection private (sft: SimpleFeatureType, transformer: Option[GeometryCoordinateSequenceTransformer]) { + def reproject(feature: SimpleFeature): SimpleFeature = { + val values = Array.tabulate(sft.getAttributeCount) { i => + feature.getAttribute(i) match { + case g: Geometry => transformer.map(_.transform(g)).getOrElse(g) + case a => a + } + } + val result = ScalaSimpleFeature.create(sft, feature.getID, values: _*) + result.getUserData.putAll(feature.getUserData) + result + } +} + +object Reprojection { + + import org.locationtech.geomesa.index.conf.QueryHints.RichHints + + def apply(query: Query): Option[Reprojection] = { + val sft = query.getHints.getReturnSft + if (sft.getGeometryDescriptor == null) { None } else { + val native = sft.getGeometryDescriptor.getCoordinateReferenceSystem + val source = Option(query.getCoordinateSystem).getOrElse(native) + val target = Option(query.getCoordinateSystemReproject).getOrElse(native) + + if (target != source) { + val transformer = new GeometryCoordinateSequenceTransformer + transformer.setMathTransform(CRS.findMathTransform(source, target, true)) + val reprojected = FeatureTypes.transform(sft, target) + reprojected.getUserData.putAll(sft.getUserData) + Some(new Reprojection(reprojected, Some(transformer))) + } else if (source != native) { + val reprojected = FeatureTypes.transform(sft, source) + reprojected.getUserData.putAll(sft.getUserData) + Some(new Reprojection(reprojected, None)) + } else { + None + } + } + } +} diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/geotools/GeoMesaDataStoreTest.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/geotools/GeoMesaDataStoreTest.scala new file mode 100644 index 000000000000..1011ee0cb24b --- /dev/null +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/geotools/GeoMesaDataStoreTest.scala @@ -0,0 +1,65 @@ +/*********************************************************************** + * Copyright (c) 2013-2018 Commonwealth Computer Research, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License, Version 2.0 + * which accompanies this distribution and is available at + * http://www.opensource.org/licenses/apache2.0.php. + ***********************************************************************/ + +package org.locationtech.geomesa.index.geotools + +import com.vividsolutions.jts.geom.{Geometry, Point} +import org.geotools.data.collection.ListFeatureCollection +import org.geotools.data.{Query, Transaction} +import org.geotools.factory.Hints +import org.geotools.geometry.jts.JTS +import org.geotools.referencing.CRS +import org.junit.runner.RunWith +import org.locationtech.geomesa.features.ScalaSimpleFeature +import org.locationtech.geomesa.index.TestGeoMesaDataStore +import org.locationtech.geomesa.utils.collection.SelfClosingIterator +import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes +import org.opengis.feature.simple.SimpleFeature +import org.specs2.mutable.Specification +import org.specs2.runner.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +class GeoMesaDataStoreTest extends Specification { + + import org.locationtech.geomesa.utils.geotools.CRS_EPSG_4326 + + val sft = SimpleFeatureTypes.createType("test", "name:String,age:Int,dtg:Date,*geom:Point:srid=4326") + + val ds = new TestGeoMesaDataStore(true) + ds.createSchema(sft) + + val features = Seq.tabulate(10) { i => + ScalaSimpleFeature.create(sft, s"$i", s"name$i", i, f"2018-01-01T$i%02d:00:00.000Z", s"POINT (4$i 55)") + } + + val epsg3857 = CRS.decode("EPSG:3857") + + step { + features.foreach(_.getUserData.put(Hints.USE_PROVIDED_FID, java.lang.Boolean.TRUE)) + ds.getFeatureSource(sft.getTypeName).addFeatures(new ListFeatureCollection(sft, features.toArray[SimpleFeature])) + } + + "GeoMesaDataStore" should { + "reproject geometries" in { + val query = new Query("test") + query.setCoordinateSystemReproject(epsg3857) + val results = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toSeq + results must haveLength(10) + + val transform = CRS.findMathTransform(epsg3857, CRS_EPSG_4326, true) + + foreach(results) { result => + result.getFeatureType.getGeometryDescriptor.getCoordinateReferenceSystem mustEqual epsg3857 + val recovered = JTS.transform(result.getDefaultGeometry.asInstanceOf[Geometry], transform).asInstanceOf[Point] + val expected = features.find(_.getID == result.getID).get.getDefaultGeometry.asInstanceOf[Point] + recovered.getX must beCloseTo(expected.getX, 0.001) + recovered.getY must beCloseTo(expected.getY, 0.001) + } + } + } +} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geometry/Geometry.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geometry/Geometry.scala index b96d52ca268d..708e88075871 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geometry/Geometry.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geometry/Geometry.scala @@ -11,9 +11,13 @@ package org.locationtech.geomesa.utils.geometry import com.vividsolutions.jts.geom.Polygon import org.geotools.geometry.jts.JTS +@deprecated object Geometry { + + @deprecated val noPolygon : Polygon = null + @deprecated implicit class RichPolygon(self: Polygon) { def getSafeUnion(other: Polygon): Polygon = { if (self != noPolygon && other != noPolygon) { From e8a9013d8cead762bd59e4025cf5d77aa55d3905 Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 21 May 2018 17:29:37 -0400 Subject: [PATCH 22/33] GEOMESA-2212 JSON list converter - handle nulls (#1960) Signed-off-by: Emilio Lahr-Vivaz --- .../geomesa/convert/json/JsonFunctionFactory.scala | 2 +- .../geomesa/convert/json/JsonConverterTest.scala | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala index 4218747d5652..8184401127da 100644 --- a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala @@ -52,7 +52,7 @@ class JsonMapListFunctionFactory extends TransformerFunctionFactory with MapList null } else { import scala.collection.JavaConversions._ - jArr.iterator.toSeq.map(p => convert(getPrimitive(p.getAsJsonPrimitive), clazz)).toList.asJava + jArr.iterator.filterNot(_.isJsonNull).map(p => convert(getPrimitive(p.getAsJsonPrimitive), clazz)).toList.asJava } } diff --git a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala index 22cd916bc6cf..6f276628b39a 100644 --- a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala +++ b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala @@ -811,11 +811,10 @@ class JsonConverterTest extends Specification { | "things": [ | { | "s": "s1", - | "i": 1, | "d": 1.1, | "u": "12345678-1234-1234-1234-123456781234" | }, - { + | { | "s": "s2", | "i": 2, | "d": 2.2, @@ -834,7 +833,7 @@ class JsonConverterTest extends Specification { | { | "id": 1, | "geometry": {"type": "Point", "coordinates": [55, 56]}, - | "i": [1, 2], + | "i": [2], | "d": [1.1, 2.2], | "s": ["s1", "s2"], | "u": ["12345678-1234-1234-1234-123456781234", "00000000-0000-0000-0000-000000000000"] @@ -892,7 +891,7 @@ class JsonConverterTest extends Specification { f.getAttribute("sList").asInstanceOf[java.util.List[String]].toSeq must containTheSameElementsAs(Seq("s1", "s2")) f.getAttribute("iList") must beAnInstanceOf[java.util.List[Integer]] - f.getAttribute("iList").asInstanceOf[java.util.List[Integer]].toSeq must containTheSameElementsAs(Seq(1, 2)) + f.getAttribute("iList").asInstanceOf[java.util.List[Integer]].toSeq must containTheSameElementsAs(Seq(2)) f.getAttribute("dList") must beAnInstanceOf[java.util.List[Double]] f.getAttribute("dList").asInstanceOf[java.util.List[Double]].toSeq must containTheSameElementsAs(Seq(1.1, 2.2)) From 88435a4797ea2c00c408b09611fa571f19f12606 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 7 Jun 2018 11:48:32 -0500 Subject: [PATCH 23/33] GEOMESA-2289 Change Recommended Accumulo/Hadoop versions (#1968) Signed-off-by: Andrew Hulbert --- docs/README.md | 2 +- docs/common.py | 6 ++-- docs/user/accumulo/configuration.rst | 12 ++++---- docs/user/accumulo/install.rst | 41 ++++++++++++++++------------ pom.xml | 4 +-- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/docs/README.md b/docs/README.md index b773121041e1..bffdac3ff80b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -27,7 +27,7 @@ You will also need ``make``. To build HTML versions of the manuals: - $ mvn clean install -Pdocs + $ mvn clean install -Pdocs -pl docs If you do not have Sphinx installed the manual will not be built. The outputted files are written to the ``target/html`` directory. diff --git a/docs/common.py b/docs/common.py index f1ef0e9a8e10..bee90bcc5651 100644 --- a/docs/common.py +++ b/docs/common.py @@ -112,17 +112,17 @@ .. |release_1_2_source_tarball| replace:: %(url_github_archive)s/geomesa-%(release_1_2)s.tar.gz -.. |maven_version| replace:: 3.2.2 or later +.. |maven_version| replace:: 3.5.2 or later .. |geoserver_version| replace:: 2.12.x .. |geotools_version| replace:: 18.x -.. |accumulo_version| replace:: 1.7 or 1.8 +.. |accumulo_version| replace:: 1.9.1 or later .. |hbase_version| replace:: 1.3.x -.. |hadoop_version| replace:: 2.2 or later +.. |hadoop_version| replace:: 2.6 or later .. |zookeeper_version| replace:: 3.4.5 or later diff --git a/docs/user/accumulo/configuration.rst b/docs/user/accumulo/configuration.rst index 298a9c3c3cdb..c127f638aa6d 100644 --- a/docs/user/accumulo/configuration.rst +++ b/docs/user/accumulo/configuration.rst @@ -17,28 +17,28 @@ geomesa.batchwriter.latency The latency is defined as a duration, e.g. ``60 seconds`` or ``100 millis``. See the `Accumulo API`__ for details. -__ https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxLatency(long,%20java.util.concurrent.TimeUnit) +__ https://accumulo.apache.org/1.9/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxLatency(long,%20java.util.concurrent.TimeUnit) geomesa.batchwriter.maxthreads ++++++++++++++++++++++++++++++ Determines the max threads used for writing. See the `Accumulo API`__ for details. -__ https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxWriteThreads(int) +__ https://accumulo.apache.org/1.9/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxWriteThreads(int) geomesa.batchwriter.memory ++++++++++++++++++++++++++ The memory is defined in bytes, e.g. ``10mb`` or ``100kb``. See the `Accumulo API`__ for details. -__ https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxMemory(long) +__ https://accumulo.apache.org/1.9/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setMaxMemory(long) geomesa.batchwriter.timeout.millis ++++++++++++++++++++++++++++++++++ The timeout is defined as a duration, e.g. ``60 seconds`` or ``100 millis``. See the `Accumulo API`__ for details. -__ https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setTimeout(long,%20java.util.concurrent.TimeUnit) +__ https://accumulo.apache.org/1.9/apidocs/org/apache/accumulo/core/client/BatchWriterConfig.html#setTimeout(long,%20java.util.concurrent.TimeUnit) Map Reduce Input Splits Properties ---------------------------------- @@ -46,7 +46,7 @@ Map Reduce Input Splits Properties The following properties control the number of input splits for a map reduce job. See the `Accumulo User Manual`__ for details. -__ https://accumulo.apache.org/1.8/accumulo_user_manual#_splitting +__ https://accumulo.apache.org/1.9/accumulo_user_manual#_splitting geomesa.mapreduce.splits.max ++++++++++++++++++++++++++++ @@ -74,4 +74,4 @@ instance.zookeeper.timeout The Zookeeper timeout is defined in milliseconds, according to the Accumulo specification. See the `Accumulo User Manual`__ for details. -__ https://accumulo.apache.org/1.8/accumulo_user_manual.html#_instance_zookeeper_timeout +__ https://accumulo.apache.org/1.9/accumulo_user_manual.html#_instance_zookeeper_timeout diff --git a/docs/user/accumulo/install.rst b/docs/user/accumulo/install.rst index 513eafc7621d..79ede1a74bce 100644 --- a/docs/user/accumulo/install.rst +++ b/docs/user/accumulo/install.rst @@ -102,7 +102,7 @@ The command line arguments the script accepts are: * -p * -t * -g (optional, will default to the distribution folder and without raster support) -* -h (optional, will attempt to determine if not supplied) +* -h (optional, will attempt to determine if not supplied) Since ``accumulo shell`` does not directly support Kerberos keytabs, if using Kerberos (``-t``) then a cached Kerberos ticket-granting-ticket (TGT) should be obtained using the ``kinit`` command. @@ -331,13 +331,13 @@ The specific JARs needed for some common configurations are listed below: .. tabs:: - .. tab:: Accumulo 1.8 + .. tab:: Accumulo 1.9 - * accumulo-core-1.8.1.jar - * accumulo-fate-1.8.1.jar - * accumulo-server-base-1.8.1.jar - * accumulo-trace-1.8.1.jar - * accumulo-start-1.8.1.jar + * accumulo-core-1.9.1.jar + * accumulo-fate-1.9.1.jar + * accumulo-server-base-1.9.1.jar + * accumulo-trace-1.9.1.jar + * accumulo-start-1.9.1.jar * libthrift-0.9.3.jar * zookeeper-3.4.10.jar * htrace-core-3.1.0-incubating.jar @@ -345,11 +345,11 @@ The specific JARs needed for some common configurations are listed below: .. tab:: Accumulo 1.7 - * accumulo-core-1.7.3.jar - * accumulo-fate-1.7.3.jar - * accumulo-server-base-1.7.3.jar - * accumulo-trace-1.7.3.jar - * accumulo-start-1.7.3.jar + * accumulo-core-1.7.4.jar + * accumulo-fate-1.7.4.jar + * accumulo-server-base-1.7.4.jar + * accumulo-trace-1.7.4.jar + * accumulo-start-1.7.4.jar * libthrift-0.9.1.jar * zookeeper-3.4.10.jar * htrace-core-3.1.0-incubating.jar @@ -368,15 +368,15 @@ The specific JARs needed for some common configurations are listed below: .. tabs:: - .. tab:: Hadoop 2.6-2.8 + .. tab:: Hadoop 2.6-2.9 (adjust versions as needed) * commons-configuration-1.6.jar - * hadoop-auth-2.7.4.jar - * hadoop-client-2.7.4.jar - * hadoop-common-2.7.4.jar - * hadoop-hdfs-2.7.4.jar + * hadoop-auth-2.8.4.jar + * hadoop-client-2.8.4.jar + * hadoop-common-2.8.4.jar + * hadoop-hdfs-2.8.4.jar Restart GeoServer after the JARs are installed. @@ -386,12 +386,17 @@ Accumulo Versions .. note:: - GeoMesa targets Accumulo 1.8 as a runtime dependency. Most artifacts will work with older versions + GeoMesa targets Accumulo 1.9 as a runtime dependency. Most artifacts will work with older versions of Accumulo without changes, however some artifacts which bundle Accumulo will need to be built manually. Accumulo 1.8 introduced a dependency on libthrift version 0.9.3 which is not compatible with Accumulo 1.7/libthrift 0.9.1. To target an earlier Accumulo version, modify ```` and ```` in the main pom.xml and re-build. +.. warning:: + + There are severe issues with Accumulo versions 1.8.0-1.9.0 and the Accumulo team recommends immediately + upgrading to 1.9.1 or higher. + .. _install_geomesa_process: GeoMesa Process diff --git a/pom.xml b/pom.xml index c8fab0c93523..69c52e07be48 100644 --- a/pom.xml +++ b/pom.xml @@ -101,9 +101,9 @@ - 1.8.1 + 1.9.1 1.3.1 - 2.7.4 + 2.8.4 3.4.10 From a52cc296c2c8d36e3ab586742887623f3c2981a1 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Jun 2018 12:19:14 -0500 Subject: [PATCH 24/33] GEOMESA-2291 CQEngine - handle filter functions, etc (#1969) * Handles the cases around (in)equalities. Signed-off-by: Jim Hughes --- .../cqengine/utils/CQEngineQueryVisitor.scala | 40 +++++++++++++------ .../cqengine/utils/GeoCQEngineTest.scala | 1 + .../cqengine/utils/SampleFeatures.scala | 15 +++++++ 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQEngineQueryVisitor.scala b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQEngineQueryVisitor.scala index c244dc95b41e..506071c7cb21 100644 --- a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQEngineQueryVisitor.scala +++ b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQEngineQueryVisitor.scala @@ -13,6 +13,7 @@ import java.util.regex.Pattern import com.googlecode.cqengine.attribute.Attribute import com.googlecode.cqengine.query.Query +import com.googlecode.cqengine.query.simple.All import com.googlecode.cqengine.{query => cqquery} import com.vividsolutions.jts.geom.Geometry import org.geotools.filter.LikeToRegexConverter @@ -46,7 +47,11 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case _ => throw new RuntimeException(s"Can't parse filter: $f.") } }.toList - new cqquery.logical.And[SimpleFeature](query) + if (query.exists(_.isInstanceOf[All[_]])) { + new cqquery.simple.All(classOf[SimpleFeature]) + } else { + new cqquery.logical.And[SimpleFeature](query) + } } /** @@ -61,7 +66,11 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case _ => throw new RuntimeException(s"Can't parse filter: $f.") } }.toList - new cqquery.logical.Or[SimpleFeature](query) + if (query.exists(_.isInstanceOf[All[_]])) { + new cqquery.simple.All(classOf[SimpleFeature]) + } else { + new cqquery.logical.Or[SimpleFeature](query) + } } /** @@ -74,7 +83,14 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case q: Query[SimpleFeature] => q case _ => throw new RuntimeException(s"Can't parse filter: $subfilter.") } - new cqquery.logical.Not[SimpleFeature](subquery) + // In the event that the visitor cannot 'plan' a query, it returns an 'All' Query to indicate + // that all the Simple Features should be considered. + // As such, we do not negate the query going back. + if (subquery.isInstanceOf[All[_]]) { + subquery + } else { + new cqquery.logical.Not[SimpleFeature](subquery) + } } /* Id, null, nil, exclude, include */ @@ -128,7 +144,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor val name = getAttribute(filter) val attribute: Attribute[SimpleFeature, Any] = lookup.lookup[Any](name) val bounds = FilterHelper.extractAttributeBounds(filter, name, attribute.getAttributeType).values.headOption.getOrElse { - throw new RuntimeException(s"Can't parse equals values ${filterToString(filter)}") + Bounds.everything[Any] } if(!bounds.isBounded) new cqquery.simple.All(classOf[SimpleFeature]) else new cqquery.simple.Equal(attribute, bounds.lower.value.get) @@ -141,7 +157,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor val name = getAttribute(filter) val binding = sft.getDescriptor(name).getType.getBinding FilterHelper.extractAttributeBounds(filter, name, binding).values.headOption.getOrElse { - throw new RuntimeException(s"Can't parse greater than values ${filterToString(filter)}") + Bounds.everything[Any] }.bounds match { case (Some(lo), None) => binding match { @@ -163,7 +179,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case c if classOf[java.lang.String ].isAssignableFrom(c) => BuildStringLTQuery(name, hi.asInstanceOf[java.lang.String]) case c => throw new RuntimeException(s"PropertyIsGreaterThan: $c not supported") } - case _ => throw new RuntimeException(s"Can't parse greater than values ${filterToString(filter)}") + case _ => new cqquery.simple.All(classOf[SimpleFeature]) } } @@ -174,7 +190,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor val name = getAttribute(filter) val binding = sft.getDescriptor(name).getType.getBinding FilterHelper.extractAttributeBounds(filter, name, binding).values.headOption.getOrElse { - throw new RuntimeException(s"Can't parse greater than or equal to values ${filterToString(filter)}") + Bounds.everything[Any] }.bounds match { case (Some(lo), None) => binding match { @@ -196,7 +212,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case c if classOf[java.lang.String ].isAssignableFrom(c) => BuildStringLTEQuery(name, hi.asInstanceOf[java.lang.String]) case c => throw new RuntimeException(s"PropertyIsGreaterThanOrEqualTo: $c not supported") } - case _ => throw new RuntimeException(s"Can't parse greater than or equal to values ${filterToString(filter)}") + case _ => new cqquery.simple.All(classOf[SimpleFeature]) } } @@ -207,7 +223,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor val name = getAttribute(filter) val binding = sft.getDescriptor(name).getType.getBinding FilterHelper.extractAttributeBounds(filter, name, binding).values.headOption.getOrElse { - throw new RuntimeException(s"Can't parse less than values ${filterToString(filter)}") + Bounds.everything[Any] }.bounds match { case (Some(lo), None) => binding match { @@ -229,7 +245,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case c if classOf[java.lang.String ].isAssignableFrom(c) => BuildStringLTQuery(name, hi.asInstanceOf[java.lang.String]) case c => throw new RuntimeException(s"PropertyIsLessThan: $c not supported") } - case _ => throw new RuntimeException(s"Can't parse less than values ${filterToString(filter)}") + case _ => new cqquery.simple.All(classOf[SimpleFeature]) } } @@ -240,7 +256,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor val name = getAttribute(filter) val binding = sft.getDescriptor(name).getType.getBinding FilterHelper.extractAttributeBounds(filter, name, binding).values.headOption.getOrElse { - throw new RuntimeException(s"Can't parse less than or equal to values ${filterToString(filter)}") + Bounds.everything[Any] }.bounds match { case (Some(lo), None) => binding match { @@ -262,7 +278,7 @@ class CQEngineQueryVisitor(sft: SimpleFeatureType) extends AbstractFilterVisitor case c if classOf[java.lang.String ].isAssignableFrom(c) => BuildStringLTEQuery(name, hi.asInstanceOf[java.lang.String]) case c => throw new RuntimeException(s"PropertyIsLessThanOrEqualTo: $c not supported") } - case _ => throw new RuntimeException(s"Can't parse less than or equal to values ${filterToString(filter)}") + case _ => new cqquery.simple.All(classOf[SimpleFeature]) } } diff --git a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala index 6937cb3c1369..a7d8b2241bba 100644 --- a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala +++ b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala @@ -93,6 +93,7 @@ class GeoCQEngineTest extends Specification with LazyLogging { runFilterTests("attribute predicates", attributePredicates) + runFilterTests("function predicates", functionPredicates) } } diff --git a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/SampleFeatures.scala b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/SampleFeatures.scala index d20ec834872d..cd4033681202 100644 --- a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/SampleFeatures.scala +++ b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/SampleFeatures.scala @@ -259,4 +259,19 @@ object SampleFilters { "Who ILIKE 'ADD%'", "Who ILIKE '%DA%'" ) + + val functionPredicates: Seq[Filter] = Seq( + "strConcat(Who, What) = 'Addams1'", + "WhatLong * WhatDouble > 1.0", + "WhatLong * WhatDouble < 1.0", + "WhatLong * WhatDouble >= 1.0", + "WhatLong * WhatDouble <= 1.0", + "WhatLong * WhatDouble <> 1.0", + "strConcat(Who, What) = 'Addams1' AND WhatLong * WhatDouble < 1.0", + "WhatLong * WhatDouble > 1.0 AND WhatLong * WhatDouble < 2.0", + "WhatLong * WhatDouble >= 1.0 AND WhatLong * WhatDouble <= 2.0", + "strConcat(Who, What) = 'Addams1' OR WhatLong * WhatDouble < 1.0", + "WhatLong * WhatDouble > 1.0 OR WhatLong * WhatDouble < 2.0", + "WhatLong * WhatDouble >= 1.0 OR WhatLong * WhatDouble <= 2.0" + ) } From 1007ea41953d1c26a854a9c2fa8700d09ea73ead Mon Sep 17 00:00:00 2001 From: Emilio Date: Thu, 7 Jun 2018 13:23:30 -0400 Subject: [PATCH 25/33] GEOMESA-2292 Adding handling for 'attribute is not null' in stats-based cost estimates (#1970) Signed-off-by: Emilio Lahr-Vivaz --- .../index/stats/MetadataBackedStats.scala | 2 +- .../index/stats/StatsBasedEstimator.scala | 21 +++++-- .../index/stats/StatsBasedEstimatorTest.scala | 60 +++++++++++++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimatorTest.scala diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala index 01bc80622b20..58b6a61bc902 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala @@ -91,7 +91,7 @@ trait MetadataBackedStats extends GeoMesaStats with StatsBasedEstimator with Laz val geomDtgOption = for { geom <- Option(sft.getGeomField) dtg <- sft.getDtgField - if toRetrieve.exists(_ == geom) && toRetrieve.exists(_ == dtg) + if toRetrieve.contains(geom) && toRetrieve.contains(dtg) } yield { (geom, dtg) } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimator.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimator.scala index 94d31a119715..6c5471253bef 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimator.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimator.scala @@ -21,6 +21,7 @@ import org.locationtech.geomesa.utils.stats._ import org.locationtech.sfcurve.IndexRange import org.opengis.feature.simple.SimpleFeatureType import org.opengis.filter._ +import org.opengis.filter.expression.PropertyName import scala.collection.JavaConversions._ @@ -132,11 +133,21 @@ trait StatsBasedEstimator { filter: Not, loDate: Option[Date], hiDate: Option[Date]): Option[Long] = { - for { - all <- estimateCount(sft, Filter.INCLUDE, None, None) - neg <- estimateCount(sft, filter.getFilter, loDate, hiDate) - } yield { - math.max(0, all - neg) + filter.getFilter match { + case f: PropertyIsNull => + // special handling for 'is not null' + f.getExpression match { + case p: PropertyName => estimateRangeCount(sft, p.getPropertyName, Seq((None, None))) + case _ => estimateCount(sft, Filter.INCLUDE, None, None) // not something we can handle... + } + + case f => + for { + all <- estimateCount(sft, Filter.INCLUDE, None, None) + neg <- estimateCount(sft, f, loDate, hiDate) + } yield { + math.max(0, all - neg) + } } } diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimatorTest.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimatorTest.scala new file mode 100644 index 000000000000..3eb01e881d26 --- /dev/null +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/stats/StatsBasedEstimatorTest.scala @@ -0,0 +1,60 @@ +/*********************************************************************** + * Copyright (c) 2013-2018 Commonwealth Computer Research, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License, Version 2.0 + * which accompanies this distribution and is available at + * http://www.opensource.org/licenses/apache2.0.php. + ***********************************************************************/ + +package org.locationtech.geomesa.index.stats + +import org.geotools.data.Query +import org.geotools.data.collection.ListFeatureCollection +import org.geotools.factory.Hints +import org.geotools.filter.text.ecql.ECQL +import org.junit.runner.RunWith +import org.locationtech.geomesa.features.ScalaSimpleFeature +import org.locationtech.geomesa.index.TestGeoMesaDataStore +import org.locationtech.geomesa.index.TestGeoMesaDataStore.TestZ3Index +import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes +import org.opengis.feature.simple.SimpleFeature +import org.specs2.mutable.Specification +import org.specs2.runner.JUnitRunner + +@RunWith(classOf[JUnitRunner]) +class StatsBasedEstimatorTest extends Specification { + + val sft = SimpleFeatureTypes.createType("test", "trackId:String:index=true,dtg:Date,*geom:Point:srid=4326") + + val ds = new TestGeoMesaDataStore(true) + + val features = Seq.tabulate(10) { i => + ScalaSimpleFeature.create(sft, s"$i", s"track-$i", f"2018-01-01T$i%02d:00:00.000Z", s"POINT (4$i 55)") + } + + step { + ds.createSchema(sft) + features.foreach(_.getUserData.put(Hints.USE_PROVIDED_FID, java.lang.Boolean.TRUE)) + ds.getFeatureSource(sft.getTypeName).addFeatures(new ListFeatureCollection(sft, features.toArray[SimpleFeature])) + } + + "StatsBasedEstimator" should { + "handle not null counts" in { + ds.stats.getCount(sft, ECQL.toFilter("trackId is not null")) must beSome(10L) + } + "select better query plans over not null" in { + val filter = ECQL.toFilter("NOT (trackId IS NULL) AND " + + "dtg > 2018-01-01T00:00:00+00:00 AND dtg < 2018-01-01T08:00:00+00:00 AND " + + "CONTAINS(POLYGON ((44 54, 44 56, 48 56, 48 54, 44 54)), geom) AND " + + "NOT (dtg IS NULL) AND " + + "INCLUDE") + val plans = ds.getQueryPlan(new Query(sft.getTypeName, filter, Array("trackId", "dtg"))) + plans must haveLength(1) + plans.head.index must beAnInstanceOf[TestZ3Index] + } + } + + step { + ds.dispose() + } +} From e999549b0431ab4920d4fb20f3eb0dba39072f2d Mon Sep 17 00:00:00 2001 From: Emilio Date: Thu, 7 Jun 2018 13:30:54 -0400 Subject: [PATCH 26/33] GEOMESA-2293 Fixing query planning import statement in docs (#1971) Signed-off-by: Emilio Lahr-Vivaz --- docs/user/datastores/query_config.rst | 10 +++++++--- docs/user/datastores/query_planning.rst | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/user/datastores/query_config.rst b/docs/user/datastores/query_config.rst index c9d1c4555a54..5bb590bc2ca8 100644 --- a/docs/user/datastores/query_config.rst +++ b/docs/user/datastores/query_config.rst @@ -153,6 +153,10 @@ As explained above, GeoMesa uses cost-based query planning to determine the best If cost-based query planning is not working as desired, the legacy heuristic-based query planning can be used as a fall-back. ``Stats`` uses cost-based planning; ``Index`` uses heuristic-based planning. +Query planning can also be controlled through the system property ``geomesa.query.cost.type``. See +:ref:`geomesa_site_xml` for details. If both a query hint and a system property are set, the query hint will +take precedence. + ========================== ================== ====================== Key Type GeoServer Conversion ========================== ================== ====================== @@ -164,14 +168,14 @@ QueryHints.COST_EVALUATION ``CostEvaluation`` ``stats`` or ``index`` .. code-tab:: java - import org.locationtech.geomesa.index.api.QueryPlanner.CostEvaluation; + import org.locationtech.geomesa.index.planning.QueryPlanner.CostEvaluation; import org.locationtech.geomesa.index.conf.QueryHints; query.getHints().put(QueryHints.COST_EVALUATION(), CostEvaluation.Index()); .. code-tab:: scala - import org.locationtech.geomesa.index.api.QueryPlanner.CostEvaluation + import org.locationtech.geomesa.index.planning.QueryPlanner.CostEvaluation import org.locationtech.geomesa.index.conf.QueryHints query.getHints.put(QueryHints.COST_EVALUATION, CostEvaluation.Index) @@ -180,4 +184,4 @@ QueryHints.COST_EVALUATION ``CostEvaluation`` ``stats`` or ``index`` ...&viewparams=COST_EVALUATION:index -For more details, see :ref:`query_planning`. +See :ref:`query_planning` for more information on query planning strategies. diff --git a/docs/user/datastores/query_planning.rst b/docs/user/datastores/query_planning.rst index 48a422779b72..67133356ae52 100644 --- a/docs/user/datastores/query_planning.rst +++ b/docs/user/datastores/query_planning.rst @@ -133,4 +133,4 @@ Using the binary distribution, you can print out an explain plan using the ``exp GeoServer ^^^^^^^^^ -For enabling explain loggingn in GeoServer, see :ref:`geoserver_explain_query`. +For enabling explain logging in GeoServer, see :ref:`geoserver_explain_query`. From 430490d6ed3df165fb452ea59b91728c60bc4825 Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 11 Jun 2018 10:18:16 -0400 Subject: [PATCH 27/33] GEOMESA-2294 Update ORC version to 1.4.4 (#1972) Signed-off-by: Emilio Lahr-Vivaz --- build/cqs.tsv | 5 ++--- pom.xml | 16 +++++----------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/build/cqs.tsv b/build/cqs.tsv index d5bd33e09de3..ca7c075f854c 100644 --- a/build/cqs.tsv +++ b/build/cqs.tsv @@ -68,7 +68,6 @@ de.topobyte:osm4j-utils 0.0.22 compile de.topobyte:osm4j-xml 0.0.3 compile eu.medsea.mimeutil:mime-util 2.1.3 compile io.airlift:aircompressor 0.8 compile -io.airlift:slice 0.29 compile io.dropwizard.metrics:metrics-core 3.1.2 compile io.dropwizard.metrics:metrics-ganglia 3.1.2 compile io.dropwizard.metrics:metrics-graphite 3.1.2 compile @@ -148,8 +147,8 @@ org.apache.hive:hive-storage-api 2.2.1 compile org.apache.htrace:htrace-core 3.1.0-incubating compile org.apache.metamodel:MetaModel-core 4.3.6 compile org.apache.metamodel:MetaModel-pojo 4.3.6 compile -org.apache.orc:orc-core 1.4.1 compile -org.apache.orc:orc-mapreduce 1.4.1 compile +org.apache.orc:orc-core 1.4.4 compile +org.apache.orc:orc-mapreduce 1.4.4 compile org.apache.parquet:parquet-column 1.9.0 compile org.apache.parquet:parquet-common 1.9.0 compile org.apache.parquet:parquet-encoding 1.9.0 compile diff --git a/pom.xml b/pom.xml index 69c52e07be48..bdf4ef3fab60 100644 --- a/pom.xml +++ b/pom.xml @@ -75,11 +75,14 @@ 1.14.0 1.7.5 1.9.0 + 1.4.4 1.9.3 2.0.0 3.2.10 2.3.0 3.0.3 + 0.6.0 + 4.0.41.Final @@ -96,9 +99,6 @@ 0.10 5.0.4 - 0.6.0 - 4.0.41.Final - 1.9.1 @@ -123,12 +123,6 @@ 4.12 2.3.13 - - accumulo/lib/ext - hdfs - geoserver/WEB-INF/lib - dev - -Duser.timezone=UTC -Xms1g -Xmx8g -XX:-UseGCOverheadLimit -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dgeomesa.scan.ranges.target=500 1 @@ -2035,7 +2029,7 @@ org.apache.orc orc-core - 1.4.1 + ${orc.version} @@ -2047,7 +2041,7 @@ org.apache.orc orc-mapreduce - 1.4.1 + ${orc.version} org.codehaus.jackson From 77765c9febb08ea6d43b74738ee71baa5b3181f6 Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Mon, 11 Jun 2018 11:04:34 -0400 Subject: [PATCH 28/33] Updating release version in README --- README.md | 20 ++++++++++---------- pom.xml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cf86751072a3..42388e70c8d2 100644 --- a/README.md +++ b/README.md @@ -35,16 +35,16 @@ geospatial analytics. ## Downloads -**Current release: 2.0.0** +**Current release: 2.0.2**      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.0/geomesa-hbase_2.11-2.0.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.0/geomesa-accumulo_2.11-2.0.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.0/geomesa-cassandra_2.11-2.0.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.0/geomesa-kafka_2.11-2.0.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.0/geomesa-fs_2.11-2.0.0-bin.tar.gz) | - [**Source**](https://github.com/locationtech/geomesa/archive/geomesa_2.11-2.0.0.tar.gz) | - [**CheckSums**](https://github.com/locationtech/geomesa/releases/geomesa_2.11-2.0.0) + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.2/geomesa-hbase_2.11-2.0.2-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.2/geomesa-accumulo_2.11-2.0.2-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.2/geomesa-cassandra_2.11-2.0.2-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.2/geomesa-kafka_2.11-2.0.2-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa_2.11-2.0.2/geomesa-fs_2.11-2.0.2-bin.tar.gz) | + [**Source**](https://github.com/locationtech/geomesa/archive/geomesa_2.11-2.0.2.tar.gz) | + [**CheckSums**](https://github.com/locationtech/geomesa/releases/geomesa_2.11-2.0.2) **Development version: 2.1.0-SNAPSHOT**   [![Build Status](https://api.travis-ci.org/locationtech/geomesa.svg?branch=master)](https://travis-ci.org/locationtech/geomesa) @@ -109,7 +109,7 @@ and then include the desired `geomesa-*` dependencies: org.locationtech.geomesa geomesa-utils_2.11 - 2.0.0 + 2.0.2 ... ``` @@ -156,7 +156,7 @@ resolvers ++= Seq( // Select desired modules libraryDependencies ++= Seq( - "org.locationtech.geomesa" %% "geomesa-utils" % "2.0.0", + "org.locationtech.geomesa" %% "geomesa-utils" % "2.0.2", ... ) ``` diff --git a/pom.xml b/pom.xml index bdf4ef3fab60..69df316c2b92 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ UTF-8 - 2.0.1 + 2.0.2 2.1.0-SNAPSHOT From 793e18b0e67d977d976e7c69f1380b17ebebaf2e Mon Sep 17 00:00:00 2001 From: Emilio Date: Mon, 11 Jun 2018 12:08:25 -0400 Subject: [PATCH 29/33] GEOMESA-2299 Fixing Bigtable SpatialRDDProvider (#1974) Signed-off-by: Emilio Lahr-Vivaz --- .../spark/BigtableSparkRDDProvider.scala | 19 ++++++------ .../hbase/jobs/GeoMesaHBaseInputFormat.scala | 30 ++++++++++++++----- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/geomesa-bigtable/geomesa-bigtable-spark/src/main/scala/org/locationtech/geomesa/bigtable/spark/BigtableSparkRDDProvider.scala b/geomesa-bigtable/geomesa-bigtable-spark/src/main/scala/org/locationtech/geomesa/bigtable/spark/BigtableSparkRDDProvider.scala index 2a256a6e35a3..87a7cf490e5e 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/src/main/scala/org/locationtech/geomesa/bigtable/spark/BigtableSparkRDDProvider.scala +++ b/geomesa-bigtable/geomesa-bigtable-spark/src/main/scala/org/locationtech/geomesa/bigtable/spark/BigtableSparkRDDProvider.scala @@ -19,8 +19,9 @@ import org.apache.spark.SparkContext import org.geotools.data.{DataStoreFinder, Query} import org.geotools.filter.text.ecql.ECQL import org.locationtech.geomesa.bigtable.data.BigtableDataStoreFactory +import org.locationtech.geomesa.filter.factory.FastFilterFactory import org.locationtech.geomesa.hbase.data.{EmptyPlan, HBaseDataStore} -import org.locationtech.geomesa.hbase.index.HBaseFeatureIndex +import org.locationtech.geomesa.hbase.index.{HBaseFeatureIndex, HBaseIndexAdapter} import org.locationtech.geomesa.hbase.jobs.HBaseGeoMesaRecordReader import org.locationtech.geomesa.jobs.GeoMesaConfigurator import org.locationtech.geomesa.spark.SpatialRDD @@ -92,11 +93,11 @@ class GeoMesaBigtableInputFormat extends InputFormat[Text, SimpleFeature] { var delegate: BigtableInputFormat = _ var sft: SimpleFeatureType = _ - var table: HBaseFeatureIndex = _ + var table: HBaseIndexAdapter = _ - private def init(conf: Configuration) = if (sft == null) { + private def init(conf: Configuration): Unit = if (sft == null) { sft = GeoMesaConfigurator.getSchema(conf) - table = HBaseFeatureIndex.index(GeoMesaConfigurator.getIndexIn(conf)) + table = HBaseFeatureIndex.index(GeoMesaConfigurator.getIndexIn(conf)).asInstanceOf[HBaseIndexAdapter] delegate = new BigtableInputFormat(TableName.valueOf(GeoMesaConfigurator.getTable(conf))) delegate.setConf(conf) // see TableMapReduceUtil.java @@ -117,11 +118,10 @@ class GeoMesaBigtableInputFormat extends InputFormat[Text, SimpleFeature] { context: TaskAttemptContext): RecordReader[Text, SimpleFeature] = { init(context.getConfiguration) val rr = delegate.createRecordReader(split, context) - val transformSchema = GeoMesaConfigurator.getTransformSchema(context.getConfiguration) - val q = GeoMesaConfigurator.getFilter(context.getConfiguration).map { f => ECQL.toFilter(f) } - new HBaseGeoMesaRecordReader(sft, table, rr, q, transformSchema) + val transform = GeoMesaConfigurator.getTransformSchema(context.getConfiguration) + val ecql = GeoMesaConfigurator.getFilter(context.getConfiguration).map(FastFilterFactory.toFilter(sft, _)) + new HBaseGeoMesaRecordReader(table, sft, ecql, transform, rr, false) } - } object BigtableInputFormat { @@ -133,7 +133,7 @@ class BigtableInputFormat(val name: TableName) extends BigtableInputFormatBase w setName(name) /** The configuration. */ - private var conf: Configuration = null + private var conf: Configuration = _ /** @@ -161,4 +161,3 @@ class BigtableInputFormat(val name: TableName) extends BigtableInputFormatBase w setScans(s) } } - diff --git a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala index b69ca647a670..2a1796796024 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala +++ b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala @@ -16,14 +16,12 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable import org.apache.hadoop.hbase.mapreduce.{MultiTableInputFormat, TableInputFormat} import org.apache.hadoop.io.Text import org.apache.hadoop.mapreduce._ -import org.geotools.filter.identity.FeatureIdImpl -import org.geotools.process.vector.TransformProcess +import org.locationtech.geomesa.filter.factory.FastFilterFactory import org.locationtech.geomesa.hbase.data.HBaseConnectionPool import org.locationtech.geomesa.hbase.index.{HBaseFeatureIndex, HBaseIndexAdapter} import org.locationtech.geomesa.jobs.GeoMesaConfigurator import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} - -import scala.util.control.NonFatal +import org.opengis.filter.Filter /** * Input format that allows processing of simple features from GeoMesa based on a CQL query @@ -59,18 +57,23 @@ class GeoMesaHBaseInputFormat extends InputFormat[Text, SimpleFeature] with Lazy context: TaskAttemptContext): RecordReader[Text, SimpleFeature] = { init(context.getConfiguration) val rr = delegate.createRecordReader(split, context) + val ecql = GeoMesaConfigurator.getFilter(context.getConfiguration).map(FastFilterFactory.toFilter(sft, _)) val transform = GeoMesaConfigurator.getTransformSchema(context.getConfiguration) - // transforms are pushed down in HBase - new HBaseGeoMesaRecordReader(table, sft, transform, rr) + // TODO GEOMESA-2300 support local filtering + new HBaseGeoMesaRecordReader(table, sft, ecql, transform, rr, true) } } class HBaseGeoMesaRecordReader(table: HBaseIndexAdapter, sft: SimpleFeatureType, + ecql: Option[Filter], transform: Option[SimpleFeatureType], - reader: RecordReader[ImmutableBytesWritable, Result]) + reader: RecordReader[ImmutableBytesWritable, Result], + remoteFiltering: Boolean) extends RecordReader[Text, SimpleFeature] with LazyLogging { + import scala.collection.JavaConverters._ + private val results = new Iterator[Result] { private var current: Result = _ @@ -93,7 +96,18 @@ class HBaseGeoMesaRecordReader(table: HBaseIndexAdapter, } } - private val features = table.resultsToFeatures(sft, transform.getOrElse(sft))(results) + private val features = + if (remoteFiltering) { + // transforms and filter are pushed down, so we don't have to deal with them here + table.resultsToFeatures(sft, transform.getOrElse(sft))(results) + } else { + // TODO GEOMESA-2300 this doesn't handle anything beyond simple attribute projection + val transforms = transform.map { tsft => + (tsft.getAttributeDescriptors.asScala.map(d => s"${d.getLocalName}=${d.getLocalName}").mkString(";"), tsft) + } + table.resultsToFeatures(sft, ecql, transforms)(results) + } + private var staged: SimpleFeature = _ override def initialize(split: InputSplit, context: TaskAttemptContext): Unit = reader.initialize(split, context) From 4e59c0952f46824ef31cbbc9b5152e44c70c1c8f Mon Sep 17 00:00:00 2001 From: Emilio Lahr-Vivaz Date: Mon, 11 Jun 2018 12:18:26 -0400 Subject: [PATCH 30/33] [maven-release-plugin] prepare release geomesa_2.11-2.0.2 --- docs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-compute/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-datastore/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-dist/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-jobs/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-native-api/pom.xml | 2 +- .../geomesa-accumulo-raster-distributed-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-raster/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-security/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-spark/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml | 2 +- geomesa-accumulo/geomesa-accumulo-tools/pom.xml | 2 +- geomesa-accumulo/pom.xml | 2 +- geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml | 2 +- geomesa-archetypes/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-datastore/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-dist/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-gt/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-jts/pom.xml | 2 +- geomesa-arrow/geomesa-arrow-tools/pom.xml | 2 +- geomesa-arrow/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-datastore/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-dist/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-spark/pom.xml | 2 +- geomesa-bigtable/geomesa-bigtable-tools/pom.xml | 2 +- geomesa-bigtable/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-api/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml | 2 +- .../geomesa-blobstore-exif-handler/pom.xml | 2 +- .../geomesa-blobstore-gdal-handler/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-handlers/pom.xml | 2 +- geomesa-blobstore/geomesa-blobstore-web/pom.xml | 2 +- geomesa-blobstore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-datastore/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-dist/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml | 2 +- geomesa-cassandra/geomesa-cassandra-tools/pom.xml | 2 +- geomesa-cassandra/pom.xml | 2 +- geomesa-convert/geomesa-convert-all/pom.xml | 2 +- geomesa-convert/geomesa-convert-avro/pom.xml | 2 +- geomesa-convert/geomesa-convert-common/pom.xml | 2 +- geomesa-convert/geomesa-convert-fixedwidth/pom.xml | 2 +- geomesa-convert/geomesa-convert-jdbc/pom.xml | 2 +- geomesa-convert/geomesa-convert-json/pom.xml | 2 +- geomesa-convert/geomesa-convert-osm/pom.xml | 2 +- geomesa-convert/geomesa-convert-redis-cache/pom.xml | 2 +- geomesa-convert/geomesa-convert-scripting/pom.xml | 2 +- geomesa-convert/geomesa-convert-simplefeature/pom.xml | 2 +- geomesa-convert/geomesa-convert-text/pom.xml | 2 +- geomesa-convert/geomesa-convert-xml/pom.xml | 2 +- geomesa-convert/pom.xml | 2 +- geomesa-features/geomesa-feature-all/pom.xml | 2 +- geomesa-features/geomesa-feature-avro/pom.xml | 2 +- geomesa-features/geomesa-feature-common/pom.xml | 2 +- geomesa-features/geomesa-feature-kryo/pom.xml | 2 +- geomesa-features/geomesa-feature-nio/pom.xml | 2 +- geomesa-features/pom.xml | 2 +- geomesa-filter/pom.xml | 2 +- geomesa-fs/geomesa-fs-datastore/pom.xml | 2 +- geomesa-fs/geomesa-fs-dist/pom.xml | 2 +- geomesa-fs/geomesa-fs-gs-plugin/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark-runtime/pom.xml | 2 +- geomesa-fs/geomesa-fs-spark/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-common/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml | 2 +- .../geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml | 2 +- geomesa-fs/geomesa-fs-storage/pom.xml | 2 +- geomesa-fs/geomesa-fs-tools/pom.xml | 2 +- geomesa-fs/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-api/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml | 2 +- geomesa-geojson/geomesa-geojson-rest/pom.xml | 2 +- geomesa-geojson/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-datastore/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-dist/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-jobs/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-native-api/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-spark/pom.xml | 2 +- geomesa-hbase/geomesa-hbase-tools/pom.xml | 2 +- geomesa-hbase/pom.xml | 2 +- geomesa-index-api/pom.xml | 2 +- geomesa-jobs/pom.xml | 2 +- geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml | 2 +- geomesa-jupyter/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-datastore/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-dist/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-tools/pom.xml | 2 +- geomesa-kafka/geomesa-kafka-utils/pom.xml | 2 +- geomesa-kafka/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-datastore/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-dist/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml | 2 +- geomesa-lambda/geomesa-lambda-tools/pom.xml | 2 +- geomesa-lambda/pom.xml | 2 +- geomesa-memory/geomesa-cqengine-datastore/pom.xml | 2 +- geomesa-memory/geomesa-cqengine/pom.xml | 2 +- geomesa-memory/pom.xml | 2 +- geomesa-metrics/pom.xml | 2 +- geomesa-native-api/pom.xml | 2 +- geomesa-process/geomesa-process-vector/pom.xml | 2 +- geomesa-process/geomesa-process-wps/pom.xml | 2 +- geomesa-process/pom.xml | 2 +- geomesa-security/pom.xml | 2 +- geomesa-spark/geomesa-spark-converter/pom.xml | 2 +- geomesa-spark/geomesa-spark-core/pom.xml | 2 +- geomesa-spark/geomesa-spark-geotools/pom.xml | 2 +- geomesa-spark/geomesa-spark-jts/pom.xml | 2 +- geomesa-spark/geomesa-spark-sql/pom.xml | 2 +- geomesa-spark/geomesa_pyspark/pom.xml | 2 +- geomesa-spark/pom.xml | 2 +- geomesa-stream/geomesa-stream-api/pom.xml | 2 +- geomesa-stream/geomesa-stream-datastore/pom.xml | 2 +- geomesa-stream/geomesa-stream-generic/pom.xml | 2 +- geomesa-stream/geomesa-stream-gs-plugin/pom.xml | 2 +- geomesa-stream/pom.xml | 2 +- geomesa-test/pom.xml | 2 +- geomesa-tools/pom.xml | 2 +- geomesa-utils/pom.xml | 2 +- geomesa-web/geomesa-web-core/pom.xml | 2 +- geomesa-web/geomesa-web-data/pom.xml | 2 +- geomesa-web/geomesa-web-install/pom.xml | 2 +- geomesa-web/geomesa-web-stats/pom.xml | 2 +- geomesa-web/pom.xml | 2 +- geomesa-z3/pom.xml | 2 +- geomesa-zk-utils/pom.xml | 2 +- pom.xml | 4 ++-- 139 files changed, 140 insertions(+), 140 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bf11f47728f9..1abae5f0209c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml index 2e68dea8a5d4..945c152b7a77 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-compute/pom.xml @@ -11,7 +11,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index c7f8fc38221c..1e04b7e9240d 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -13,7 +13,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 geomesa-accumulo-datastore_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index d6db2a8982b2..c31d5f42cd6e 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml index 4c2f79ef0a0f..643c68bdcf94 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 geomesa-accumulo-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index aa66a2a29324..50ec9903582a 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index f652b7404a11..66c136cd7ab1 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml index 10b75c971e62..bce88792675b 100644 --- a/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml index 8f32c7a70d2e..a56a9422d66c 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 geomesa-accumulo-raster-distributed-runtime_2.11 diff --git a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml index 5816ed2f7729..5dfc3ec2c41d 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-raster/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-security/pom.xml b/geomesa-accumulo/geomesa-accumulo-security/pom.xml index bc63bd41b6f3..466acc4b5bd5 100644 --- a/geomesa-accumulo/geomesa-accumulo-security/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-security/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml index b2e79e9daf32..bee6f2cf659b 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index d92c3425b93a..186711e0e215 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml index b8619efdc999..ab0004a0ddbb 100644 --- a/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-stats-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index df7cb7cf2115..1287bffe1607 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-accumulo_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index 80f21d33ac32..b21bd93ca0f2 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 19698bad6bea..bf1e8521da90 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -3,7 +3,7 @@ geomesa-archetypes_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index b20ed002c361..9a41f1850e3c 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 geomesa-archetypes_2.11 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index da1162830b1a..69590055b3c3 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index 23f51253b317..e95004cbdf91 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml index edb6fe04ddaa..f724a9b1313a 100644 --- a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index b77e1a7fe311..0dd70ecba2f7 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index 8fae32193099..e78168267876 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -4,7 +4,7 @@ geomesa-arrow_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index 2cbf83d95b62..ae90025309b1 100644 --- a/geomesa-arrow/geomesa-arrow-tools/pom.xml +++ b/geomesa-arrow/geomesa-arrow-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-arrow_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index bb1dbef8aa54..c0188b8b0709 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml index 586a14bd7912..8c7f131d9c98 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-bigtable_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml index 7a056629ec90..a975ac2cc1f2 100644 --- a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml index 41cbc71914b0..6a9091bc463f 100644 --- a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml index fbf92fba33c1..dfbb14052ca0 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml index 4d9f5f6eea75..3a7ecf8f8202 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml index 47af158155ad..cab4bc2053c0 100644 --- a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-bigtable_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-bigtable/pom.xml b/geomesa-bigtable/pom.xml index f4c7c90783ce..b8dabd5b4a5b 100644 --- a/geomesa-bigtable/pom.xml +++ b/geomesa-bigtable/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml index 154913bea33f..f2332f745bec 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-api/pom.xml b/geomesa-blobstore/geomesa-blobstore-api/pom.xml index 1eb668e95002..59ca142fa3a8 100644 --- a/geomesa-blobstore/geomesa-blobstore-api/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-api/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml index 2c8b96bd310e..a89b968a4ed0 100644 --- a/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml index 04d26c177f80..7e03eb3dfbd1 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-exif-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml index 0b3f41931363..84bff592eae1 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore-handlers_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml index 083521707f9a..459b854f05c0 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-handlers/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/geomesa-blobstore-web/pom.xml b/geomesa-blobstore/geomesa-blobstore-web/pom.xml index da20e5be6f5c..cf3014e004aa 100644 --- a/geomesa-blobstore/geomesa-blobstore-web/pom.xml +++ b/geomesa-blobstore/geomesa-blobstore-web/pom.xml @@ -11,7 +11,7 @@ geomesa-blobstore_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-blobstore/pom.xml b/geomesa-blobstore/pom.xml index a91ad2be4552..beb331a99732 100644 --- a/geomesa-blobstore/pom.xml +++ b/geomesa-blobstore/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index d5b43f5b8117..b69827be725a 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-cassandra_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index e645222394df..c4b4344fbd0c 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml index 0ed93c5f91d2..d706cd74cf25 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index a4e9035b4793..a5a7c154cfd0 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-cassandra_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index 043d73fb148a..7c6b2033084f 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 68f6faab30ca..4b87e307c021 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index 41a8c410e74f..6c8a609dc2c0 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index e82775f005c0..7949d16570ff 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index 283c810d51ad..324611ba0dcb 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index f6b87ecdc744..4a131bf5fbf5 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index 200c1612ff83..89c5d4d9526e 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/pom.xml b/geomesa-convert/geomesa-convert-osm/pom.xml index 911b024e9a87..00a3bfbc3f01 100644 --- a/geomesa-convert/geomesa-convert-osm/pom.xml +++ b/geomesa-convert/geomesa-convert-osm/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-convert_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-redis-cache/pom.xml b/geomesa-convert/geomesa-convert-redis-cache/pom.xml index bed5b291b63a..15bd74f0cf77 100644 --- a/geomesa-convert/geomesa-convert-redis-cache/pom.xml +++ b/geomesa-convert/geomesa-convert-redis-cache/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-scripting/pom.xml b/geomesa-convert/geomesa-convert-scripting/pom.xml index 67b863448706..cb7d1904a006 100644 --- a/geomesa-convert/geomesa-convert-scripting/pom.xml +++ b/geomesa-convert/geomesa-convert-scripting/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 68dd365e2902..be7097f0ce38 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index 696178ddc057..dd76786b59ff 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index cad9b9dcdd19..bd38dd3925e1 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -11,7 +11,7 @@ geomesa-convert_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index dc850e0943f6..190317ebdbd3 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 2f8023d9a371..f04589dd96ea 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index 6a4a2af01989..1023c1348f7e 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index e248b41fa037..82147dbc728c 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index 34997c26e462..c35050f245f4 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/geomesa-feature-nio/pom.xml b/geomesa-features/geomesa-feature-nio/pom.xml index fb1c54b58396..17ca4696c071 100644 --- a/geomesa-features/geomesa-feature-nio/pom.xml +++ b/geomesa-features/geomesa-feature-nio/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index d72b030b051f..d21f6547aa0e 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index 27d286fdfbd9..9d6e49753c10 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index 16e62f585466..9421eb4efc04 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index 8cf5e8369110..89253e150bc7 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-fs_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml index 47f840320cbe..498e06203d36 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml index 9c8ffffef951..7d942c040ac3 100644 --- a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml +++ b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index e002ef988f33..255990e536c9 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml index 94789cb368d8..895e5c6d73c8 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml index cfbd76cdc91c..684af9f381fb 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml index cbf74a0fac64..a3c1e43b6b70 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml index 72084e8cb9ea..b9cbced498de 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml index fdeb433ab364..d070d7c96100 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml @@ -3,7 +3,7 @@ geomesa-fs-storage_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index 2841e6688da4..006f4dae28ee 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index 7e7c4d6270d7..77149ec1c979 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index 2c572d55ed95..c60687dd16f8 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-api/pom.xml b/geomesa-geojson/geomesa-geojson-api/pom.xml index 6759910cde04..eded5f55fc2e 100644 --- a/geomesa-geojson/geomesa-geojson-api/pom.xml +++ b/geomesa-geojson/geomesa-geojson-api/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml index ed2c9b70026c..6e3705a9e1fc 100644 --- a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml +++ b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-rest/pom.xml b/geomesa-geojson/geomesa-geojson-rest/pom.xml index 31c73cecd42d..c909c2244273 100644 --- a/geomesa-geojson/geomesa-geojson-rest/pom.xml +++ b/geomesa-geojson/geomesa-geojson-rest/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-geojson_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-geojson/pom.xml b/geomesa-geojson/pom.xml index 4059c702655a..facaa413f56c 100644 --- a/geomesa-geojson/pom.xml +++ b/geomesa-geojson/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index 7f8eedb3fbf1..d6d9582918b5 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index d0afd81f9f8e..bb81885f79e6 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml index 392f6027316b..b488833246a5 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.2-SNAPSHOT + 2.0.2 geomesa-hbase-distributed-runtime_2.11 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index 9bcc44b39841..b3d4d95a21e0 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-hbase/geomesa-hbase-jobs/pom.xml b/geomesa-hbase/geomesa-hbase-jobs/pom.xml index 06c9b8123967..14e145ea9c11 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/pom.xml +++ b/geomesa-hbase/geomesa-hbase-jobs/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-native-api/pom.xml b/geomesa-hbase/geomesa-hbase-native-api/pom.xml index 46f8802f68b4..05c75accec31 100644 --- a/geomesa-hbase/geomesa-hbase-native-api/pom.xml +++ b/geomesa-hbase/geomesa-hbase-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml index 0cabe151b476..6ca3675cc0d4 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index 18667d122d76..2461cfa6ae4b 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index 7ede7708fcd2..b03ec74e7620 100644 --- a/geomesa-hbase/geomesa-hbase-tools/pom.xml +++ b/geomesa-hbase/geomesa-hbase-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-hbase_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index 5ce720d9ba4e..20173ab6967b 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index b8af93a2c17d..2da7628d6ac5 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index a3b5927d7e47..5720fa2db511 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml index 54af56e77393..0b60da3ad593 100644 --- a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -3,7 +3,7 @@ geomesa-jupyter_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-jupyter/pom.xml b/geomesa-jupyter/pom.xml index 8d4f171ed854..402c1747ccfd 100644 --- a/geomesa-jupyter/pom.xml +++ b/geomesa-jupyter/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index 28eedd38d8d1..0e102b4e3547 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index ec521945a7fc..9a18d2547390 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml index 35f0b84f17c4..60922b85c619 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index 2e3359849d53..8a7d9318a585 100644 --- a/geomesa-kafka/geomesa-kafka-tools/pom.xml +++ b/geomesa-kafka/geomesa-kafka-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index e7dcc9f3279e..14064eb99f55 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-kafka_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index 77d610fbe606..40db675be853 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index 135c2b52920a..ace1503200f4 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/pom.xml +++ b/geomesa-lambda/geomesa-lambda-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.2-SNAPSHOT + 2.0.2 geomesa-lambda-datastore_2.11 diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index 039a38d95257..7891ae9745a3 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 pom diff --git a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml index 90003de9ba18..4c0d19d852bb 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-lambda/geomesa-lambda-tools/pom.xml b/geomesa-lambda/geomesa-lambda-tools/pom.xml index 651aa55af719..dec1f39c982c 100644 --- a/geomesa-lambda/geomesa-lambda-tools/pom.xml +++ b/geomesa-lambda/geomesa-lambda-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-lambda_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index 8b5c32f98974..b8b08a6513fb 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index 1f83d2ddc38a..57d934565f49 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index 02e82c73198a..d4c4ed2c4e22 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -11,7 +11,7 @@ geomesa-memory_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index 026a86a0229c..93938dc80ca3 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index d9e091b99aae..219259ab0bae 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-native-api/pom.xml b/geomesa-native-api/pom.xml index 38bffb4425a3..50e4b3de5a57 100644 --- a/geomesa-native-api/pom.xml +++ b/geomesa-native-api/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index e53e55a87892..4b424eb6145a 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index 72a51d872097..647c168698e4 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index b562dafe7c8f..aa9b27a077f6 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index f4bae9ff1828..73775a6fc63b 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index 8567c6b42375..a26d68d64f07 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index d664a784f534..cb7bdc1d1cad 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa-spark-geotools/pom.xml b/geomesa-spark/geomesa-spark-geotools/pom.xml index 669e79cd20a1..fbea1f8aa4f2 100644 --- a/geomesa-spark/geomesa-spark-geotools/pom.xml +++ b/geomesa-spark/geomesa-spark-geotools/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index bf98eb543efb..017a8de710a0 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index 4df6266481f4..345a62a0320e 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index 16a7e8dfecbe..f8714df76dfa 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index 76f7fbf0d034..47546bcd6a90 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-stream/geomesa-stream-api/pom.xml b/geomesa-stream/geomesa-stream-api/pom.xml index 8d9ae83c64c7..1adfe4129529 100644 --- a/geomesa-stream/geomesa-stream-api/pom.xml +++ b/geomesa-stream/geomesa-stream-api/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-stream/geomesa-stream-datastore/pom.xml b/geomesa-stream/geomesa-stream-datastore/pom.xml index d6b3be560cbf..801308be2456 100644 --- a/geomesa-stream/geomesa-stream-datastore/pom.xml +++ b/geomesa-stream/geomesa-stream-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-stream/geomesa-stream-generic/pom.xml b/geomesa-stream/geomesa-stream-generic/pom.xml index f855e1553bec..1de78c1b127b 100644 --- a/geomesa-stream/geomesa-stream-generic/pom.xml +++ b/geomesa-stream/geomesa-stream-generic/pom.xml @@ -3,7 +3,7 @@ geomesa-stream_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml index 119f1b787f4e..b9899b887172 100644 --- a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml +++ b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.11 - 2.0.2-SNAPSHOT + 2.0.2 ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-stream/pom.xml b/geomesa-stream/pom.xml index 1aeac0b8abb0..7daf9ccd4ff5 100644 --- a/geomesa-stream/pom.xml +++ b/geomesa-stream/pom.xml @@ -3,7 +3,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-test/pom.xml b/geomesa-test/pom.xml index 85110c4b5167..d5c9b63d2ea7 100644 --- a/geomesa-test/pom.xml +++ b/geomesa-test/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index 1ebc081f9453..fd596caf9cab 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-utils/pom.xml b/geomesa-utils/pom.xml index 60deb2085271..057f8f1701d8 100644 --- a/geomesa-utils/pom.xml +++ b/geomesa-utils/pom.xml @@ -11,7 +11,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-web/geomesa-web-core/pom.xml b/geomesa-web/geomesa-web-core/pom.xml index 7bc5aebcfc03..e4b54f8a95ed 100644 --- a/geomesa-web/geomesa-web-core/pom.xml +++ b/geomesa-web/geomesa-web-core/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-web/geomesa-web-data/pom.xml b/geomesa-web/geomesa-web-data/pom.xml index ad814e627510..e19f772200d6 100644 --- a/geomesa-web/geomesa-web-data/pom.xml +++ b/geomesa-web/geomesa-web-data/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-web/geomesa-web-install/pom.xml b/geomesa-web/geomesa-web-install/pom.xml index 60ee4f381900..122adf528148 100644 --- a/geomesa-web/geomesa-web-install/pom.xml +++ b/geomesa-web/geomesa-web-install/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-web/geomesa-web-stats/pom.xml b/geomesa-web/geomesa-web-stats/pom.xml index 8c753122ef82..7e6d3c0bc29c 100644 --- a/geomesa-web/geomesa-web-stats/pom.xml +++ b/geomesa-web/geomesa-web-stats/pom.xml @@ -3,7 +3,7 @@ geomesa-web_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-web/pom.xml b/geomesa-web/pom.xml index fefb6cd33bae..5689d6c311e2 100644 --- a/geomesa-web/pom.xml +++ b/geomesa-web/pom.xml @@ -4,7 +4,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index 51a8d9bc42ad..7c3580bf38e1 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -11,7 +11,7 @@ geomesa_2.11 org.locationtech.geomesa - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/geomesa-zk-utils/pom.xml b/geomesa-zk-utils/pom.xml index 94b163bf8f3d..39346c1c9327 100644 --- a/geomesa-zk-utils/pom.xml +++ b/geomesa-zk-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa_2.11 - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/pom.xml b/pom.xml index 69df316c2b92..39eec0245f49 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.locationtech.geomesa geomesa_2.11 pom - 2.0.2-SNAPSHOT + 2.0.2 @@ -2945,7 +2945,7 @@ scm:git:git@github.com:locationtech/geomesa.git scm:git:git@github.com:locationtech/geomesa.git https://github.com/locationtech/geomesa - HEAD + geomesa_2.11-2.0.2 From e24ee224e204605b24cccf68d90b637923ad829c Mon Sep 17 00:00:00 2001 From: Austin Heyne Date: Tue, 24 Jul 2018 20:57:20 -0400 Subject: [PATCH 31/33] Reverted scala logging and caffeine Signed-off-by: Austin Heyne --- .../geomesa/compute/spark/GeoMesaSpark.scala | 2 +- .../geomesa/compute/spark/sql/GeoMesaSparkSql.scala | 2 +- .../geomesa/compute/spark/GeoMesaSparkTest.scala | 2 +- .../accumulo/audit/AccumuloEventTransform.scala | 2 +- .../accumulo/audit/AccumuloEventWriter.scala | 2 +- .../geomesa/accumulo/data/stats/StatsCombiner.scala | 2 +- .../accumulo/index/AccumuloFeatureIndex.scala | 2 +- .../geomesa/accumulo/index/AccumuloQueryPlan.scala | 2 +- .../legacy/attribute/AttributeQueryableIndex.scala | 2 +- .../legacy/attribute/AttributeWritableIndex.scala | 2 +- .../index/legacy/id/RecordQueryableIndex.scala | 2 +- .../accumulo/index/legacy/z2/Z2QueryableIndex.scala | 2 +- .../accumulo/index/legacy/z3/Z3QueryableIndex.scala | 2 +- .../iterators/AttributeIndexValueIterator.scala | 2 +- .../iterators/BaseAggregatingIterator.scala | 2 +- .../accumulo/iterators/BinAggregatingIterator.scala | 2 +- .../accumulo/iterators/IteratorTrigger.scala | 2 +- .../iterators/KryoAttributeKeyValueIterator.scala | 2 +- .../iterators/KryoLazyAggregatingIterator.scala | 2 +- .../iterators/KryoLazyDensityIterator.scala | 2 +- .../iterators/KryoLazyFilterTransformIterator.scala | 2 +- .../iterators/KryoLazyMapAggregatingIterator.scala | 2 +- .../accumulo/iterators/KryoLazyStatsIterator.scala | 2 +- .../iterators/legacy/UniqueAttributeIterator.scala | 2 +- .../geomesa/accumulo/util/BatchMultiScanner.scala | 2 +- .../accumulo/util/GeoMesaBatchWriterConfig.scala | 2 +- .../accumulo/data/BackCompatibilityTest.scala | 2 +- .../geomesa/accumulo/data/TableSharingTest.scala | 2 +- .../accumulo/filter/BoundsFilterVisitorTest.scala | 2 +- .../geomesa/accumulo/filter/FilterTest.scala | 2 +- .../geomesa/accumulo/index/FilterHelperTest.scala | 2 +- .../iterators/LiveDensityIteratorTest.scala | 2 +- .../accumulo/iterators/MultiIteratorTest.scala | 2 +- .../geomesa/accumulo/iterators/TestData.scala | 2 +- .../geomesa/accumulo/util/BoundingBoxUtilTest.scala | 2 +- .../geomesa/jobs/accumulo/AccumuloJobUtils.scala | 2 +- .../geomesa/jobs/accumulo/index/WriteIndexJob.scala | 2 +- .../jobs/mapreduce/GeoMesaAccumuloInputFormat.scala | 2 +- .../raster/data/AccumuloRasterBoundsPlanner.scala | 2 +- .../raster/data/AccumuloRasterQueryPlanner.scala | 2 +- .../geomesa/raster/data/AccumuloRasterStore.scala | 2 +- .../geomesa/raster/index/RasterEntry.scala | 2 +- .../raster/iterators/GeomesaFilteringIterator.scala | 2 +- .../iterators/IndexedSpatioTemporalFilter.scala | 2 +- .../geomesa/raster/wcs/GeoMesaCoverageReader.scala | 2 +- .../data/AccumuloRasterQueryPlannerTest.scala | 2 +- .../accumulo/spark/AccumuloSparkProviderTest.scala | 2 +- .../spark/accumulo/AccumuloSpatialRDDProvider.scala | 2 +- .../accumulo/tools/data/DeleteRasterCommand.scala | 2 +- .../accumulo/tools/raster/RasterIngest.scala | 2 +- .../geomesa/arrow/filter/ArrowFilterOptimizer.scala | 2 +- .../locationtech/geomesa/arrow/io/DeltaWriter.scala | 6 +++--- .../geomesa/arrow/io/SimpleFeatureArrowIO.scala | 2 +- .../bigtable/index/BigtableFeatureIndex.scala | 2 +- .../blob/accumulo/AccumuloBlobStoreImpl.scala | 2 +- .../blob/accumulo/GeoMesaAccumuloBlobStore.scala | 2 +- .../blob/handlers/gdal/GDALFileHandler.scala | 2 +- .../cassandra/index/CassandraFeatureIndex.scala | 2 +- .../geomesa/convert/ConverterConfigLoader.scala | 2 +- .../geomesa/convert/ConverterConfigResolver.scala | 2 +- .../convert/SimpleFeatureConverterFactory.scala | 2 +- .../geomesa/convert/SimpleFeatureConverters.scala | 2 +- .../locationtech/geomesa/convert/Transformers.scala | 2 +- .../geomesa/convert/cql/CqlFunctionFactory.scala | 2 +- .../geomesa/convert/osm/OsmNodesConverter.scala | 2 +- .../geomesa/convert/osm/OsmWaysConverter.scala | 2 +- .../scripting/ScriptingFunctionFactory.scala | 2 +- .../geomesa/convert/xml/XMLConverter.scala | 2 +- .../features/avro/FeatureSpecificReaderTest.scala | 2 +- .../serialization/GenericMapSerialization.scala | 2 +- .../serialization/GeometrySerialization.scala | 2 +- .../features/kryo/json/JsonPathFilterFunction.scala | 2 +- .../features/kryo/json/KryoJsonSerialization.scala | 2 +- .../features/kryo/KryoFeatureSerializerTest.scala | 2 +- .../features/nio/LazySimpleFeatureTest.scala | 2 +- .../locationtech/geomesa/filter/FilterHelper.scala | 2 +- .../geomesa/filter/FilterPackageObjectTest.scala | 2 +- .../geomesa/fs/FileSystemDataStore.scala | 2 +- .../geomesa/fs/FileSystemFeatureStore.scala | 2 +- .../geomesa/fs/FileSystemStorageManager.scala | 2 +- .../geomesa/fs/spark/FileSystemRDDProvider.scala | 2 +- .../geomesa/fs/storage/common/FileMetadata.scala | 2 +- .../storage/common/FileSystemThreadedReader.scala | 2 +- .../storage/common/MetadataFileSystemStorage.scala | 2 +- .../storage/common/jobs/PartitionOutputFormat.scala | 2 +- .../converter/ConverterPartitionReader.scala | 2 +- .../storage/converter/ConverterStorageFactory.scala | 2 +- .../fs/storage/orc/OrcFileSystemStorage.scala | 2 +- .../fs/storage/orc/OrcFileSystemStorageTest.scala | 2 +- .../geomesa/parquet/FilteringReader.scala | 2 +- .../parquet/SimpleFeatureParquetWriter.scala | 2 +- .../jobs/ParquetSimpleFeatureOutputFormat.scala | 2 +- .../parquet/jobs/ParquetStorageConfiguration.scala | 2 +- .../geomesa/fs/tools/compact/CompactCommand.scala | 2 +- .../fs/tools/compact/FileSystemCompactionJob.scala | 2 +- .../fs/tools/ingest/FileSystemConverterJob.scala | 2 +- .../geomesa/fs/tools/ingest/StorageJobUtils.scala | 2 +- .../geomesa/geojson/GeoJsonGtIndex.scala | 2 +- .../hbase/coprocessor/GeoMesaCoprocessor.scala | 2 +- .../geomesa/hbase/data/HBaseConnectionPool.scala | 2 +- .../geomesa/hbase/data/HBaseDataStoreFactory.scala | 2 +- .../geomesa/hbase/data/HBaseFeatureCollection.scala | 2 +- .../geomesa/hbase/filters/HBaseZFilters.scala | 2 +- .../geomesa/hbase/index/HBaseFeatureIndex.scala | 2 +- .../geomesa/hbase/data/HBaseArrowTest.scala | 2 +- .../geomesa/hbase/data/HBaseBinAggregatorTest.scala | 2 +- .../geomesa/hbase/data/HBaseDataStoreTest.scala | 2 +- .../geomesa/hbase/data/HBaseDensityFilterTest.scala | 2 +- .../hbase/data/HBaseStatsAggregatorTest.scala | 2 +- .../geomesa/hbase/data/HBaseTestRunnerTest.scala | 2 +- .../geomesa/hbase/data/HBaseVisibilityTest.scala | 2 +- .../hbase/jobs/GeoMesaHBaseInputFormat.scala | 2 +- .../geomesa/hbase/jobs/HBaseIndexFileMapper.scala | 2 +- .../spark/HBaseSparkProviderIntegrationTest.scala | 2 +- .../locationtech/geomesa/index/conf/Splitters.scala | 2 +- .../index/conf/splitter/DefaultSplitter.scala | 2 +- .../geomesa/index/filters/DtgAgeOffFilter.scala | 2 +- .../geomesa/index/geoserver/ViewParams.scala | 2 +- .../index/geotools/GeoMesaFeatureSource.scala | 2 +- .../index/geotools/GeoMesaFeatureWriter.scala | 2 +- .../index/geotools/MetadataBackedDataStore.scala | 2 +- .../geomesa/index/index/BaseFeatureIndex.scala | 2 +- .../geomesa/index/index/IndexAdapter.scala | 2 +- .../index/attribute/AttributeIndexKeySpace.scala | 2 +- .../index/index/legacy/AttributeShardedIndex.scala | 2 +- .../geomesa/index/iterators/DensityScan.scala | 2 +- .../geomesa/index/iterators/StatsScan.scala | 2 +- .../geomesa/index/metadata/CachedLazyMetadata.scala | 2 +- .../geomesa/index/planning/FilterSplitter.scala | 2 +- .../geomesa/index/planning/QueryPlanner.scala | 2 +- .../geomesa/index/planning/StrategyDecider.scala | 2 +- .../geomesa/index/stats/MetadataBackedStats.scala | 2 +- .../geomesa/index/utils/Explainer.scala | 2 +- .../geomesa/index/utils/ThreadManagement.scala | 2 +- .../geomesa/index/utils/bin/BinSorter.scala | 2 +- .../geomesa/index/index/AttributeIndexTest.scala | 2 +- .../org/locationtech/geomesa/jobs/JobUtils.scala | 2 +- .../jobs/mapreduce/ConverterInputFormat.scala | 2 +- .../jobs/mapreduce/FileStreamInputFormat.scala | 2 +- .../jobs/mapreduce/GeoMesaOutputFormat.scala | 2 +- .../geomesa/kafka/data/KafkaCacheLoader.scala | 2 +- .../geomesa/kafka/data/KafkaDataStore.scala | 2 +- .../geomesa/kafka/data/KafkaFeatureWriter.scala | 2 +- .../geomesa/kafka/index/FeatureCacheCqEngine.scala | 2 +- .../geomesa/kafka/index/FeatureCacheGuava.scala | 2 +- .../geomesa/kafka/index/KafkaFeatureCache.scala | 2 +- .../geomesa/kafka/utils/GeoMessageSerializer.scala | 2 +- .../geomesa/kafka/data/KafkaDataStoreTest.scala | 2 +- .../kafka/tools/export/KafkaListenCommand.scala | 2 +- geomesa-kafka/geomesa-kafka-utils/pom.xml | 6 +++++- .../geomesa/kafka/consumer/ThreadedConsumer.scala | 2 +- .../geomesa/lambda/data/LambdaDataStore.scala | 2 +- .../lambda/stream/ZookeeperOffsetManager.scala | 2 +- .../lambda/stream/kafka/DataStorePersistence.scala | 2 +- .../lambda/stream/kafka/KafkaFeatureCache.scala | 2 +- .../geomesa/lambda/stream/kafka/KafkaStore.scala | 2 +- .../geomesa/lambda/LambdaDataStoreTest.scala | 2 +- .../geomesa/lambda/LambdaTestRunnerTest.scala | 2 +- .../geomesa/lambda/ZookeeperOffsetManagerTest.scala | 2 +- .../lambda/stream/kafka/KafkaFeatureCacheTest.scala | 2 +- .../lambda/stream/kafka/KafkaStoreTest.scala | 2 +- .../cqengine/datastore/GeoCQEngineDataStore.scala | 2 +- .../geomesa/memory/cqengine/GeoCQEngine.scala | 2 +- .../memory/cqengine/utils/CQIndexingOptions.scala | 2 +- .../memory/cqengine/utils/GeoCQEngineTest.scala | 2 +- geomesa-metrics/pom.xml | 6 +++++- .../geomesa/metrics/config/MetricsConfig.scala | 2 +- .../metrics/servlet/AggregatedMetricsFilter.scala | 2 +- .../geomesa/process/analytic/MinMaxProcess.scala | 2 +- .../geomesa/process/analytic/SamplingProcess.scala | 2 +- .../geomesa/process/analytic/StatsProcess.scala | 2 +- .../geomesa/process/analytic/UniqueProcess.scala | 2 +- .../locationtech/geomesa/process/knn/KNNQuery.scala | 2 +- .../process/knn/KNearestNeighborSearchProcess.scala | 2 +- .../geomesa/process/query/JoinProcess.scala | 2 +- .../process/query/ProximitySearchProcess.scala | 2 +- .../geomesa/process/query/QueryProcess.scala | 2 +- .../geomesa/process/query/RouteSearchProcess.scala | 2 +- .../process/transform/ArrowConversionProcess.scala | 2 +- .../process/transform/BinConversionProcess.scala | 2 +- .../geomesa/process/tube/TubeBuilder.scala | 2 +- .../geomesa/process/tube/TubeSelectProcess.scala | 2 +- .../geomesa/security/DataStoreSecurityService.scala | 2 +- .../converter/ConverterSpatialRDDProvider.scala | 2 +- .../GeoMesaSparkKryoRegistratorEndpoint.scala | 2 +- .../spark/geotools/GeoToolsSpatialRDDProvider.scala | 2 +- .../main/scala/org/apache/spark/sql/SQLRules.scala | 2 +- .../geomesa/spark/GeoMesaSparkSQL.scala | 2 +- .../geomesa/spark/SparkSQLDataTest.scala | 2 +- .../SparkSQLGeometricDistanceFunctionsTest.scala | 2 +- .../spark/SparkSQLSpatialRelationshipsTest.scala | 2 +- .../locationtech/geomesa/tools/ConvertCommand.scala | 2 +- .../org/locationtech/geomesa/tools/Runner.scala | 2 +- .../geomesa/tools/export/ExportCommand.scala | 2 +- .../tools/export/formats/DelimitedExporter.scala | 2 +- .../tools/export/formats/LeafletMapExporter.scala | 2 +- .../geomesa/tools/ingest/AbstractIngest.scala | 2 +- .../geomesa/tools/ingest/AbstractIngestJob.scala | 2 +- .../geomesa/tools/ConvertCommandTest.scala | 2 +- geomesa-utils/pom.xml | 6 +++++- .../geomesa/utils/audit/AuditedEvent.scala | 2 +- .../geomesa/utils/bin/BinaryOutputEncoder.scala | 2 +- .../geomesa/utils/cache/FilePersistence.scala | 2 +- .../geomesa/utils/classpath/ClassPathUtils.scala | 2 +- .../geomesa/utils/conf/ArgResolver.scala | 2 +- .../geomesa/utils/conf/ConfigLoader.scala | 2 +- .../geomesa/utils/conf/GeoMesaProperties.scala | 2 +- .../utils/conf/GeoMesaSystemProperties.scala | 2 +- .../geomesa/utils/geohash/GeoHash.scala | 2 +- .../geomesa/utils/geohash/GeohashUtils.scala | 2 +- .../utils/geotools/GeneralShapefileIngest.scala | 2 +- .../geomesa/utils/geotools/GeoMesaParam.scala | 2 +- .../geomesa/utils/geotools/SftArgResolver.scala | 2 +- .../geotools/SimpleFeaturePropertyAccessor.scala | 2 +- .../utils/geotools/SimpleFeatureTypeLoader.scala | 2 +- .../utils/index/GeoMesaSchemaValidator.scala | 2 +- .../locationtech/geomesa/utils/io/SafeClose.scala | 2 +- .../geomesa/utils/stats/Histogram.scala | 2 +- .../geomesa/utils/stats/MethodProfiling.scala | 2 +- .../locationtech/geomesa/utils/stats/MinMax.scala | 2 +- .../org/locationtech/geomesa/utils/stats/TopK.scala | 2 +- .../geomesa/utils/stats/Z3Frequency.scala | 2 +- .../geomesa/utils/stats/Z3Histogram.scala | 2 +- .../geomesa/utils/text/StringSerialization.scala | 2 +- .../locationtech/geomesa/utils/text/Suffixes.scala | 2 +- .../geomesa/utils/uuid/Z3FeatureIdGenerator.scala | 2 +- .../geomesa/utils/conf/GeoMesaPropertiesTest.scala | 2 +- .../geomesa/utils/conf/SemanticVersionTest.scala | 2 +- .../geomesa/utils/geohash/BoundingBoxTest.scala | 2 +- .../geomesa/utils/geohash/GeoHashTest.scala | 2 +- .../geomesa/utils/geohash/GeohashUtilsTest.scala | 2 +- .../geomesa/utils/geotools/GeoMesaParamTest.scala | 2 +- .../geomesa/utils/geotools/GridSnapTest.scala | 2 +- .../geomesa/utils/index/BucketIndexTest.scala | 2 +- .../utils/index/SynchronizedQuadtreeTest.scala | 2 +- .../geomesa/utils/io/SafeCloseTest.scala | 2 +- .../geomesa/web/core/GeoMesaServletCatalog.scala | 2 +- .../geomesa/web/core/SpringScalatraBootstrap.scala | 2 +- .../geomesa/web/data/DataEndpoint.scala | 2 +- .../geomesa/web/stats/GeoMesaStatsEndpoint.scala | 2 +- geomesa-z3/pom.xml | 6 +++++- .../org/locationtech/geomesa/curve/XZ2SFCTest.scala | 2 +- .../org/locationtech/geomesa/curve/XZ3SFCTest.scala | 2 +- pom.xml | 13 +++++++++---- 244 files changed, 270 insertions(+), 249 deletions(-) diff --git a/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/GeoMesaSpark.scala b/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/GeoMesaSpark.scala index b4a254c32d55..df92d1bb258d 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/GeoMesaSpark.scala +++ b/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/GeoMesaSpark.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.compute.spark -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.spark.rdd.RDD import org.apache.spark.{SparkConf, SparkContext} diff --git a/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/sql/GeoMesaSparkSql.scala b/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/sql/GeoMesaSparkSql.scala index 7cc42ee9375d..53680f07cbb3 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/sql/GeoMesaSparkSql.scala +++ b/geomesa-accumulo/geomesa-accumulo-compute/src/main/scala/org/locationtech/geomesa/compute/spark/sql/GeoMesaSparkSql.scala @@ -12,7 +12,7 @@ import java.sql.Timestamp import java.util.concurrent.atomic.AtomicInteger import java.util.{Date, List => jList, Map => jMap, UUID} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.hadoop.conf.Configuration import org.apache.metamodel.query.FilterClause diff --git a/geomesa-accumulo/geomesa-accumulo-compute/src/test/scala/org/locationtech/geomesa/compute/spark/GeoMesaSparkTest.scala b/geomesa-accumulo/geomesa-accumulo-compute/src/test/scala/org/locationtech/geomesa/compute/spark/GeoMesaSparkTest.scala index 0559055fb364..589fd442f24c 100644 --- a/geomesa-accumulo/geomesa-accumulo-compute/src/test/scala/org/locationtech/geomesa/compute/spark/GeoMesaSparkTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-compute/src/test/scala/org/locationtech/geomesa/compute/spark/GeoMesaSparkTest.scala @@ -12,7 +12,7 @@ package org.locationtech.geomesa.compute.spark import java.io.{Serializable => JSerializable} import java.util.concurrent.atomic.AtomicInteger -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.mock.MockInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken import org.apache.accumulo.core.security.Authorizations diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala index 7eadc9de353d..84ea88663cb9 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala @@ -12,7 +12,7 @@ import java.time.format.DateTimeFormatter import java.time.{ZoneOffset, ZonedDateTime} import java.util.Map.Entry -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.Scanner import org.apache.accumulo.core.data.{Key, Mutation, Value} import org.apache.hadoop.io.Text diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala index 02760b77d505..7a9d0c05cd50 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{ScheduledThreadPoolExecutor, TimeUnit} import com.google.common.util.concurrent.MoreExecutors -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.{BatchWriter, Connector} import org.apache.accumulo.core.data.Mutation import org.locationtech.geomesa.accumulo.AccumuloVersion diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala index f0bde0b782d8..1d8b002cc195 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.data.stats -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.{Connector, IteratorSetting} import org.apache.accumulo.core.data.{Key, Value} import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndex.scala index 8444c2f8829a..ba12ea444d98 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndex.scala @@ -12,7 +12,7 @@ import java.util.Collections import java.util.Map.Entry import com.google.common.collect.{ImmutableSet, ImmutableSortedSet} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.mock.MockConnector import org.apache.accumulo.core.conf.Property import org.apache.accumulo.core.data.{Key, Range, Value} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloQueryPlan.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloQueryPlan.scala index 920f96c74ec0..71a1525e3fa2 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloQueryPlan.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloQueryPlan.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.index import java.util.Map.Entry -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.{IteratorSetting, ScannerBase} import org.apache.accumulo.core.data.{Key, Value, Range => aRange} import org.apache.accumulo.core.security.Authorizations diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeQueryableIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeQueryableIndex.scala index c3f43d479831..aef8e34d83e5 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeQueryableIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeQueryableIndex.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.index.legacy.attribute -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{Range => AccRange} import org.apache.hadoop.io.Text diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeWritableIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeWritableIndex.scala index 5c3b2d224caf..993c3f16b910 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeWritableIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/attribute/AttributeWritableIndex.scala @@ -17,7 +17,7 @@ import java.util.{Date, Locale, Collection => JCollection} import com.google.common.collect.ImmutableSortedSet import com.google.common.primitives.Bytes -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Range => AccRange} import org.apache.hadoop.io.Text import org.calrissian.mango.types.{LexiTypeEncoders, SimpleTypeEncoders, TypeEncoder} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/id/RecordQueryableIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/id/RecordQueryableIndex.scala index 3d1e8b06de7b..82dd4e1d8ffc 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/id/RecordQueryableIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/id/RecordQueryableIndex.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.index.legacy.id -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Mutation, Range => aRange} import org.apache.hadoop.io.Text import org.geotools.factory.Hints diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z2/Z2QueryableIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z2/Z2QueryableIndex.scala index 79b17671e054..d0cee0ec5a48 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z2/Z2QueryableIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z2/Z2QueryableIndex.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.index.legacy.z2 import java.nio.charset.StandardCharsets import com.google.common.primitives.{Bytes, Longs} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Mutation, Range => aRange} import org.apache.hadoop.io.Text import org.geotools.factory.Hints diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z3/Z3QueryableIndex.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z3/Z3QueryableIndex.scala index 16c4472f004c..951ec9aa3e83 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z3/Z3QueryableIndex.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/z3/Z3QueryableIndex.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.accumulo.index.legacy.z3 import com.google.common.primitives.{Bytes, Longs, Shorts} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Mutation, Range => aRange} import org.apache.hadoop.io.Text import org.geotools.factory.Hints diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeIndexValueIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeIndexValueIterator.scala index 06b64ccbd0ed..18f0845d9ba1 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeIndexValueIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeIndexValueIterator.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.iterators -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{ByteSequence, Key, Range, Value} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala index a3556e2ba3a1..3b80281d6bd5 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.{Collection => jCollection, Map => jMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{Range => aRange, _} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BinAggregatingIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BinAggregatingIterator.scala index d1e3b12758fc..2d63fa5ab682 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BinAggregatingIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/BinAggregatingIterator.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.Date import java.util.Map.Entry -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data._ diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/IteratorTrigger.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/IteratorTrigger.scala index c18da252a42c..a75a0738cf13 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/IteratorTrigger.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/IteratorTrigger.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.iterators -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.DataUtilities import org.geotools.factory.Hints import org.geotools.process.vector.TransformProcess diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoAttributeKeyValueIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoAttributeKeyValueIterator.scala index dfb971ddc932..62189722b0b2 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoAttributeKeyValueIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoAttributeKeyValueIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.{Collection => jCollection, Map => jMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{ByteSequence, Key, Range, Value} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyAggregatingIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyAggregatingIterator.scala index 56f00f8bb20b..6f88b1eadf5c 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyAggregatingIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyAggregatingIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.{Collection => jCollection, Map => jMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{Range => aRange, _} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyDensityIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyDensityIterator.scala index 875a012ad7b0..72f9363a6abf 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyDensityIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyDensityIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.Map.Entry -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data._ import org.geotools.factory.Hints diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyFilterTransformIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyFilterTransformIterator.scala index b453fec4ca78..b2b18ac9c62d 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyFilterTransformIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyFilterTransformIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.{Collection => jCollection, Map => jMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{ByteSequence, Key, Range, Value} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyMapAggregatingIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyMapAggregatingIterator.scala index 3a3560c3c7b4..7dd75e1035ed 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyMapAggregatingIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyMapAggregatingIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.{UUID, Map => jMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.geotools.factory.Hints import org.locationtech.geomesa.accumulo.{AccumuloFeatureIndexType, sumNumericValueMutableMaps} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyStatsIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyStatsIterator.scala index 9def36156c80..f61b198572db 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyStatsIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoLazyStatsIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.util.Map.Entry -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{Key, Value} import org.apache.commons.codec.binary.Base64 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/legacy/UniqueAttributeIterator.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/legacy/UniqueAttributeIterator.scala index 7c1e7030cb54..1406f8ba217d 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/legacy/UniqueAttributeIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/legacy/UniqueAttributeIterator.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators.legacy import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data._ import org.apache.accumulo.core.iterators.{IteratorEnvironment, WrappingIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/BatchMultiScanner.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/BatchMultiScanner.scala index 9b9d9d6ec301..560a6d5351d8 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/BatchMultiScanner.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/BatchMultiScanner.scala @@ -12,7 +12,7 @@ import java.util.Map.Entry import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{Executors, Future, LinkedBlockingQueue, TimeUnit} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.ScannerBase import org.apache.accumulo.core.data.{Key, Value} import org.locationtech.geomesa.accumulo.data.AccumuloDataStore diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/GeoMesaBatchWriterConfig.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/GeoMesaBatchWriterConfig.scala index 7b029c488a1e..c4fe307c5002 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/GeoMesaBatchWriterConfig.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/GeoMesaBatchWriterConfig.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.util import java.util.concurrent.TimeUnit -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.BatchWriterConfig import org.locationtech.geomesa.accumulo.AccumuloProperties diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/BackCompatibilityTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/BackCompatibilityTest.scala index a5f8c1e00631..bf268c0d4ac9 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/BackCompatibilityTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/BackCompatibilityTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.data import java.io._ import com.esotericsoftware.kryo.io.{Input, Output} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.BatchWriterConfig import org.apache.accumulo.core.client.mock.MockInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/TableSharingTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/TableSharingTest.scala index ab16044ffae1..4585cf3f1cdb 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/TableSharingTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/TableSharingTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.data import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.mock.MockInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken import org.geotools.data.DataStoreFinder diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/BoundsFilterVisitorTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/BoundsFilterVisitorTest.scala index 3d7fe514fa0b..a6033f3cfa0f 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/BoundsFilterVisitorTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/BoundsFilterVisitorTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.filter -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.filter.text.ecql.ECQL import org.geotools.geometry.jts.ReferencedEnvelope import org.geotools.referencing.crs.DefaultGeographicCRS diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/FilterTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/FilterTest.scala index 6a7e673ba215..c86b84fff0bc 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/FilterTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/filter/FilterTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.filter import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Coordinate import org.geotools.data.Query import org.geotools.factory.{CommonFactoryFinder, Hints} diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/index/FilterHelperTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/index/FilterHelperTest.scala index d9ad23b6c2ca..4ea4c2b60c14 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/index/FilterHelperTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/index/FilterHelperTest.scala @@ -12,7 +12,7 @@ import java.time.temporal.ChronoUnit import java.time.{Instant, ZoneOffset, ZonedDateTime} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.CommonFactoryFinder import org.geotools.filter.text.ecql.ECQL import org.geotools.geometry.jts.JTSFactoryFinder diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/LiveDensityIteratorTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/LiveDensityIteratorTest.scala index 627600dfe791..d56bf327a64c 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/LiveDensityIteratorTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/LiveDensityIteratorTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.text.DecimalFormat import com.google.common.collect.HashBasedTable -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Envelope import org.geotools.data._ import org.geotools.data.simple.SimpleFeatureIterator diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/MultiIteratorTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/MultiIteratorTest.scala index 8143da210744..a7836f5327b3 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/MultiIteratorTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/MultiIteratorTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.time.{ZoneOffset, ZonedDateTime} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Polygon import org.geotools.data.Query import org.geotools.data.simple.SimpleFeatureCollection diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/TestData.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/TestData.scala index 0e834e54d72a..8d287f5d7546 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/TestData.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/TestData.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.iterators import java.time.{Instant, ZoneOffset, ZonedDateTime} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Geometry, GeometryFactory} import org.apache.accumulo.core.data.Value import org.apache.accumulo.core.security.Authorizations diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/util/BoundingBoxUtilTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/util/BoundingBoxUtilTest.scala index c888b878301a..edabaa09ad36 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/util/BoundingBoxUtilTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/util/BoundingBoxUtilTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.{Assert, Test} import org.locationtech.geomesa.utils.geohash.{BoundingBox, GeoHash} diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/AccumuloJobUtils.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/AccumuloJobUtils.scala index 1dcfb877cec3..f7d8323742e9 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/AccumuloJobUtils.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/AccumuloJobUtils.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.jobs.accumulo import java.io.File -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.Connector import org.apache.hadoop.conf.Configuration import org.geotools.data.Query diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/index/WriteIndexJob.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/index/WriteIndexJob.scala index 13b72f0af7d2..ca246b6fe69f 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/index/WriteIndexJob.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/index/WriteIndexJob.scala @@ -12,7 +12,7 @@ package org.locationtech.geomesa.jobs.accumulo.index import java.io.File import com.beust.jcommander.Parameter -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.io.Text import org.apache.hadoop.mapreduce.{Counter, Job, Mapper} diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala index 80a733b93de1..80f961cdc0f7 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala @@ -12,7 +12,7 @@ package org.locationtech.geomesa.jobs.mapreduce import java.io._ import java.net.{URL, URLClassLoader} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.impl.{AuthenticationTokenIdentifier, DelegationTokenImpl} import org.apache.accumulo.core.client.mapreduce.{AbstractInputFormat, AccumuloInputFormat, InputFormatBase, RangeInputSplit} import org.apache.accumulo.core.client.security.tokens.{KerberosToken, PasswordToken} diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterBoundsPlanner.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterBoundsPlanner.scala index e2d52f8ff7b3..9531480f426f 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterBoundsPlanner.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterBoundsPlanner.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.raster.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.IteratorSetting import org.locationtech.geomesa.raster.iterators.BBOXCombiner diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlanner.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlanner.scala index 50bdbfdc1f8e..1986eff9ad0a 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlanner.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlanner.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.raster.data import com.google.common.collect.{ImmutableSetMultimap, ImmutableMap => IMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.accumulo.core.client.IteratorSetting import org.apache.accumulo.core.data.{Range => ARange} diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterStore.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterStore.scala index 95d7e078b0f7..9f05711e44cb 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterStore.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/data/AccumuloRasterStore.scala @@ -16,7 +16,7 @@ import java.util.{Date, Map => JMap} import com.github.benmanes.caffeine.cache.Caffeine import com.google.common.collect.{ImmutableMap, ImmutableSetMultimap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.{BatchWriterConfig, Connector, TableExistsException} import org.apache.accumulo.core.data.{Key, Mutation, Range, Value} import org.apache.accumulo.core.security.TablePermission diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/index/RasterEntry.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/index/RasterEntry.scala index 83efb3509b45..658b7ff0e021 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/index/RasterEntry.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/index/RasterEntry.scala @@ -12,7 +12,7 @@ import java.awt.image.RenderedImage import java.io.{ByteArrayInputStream, ObjectInputStream} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.accumulo.core.data.{Key, Value} import org.apache.hadoop.io.Text diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/GeomesaFilteringIterator.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/GeomesaFilteringIterator.scala index 0f38e2f78294..674b1c948c53 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/GeomesaFilteringIterator.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/GeomesaFilteringIterator.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.raster.iterators -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{ByteSequence, Key, Range, Value} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/IndexedSpatioTemporalFilter.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/IndexedSpatioTemporalFilter.scala index 7d02ef273697..77a80ac638ca 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/IndexedSpatioTemporalFilter.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/iterators/IndexedSpatioTemporalFilter.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.raster.iterators import java.util.{Map => JMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Key, Value} import org.apache.accumulo.core.iterators.{IteratorEnvironment, SortedKeyValueIterator} diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/wcs/GeoMesaCoverageReader.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/wcs/GeoMesaCoverageReader.scala index 0c20770fce06..bc2b366d2777 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/wcs/GeoMesaCoverageReader.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/main/scala/org/locationtech/geomesa/raster/wcs/GeoMesaCoverageReader.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.raster.wcs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.coverage.CoverageFactoryFinder import org.geotools.coverage.grid.io.AbstractGridCoverage2DReader import org.geotools.coverage.grid.{GridCoverage2D, GridEnvelope2D} diff --git a/geomesa-accumulo/geomesa-accumulo-raster/src/test/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlannerTest.scala b/geomesa-accumulo/geomesa-accumulo-raster/src/test/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlannerTest.scala index df7e74843f58..5de612fb2840 100644 --- a/geomesa-accumulo/geomesa-accumulo-raster/src/test/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlannerTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-raster/src/test/scala/org/locationtech/geomesa/raster/data/AccumuloRasterQueryPlannerTest.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.raster.data import com.google.common.collect.{ImmutableMap, ImmutableSetMultimap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.raster.RasterTestsUtils._ import org.locationtech.geomesa.raster._ diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime/src/test/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSparkProviderTest.scala b/geomesa-accumulo/geomesa-accumulo-spark-runtime/src/test/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSparkProviderTest.scala index 31e0ec462dd4..2955c6c9d6e3 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime/src/test/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSparkProviderTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime/src/test/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSparkProviderTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.accumulo.spark -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.spark.sql.{DataFrame, SQLContext, SQLTypes, SparkSession} import org.geotools.data.{Query, Transaction} import org.geotools.factory.CommonFactoryFinder diff --git a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala index f3a3cd7d721a..4d5158bc3086 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +++ b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.spark.accumulo -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.ClientConfiguration import org.apache.accumulo.core.client.mapred.AbstractInputFormat import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat diff --git a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/data/DeleteRasterCommand.scala b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/data/DeleteRasterCommand.scala index 40a5d1f5d21b..36bab8cda556 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/data/DeleteRasterCommand.scala +++ b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/data/DeleteRasterCommand.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.accumulo.tools.data import com.beust.jcommander.Parameters -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.data.{Range => ARange} import org.locationtech.geomesa.accumulo.tools.{AccumuloConnectionParams, AccumuloRasterTableParam} import org.locationtech.geomesa.accumulo.tools.data.DeleteRasterCommand.DeleteRasterParams diff --git a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/raster/RasterIngest.scala b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/raster/RasterIngest.scala index 560b89577f53..adf33d3c14dc 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/raster/RasterIngest.scala +++ b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/raster/RasterIngest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.accumulo.tools.raster import java.io.{File, Serializable} import java.util.{Map => JMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.coverage.grid.io.{AbstractGridCoverage2DReader, GridFormatFinder} import org.geotools.factory.Hints import org.locationtech.geomesa.accumulo.data.{AccumuloDataStoreParams => dsp} diff --git a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/filter/ArrowFilterOptimizer.scala b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/filter/ArrowFilterOptimizer.scala index 851ba312ffb1..125f048e505e 100644 --- a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/filter/ArrowFilterOptimizer.scala +++ b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/filter/ArrowFilterOptimizer.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.arrow.filter import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Polygon} import org.geotools.filter.visitor.BindingFilterVisitor import org.geotools.geometry.jts.ReferencedEnvelope diff --git a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/DeltaWriter.scala b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/DeltaWriter.scala index 36874c413b42..6a2816e27e8a 100644 --- a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/DeltaWriter.scala +++ b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/DeltaWriter.scala @@ -14,7 +14,7 @@ import java.util.concurrent.ThreadLocalRandom import com.google.common.collect.HashBiMap import com.google.common.primitives.{Ints, Longs} -import com.typesafe.scalalogging.StrictLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.arrow.memory.BufferAllocator import org.apache.arrow.vector.complex.NullableMapVector @@ -50,7 +50,7 @@ class DeltaWriter(val sft: SimpleFeatureType, encoding: SimpleFeatureEncoding, sort: Option[(String, Boolean)], initialCapacity: Int) - (implicit allocator: BufferAllocator) extends Closeable with StrictLogging { + (implicit allocator: BufferAllocator) extends Closeable with LazyLogging { import DeltaWriter._ @@ -201,7 +201,7 @@ class DeltaWriter(val sft: SimpleFeatureType, } } -object DeltaWriter extends StrictLogging { +object DeltaWriter extends LazyLogging { // empty provider private val provider = new MapDictionaryProvider() diff --git a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/SimpleFeatureArrowIO.scala b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/SimpleFeatureArrowIO.scala index 79d845e2b1bb..2a1a4825c6a1 100644 --- a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/SimpleFeatureArrowIO.scala +++ b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/io/SimpleFeatureArrowIO.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.arrow.io import java.io.ByteArrayOutputStream import java.util.Collections -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.arrow.memory.BufferAllocator import org.apache.arrow.vector._ diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/src/main/scala/org/locationtech/geomesa/bigtable/index/BigtableFeatureIndex.scala b/geomesa-bigtable/geomesa-bigtable-datastore/src/main/scala/org/locationtech/geomesa/bigtable/index/BigtableFeatureIndex.scala index cc6ddb7ffb47..91882eda0418 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/src/main/scala/org/locationtech/geomesa/bigtable/index/BigtableFeatureIndex.scala +++ b/geomesa-bigtable/geomesa-bigtable-datastore/src/main/scala/org/locationtech/geomesa/bigtable/index/BigtableFeatureIndex.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.bigtable.index import com.google.cloud.bigtable.hbase.BigtableExtendedScan import com.google.common.collect.Lists -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.hbase.TableName import org.apache.hadoop.hbase.client._ import org.apache.hadoop.hbase.filter.MultiRowRangeFilter.RowRange diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/AccumuloBlobStoreImpl.scala b/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/AccumuloBlobStoreImpl.scala index 177def46c9b1..b94501809a6c 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/AccumuloBlobStoreImpl.scala +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/AccumuloBlobStoreImpl.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.blob.accumulo -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.{BatchWriterConfig, Connector} import org.apache.accumulo.core.data.{Mutation, Range, Value} import org.apache.hadoop.io.Text diff --git a/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/GeoMesaAccumuloBlobStore.scala b/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/GeoMesaAccumuloBlobStore.scala index af82270fcc24..ddbaa0ddaaa1 100644 --- a/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/GeoMesaAccumuloBlobStore.scala +++ b/geomesa-blobstore/geomesa-blobstore-accumulo/src/main/scala/org/locationtech/geomesa/blob/accumulo/GeoMesaAccumuloBlobStore.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.blob.accumulo -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.accumulo.data.AccumuloDataStore import org.locationtech.geomesa.accumulo.util.GeoMesaBatchWriterConfig import org.locationtech.geomesa.blob.api.GeoMesaGenericBlobStore diff --git a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/src/main/scala/org/locationtech/geomesa/blob/handlers/gdal/GDALFileHandler.scala b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/src/main/scala/org/locationtech/geomesa/blob/handlers/gdal/GDALFileHandler.scala index 12c12fa151ec..3a959f56009d 100644 --- a/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/src/main/scala/org/locationtech/geomesa/blob/handlers/gdal/GDALFileHandler.scala +++ b/geomesa-blobstore/geomesa-blobstore-handlers/geomesa-blobstore-gdal-handler/src/main/scala/org/locationtech/geomesa/blob/handlers/gdal/GDALFileHandler.scala @@ -12,7 +12,7 @@ import java.io.File import java.lang.Boolean import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Geometry, GeometryFactory} import org.gdal.gdal.{Dataset, Transformer, gdal} import org.gdal.gdalconst.gdalconstConstants diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/src/main/scala/org/locationtech/geomesa/cassandra/index/CassandraFeatureIndex.scala b/geomesa-cassandra/geomesa-cassandra-datastore/src/main/scala/org/locationtech/geomesa/cassandra/index/CassandraFeatureIndex.scala index 53ba819f096e..2257566d7666 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/src/main/scala/org/locationtech/geomesa/cassandra/index/CassandraFeatureIndex.scala +++ b/geomesa-cassandra/geomesa-cassandra-datastore/src/main/scala/org/locationtech/geomesa/cassandra/index/CassandraFeatureIndex.scala @@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets import com.datastax.driver.core._ import com.datastax.driver.core.querybuilder.{QueryBuilder, Select} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.Hints import org.locationtech.geomesa.cassandra.data._ import org.locationtech.geomesa.cassandra.index.legacy.{CassandraAttributeIndexV1, CassandraZ2IndexV1, CassandraZ3IndexV1} diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigLoader.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigLoader.scala index acd2c8735272..08b0a662882e 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigLoader.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigLoader.scala @@ -13,7 +13,7 @@ import java.util import java.util.{ServiceLoader, List => JList} import com.typesafe.config.{Config, ConfigFactory} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import scala.collection.JavaConversions._ diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigResolver.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigResolver.scala index b5e93e502c15..b3061f33e0fa 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigResolver.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/ConverterConfigResolver.scala @@ -12,7 +12,7 @@ import java.io.InputStreamReader import java.nio.charset.StandardCharsets import com.typesafe.config.{Config, ConfigFactory} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.conf.ArgResolver import org.locationtech.geomesa.utils.io.PathUtils diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverterFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverterFactory.scala index 2708aa1abcf4..aa8ef81893fa 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverterFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverterFactory.scala @@ -13,7 +13,7 @@ import java.nio.charset.StandardCharsets import java.util.NoSuchElementException import com.typesafe.config.Config -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.geotools.factory.Hints import org.locationtech.geomesa.convert.ParseMode.ParseMode diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverters.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverters.scala index f094f851f242..12a19a418ad1 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverters.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/SimpleFeatureConverters.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.convert import java.util.ServiceLoader import com.typesafe.config.Config -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypeLoader import org.opengis.feature.simple.SimpleFeatureType diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/Transformers.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/Transformers.scala index b43ff10872fc..1cb51eb3de57 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/Transformers.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/Transformers.scala @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.{Date, DoubleSummaryStatistics, Locale, ServiceLoader, UUID} import com.google.common.hash.Hashing -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.apache.commons.codec.binary.Base64 import org.geotools.geometry.jts.{JTS, JTSFactoryFinder} diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/cql/CqlFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/cql/CqlFunctionFactory.scala index f605c599ed5b..d2765c905180 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/cql/CqlFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/cql/CqlFunctionFactory.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.convert.cql -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.{CommonFactoryFinder, Hints} import org.geotools.feature.NameImpl import org.geotools.filter.expression.{PropertyAccessor, PropertyAccessorFactory} diff --git a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmNodesConverter.scala b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmNodesConverter.scala index 41ba436e66a9..2b7bb9529c0d 100644 --- a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmNodesConverter.scala +++ b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmNodesConverter.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.convert.osm import java.io.InputStream import com.typesafe.config.Config -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Coordinate import de.topobyte.osm4j.core.model.iface._ import de.topobyte.osm4j.pbf.seq.PbfIterator diff --git a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmWaysConverter.scala b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmWaysConverter.scala index 00cf8ec086b0..827d09461409 100644 --- a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmWaysConverter.scala +++ b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/OsmWaysConverter.scala @@ -13,7 +13,7 @@ import java.nio.file.Files import java.sql.{Connection, DriverManager} import com.typesafe.config.Config -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Coordinate import de.topobyte.osm4j.core.model.iface._ import de.topobyte.osm4j.core.model.impl.Node diff --git a/geomesa-convert/geomesa-convert-scripting/src/main/scala/org/locationtech/geomesa/convert/scripting/ScriptingFunctionFactory.scala b/geomesa-convert/geomesa-convert-scripting/src/main/scala/org/locationtech/geomesa/convert/scripting/ScriptingFunctionFactory.scala index f8043378798c..0d1aa463144c 100644 --- a/geomesa-convert/geomesa-convert-scripting/src/main/scala/org/locationtech/geomesa/convert/scripting/ScriptingFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-scripting/src/main/scala/org/locationtech/geomesa/convert/scripting/ScriptingFunctionFactory.scala @@ -15,7 +15,7 @@ import java.util.Collections import javax.script.{Invocable, ScriptContext, ScriptEngine, ScriptEngineManager} import com.google.common.io.Files -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.filefilter.TrueFileFilter import org.apache.commons.io.{FileUtils, IOUtils} import org.locationtech.geomesa.convert.{EvaluationContext, TransformerFn, TransformerFunctionFactory} diff --git a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XMLConverter.scala b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XMLConverter.scala index 9c41da37750f..c4433c10be4b 100644 --- a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XMLConverter.scala +++ b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XMLConverter.scala @@ -18,7 +18,7 @@ import javax.xml.validation.SchemaFactory import javax.xml.xpath.{XPath, XPathConstants, XPathExpression, XPathFactory} import com.typesafe.config.Config -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.apache.commons.io.input.BOMInputStream import org.locationtech.geomesa.convert.LineMode.LineMode diff --git a/geomesa-features/geomesa-feature-avro/src/test/scala/org/locationtech/geomesa/features/avro/FeatureSpecificReaderTest.scala b/geomesa-features/geomesa-feature-avro/src/test/scala/org/locationtech/geomesa/features/avro/FeatureSpecificReaderTest.scala index c52fe5781e58..aee9daca2bb2 100644 --- a/geomesa-features/geomesa-feature-avro/src/test/scala/org/locationtech/geomesa/features/avro/FeatureSpecificReaderTest.scala +++ b/geomesa-features/geomesa-feature-avro/src/test/scala/org/locationtech/geomesa/features/avro/FeatureSpecificReaderTest.scala @@ -13,7 +13,7 @@ import java.nio.charset.StandardCharsets.UTF_8 import java.text.SimpleDateFormat import java.util.UUID -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{LineString, Point, Polygon} import org.apache.avro.io.{DecoderFactory, EncoderFactory} import org.geotools.data.DataUtilities diff --git a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GenericMapSerialization.scala b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GenericMapSerialization.scala index 3eb98be893b3..39b262459db8 100644 --- a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GenericMapSerialization.scala +++ b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GenericMapSerialization.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.features.serialization -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.Hints // noinspection LanguageFeature diff --git a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GeometrySerialization.scala b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GeometrySerialization.scala index 569a290fa54c..69d4fc33d218 100644 --- a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GeometrySerialization.scala +++ b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/serialization/GeometrySerialization.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.features.serialization -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import scala.reflect.ClassTag diff --git a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/JsonPathFilterFunction.scala b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/JsonPathFilterFunction.scala index 9223a5d49824..5d104cacac3d 100644 --- a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/JsonPathFilterFunction.scala +++ b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/JsonPathFilterFunction.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.features.kryo.json -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.filter.FunctionExpressionImpl import org.geotools.filter.capability.FunctionNameImpl import org.geotools.filter.capability.FunctionNameImpl.parameter diff --git a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/KryoJsonSerialization.scala b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/KryoJsonSerialization.scala index 9ced0d355a89..267e2e49f214 100644 --- a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/KryoJsonSerialization.scala +++ b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/json/KryoJsonSerialization.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.features.kryo.json import java.nio.charset.StandardCharsets import com.esotericsoftware.kryo.io.{Input, Output} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.json4s.JsonAST._ import org.json4s.native.JsonMethods.{parse => _, _} import org.locationtech.geomesa.features.kryo.json.JsonPathParser.JsonPathFunction.JsonPathFunction diff --git a/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoFeatureSerializerTest.scala b/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoFeatureSerializerTest.scala index 9aa4967b78f3..ee521b801d64 100644 --- a/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoFeatureSerializerTest.scala +++ b/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoFeatureSerializerTest.scala @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets import java.util import java.util.{Date, UUID} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.commons.codec.binary.Base64 import org.junit.runner.RunWith diff --git a/geomesa-features/geomesa-feature-nio/src/test/scala/org/locationtech/geomesa/features/nio/LazySimpleFeatureTest.scala b/geomesa-features/geomesa-feature-nio/src/test/scala/org/locationtech/geomesa/features/nio/LazySimpleFeatureTest.scala index ce253695b00d..9479366a8f12 100644 --- a/geomesa-features/geomesa-feature-nio/src/test/scala/org/locationtech/geomesa/features/nio/LazySimpleFeatureTest.scala +++ b/geomesa-features/geomesa-feature-nio/src/test/scala/org/locationtech/geomesa/features/nio/LazySimpleFeatureTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.features.nio import java.nio.ByteBuffer import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.features.ScalaSimpleFeature import org.locationtech.geomesa.features.nio.AttributeAccessor.ByteBufferSimpleFeatureSerializer diff --git a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala index f790952e0fd3..516ac1ecb71a 100644 --- a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala +++ b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.filter import java.time.{ZoneOffset, ZonedDateTime} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.geotools.data.DataUtilities import org.geotools.filter.spatial.BBOXImpl diff --git a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterPackageObjectTest.scala b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterPackageObjectTest.scala index b955c19cc8c2..f612a6958dca 100644 --- a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterPackageObjectTest.scala +++ b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterPackageObjectTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.filter -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.CommonFactoryFinder import org.geotools.filter.text.ecql.ECQL import org.junit.runner.RunWith diff --git a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemDataStore.scala b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemDataStore.scala index bb383b2cc802..40a6ed55fa36 100644 --- a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemDataStore.scala +++ b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemDataStore.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.fs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileContext, Path} import org.geotools.data.Query diff --git a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemFeatureStore.scala b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemFeatureStore.scala index caedd383ba91..d1085483ece5 100644 --- a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemFeatureStore.scala +++ b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemFeatureStore.scala @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong import com.google.common.cache._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.simple.DelegateSimpleFeatureReader import org.geotools.data.store.{ContentEntry, ContentFeatureStore} import org.geotools.data.{FeatureReader, FeatureWriter, Query} diff --git a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemStorageManager.scala b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemStorageManager.scala index c58ff3586d2c..686a1738aff0 100644 --- a/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemStorageManager.scala +++ b/geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/FileSystemStorageManager.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.fs import java.util.concurrent.ConcurrentHashMap import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileContext, Path} import org.locationtech.geomesa.fs.storage.api.FileSystemStorage diff --git a/geomesa-fs/geomesa-fs-spark/src/main/scala/org/locationtech/geomesa/fs/spark/FileSystemRDDProvider.scala b/geomesa-fs/geomesa-fs-spark/src/main/scala/org/locationtech/geomesa/fs/spark/FileSystemRDDProvider.scala index 2ff529b1b4c4..36e129a3b91c 100644 --- a/geomesa-fs/geomesa-fs-spark/src/main/scala/org/locationtech/geomesa/fs/spark/FileSystemRDDProvider.scala +++ b/geomesa-fs/geomesa-fs-spark/src/main/scala/org/locationtech/geomesa/fs/spark/FileSystemRDDProvider.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.fs.spark import java.io.Serializable -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.apache.hadoop.conf.Configuration import org.apache.hadoop.mapreduce.lib.input.FileInputFormat diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileMetadata.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileMetadata.scala index 82f4d0215acc..7fe9b07651be 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileMetadata.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileMetadata.scala @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} import com.typesafe.config._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Options.{CreateOpts, Rename} import org.apache.hadoop.fs._ import org.locationtech.geomesa.fs.storage.api.PartitionScheme diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileSystemThreadedReader.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileSystemThreadedReader.scala index 11c2a6c37738..a9f40e4c99af 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileSystemThreadedReader.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/FileSystemThreadedReader.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.fs.storage.common import java.util.concurrent.{Executors, LinkedBlockingQueue, TimeUnit} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.locationtech.geomesa.fs.storage.api.FileSystemReader import org.locationtech.geomesa.utils.collection.CloseableIterator diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/MetadataFileSystemStorage.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/MetadataFileSystemStorage.scala index 0c24b768bce4..344a27a1541c 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/MetadataFileSystemStorage.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/MetadataFileSystemStorage.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.fs.storage.common -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.geotools.data.Query diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/jobs/PartitionOutputFormat.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/jobs/PartitionOutputFormat.scala index acc10411cbca..4958304df6c2 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/jobs/PartitionOutputFormat.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/jobs/PartitionOutputFormat.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.fs.storage.common.jobs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.apache.hadoop.mapred.InvalidJobConfException import org.apache.hadoop.mapreduce._ diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterPartitionReader.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterPartitionReader.scala index b4177d4a5a7d..515b13988056 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterPartitionReader.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterPartitionReader.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.fs.storage.converter import java.util.concurrent.TimeUnit -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.convert.SimpleFeatureConverter import org.locationtech.geomesa.fs.storage.api.FileSystemReader import org.locationtech.geomesa.utils.collection.CloseableIterator diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterStorageFactory.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterStorageFactory.scala index dbddd4a5bcda..0b7c9a884d7b 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterStorageFactory.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/src/main/scala/org/locationtech/geomesa/fs/storage/converter/ConverterStorageFactory.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.fs.storage.converter import java.util.Optional import java.util.regex.Pattern -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileContext, Path} import org.locationtech.geomesa.convert.{ConfArgs, ConverterConfigResolver, SimpleFeatureConverters} diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/main/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorage.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/main/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorage.scala index 6cb432e5e19a..0d4037f0dc48 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/main/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorage.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/main/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorage.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.fs.storage.orc -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/test/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorageTest.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/test/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorageTest.scala index 80ddaef34c04..e4ea90d59120 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/test/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorageTest.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/src/test/scala/org/locationtech/geomesa/fs/storage/orc/OrcFileSystemStorageTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.fs.storage.orc import java.nio.file.Files import java.util.{Collections, UUID} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileContext, Path} import org.geotools.data.Query diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/FilteringReader.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/FilteringReader.scala index e113e9c7402f..4c8de4fe3f18 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/FilteringReader.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/FilteringReader.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.parquet -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.parquet.filter2.compat.FilterCompat diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/SimpleFeatureParquetWriter.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/SimpleFeatureParquetWriter.scala index 84c77ca05b10..e20a18cc90a0 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/SimpleFeatureParquetWriter.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/SimpleFeatureParquetWriter.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.parquet -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.parquet.column.ParquetProperties diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetSimpleFeatureOutputFormat.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetSimpleFeatureOutputFormat.scala index 66a814957938..4915ef26faee 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetSimpleFeatureOutputFormat.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetSimpleFeatureOutputFormat.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.parquet.jobs import java.io.IOException -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce.lib.output.{FileOutputCommitter, FileOutputFormat} diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetStorageConfiguration.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetStorageConfiguration.scala index aaf3531bc79e..ff6638524e3c 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetStorageConfiguration.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/src/main/scala/org/locationtech/geomesa/parquet/jobs/ParquetStorageConfiguration.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.parquet.jobs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.mapreduce.Job import org.apache.parquet.hadoop.metadata.CompressionCodecName import org.apache.parquet.hadoop.{ParquetInputFormat, ParquetOutputFormat} diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/CompactCommand.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/CompactCommand.scala index e76b133109e2..e1a3d3972d3f 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/CompactCommand.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/CompactCommand.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.fs.tools.compact import java.io.File import com.beust.jcommander.{ParameterException, Parameters} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.locationtech.geomesa.fs.FileSystemDataStore import org.locationtech.geomesa.fs.storage.orc.OrcFileSystemStorage diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FileSystemCompactionJob.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FileSystemCompactionJob.scala index efcfce78b4cb..21ceb23ee33f 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FileSystemCompactionJob.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FileSystemCompactionJob.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.fs.tools.compact import java.io.File -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce._ diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala index 23575b5cbee8..fb57d1a93a5d 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala @@ -12,7 +12,7 @@ import java.io.File import java.lang.Iterable import com.typesafe.config.{Config, ConfigRenderOptions} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.io.{BytesWritable, LongWritable, Text} diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/StorageJobUtils.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/StorageJobUtils.scala index d0a1ea8cbebb..a2e911fbe5c9 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/StorageJobUtils.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/StorageJobUtils.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.fs.tools.ingest import java.util.Collections -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce.JobStatus diff --git a/geomesa-geojson/geomesa-geojson-api/src/main/scala/org/locationtech/geomesa/geojson/GeoJsonGtIndex.scala b/geomesa-geojson/geomesa-geojson-api/src/main/scala/org/locationtech/geomesa/geojson/GeoJsonGtIndex.scala index d4a0ee8273d2..21dfe4205e73 100644 --- a/geomesa-geojson/geomesa-geojson-api/src/main/scala/org/locationtech/geomesa/geojson/GeoJsonGtIndex.scala +++ b/geomesa-geojson/geomesa-geojson-api/src/main/scala/org/locationtech/geomesa/geojson/GeoJsonGtIndex.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.geojson import java.io.Closeable import com.github.benmanes.caffeine.cache.Caffeine -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Geometry, Point} import org.geotools.data.{DataStore, FeatureWriter, Query, Transaction} import org.geotools.factory.Hints diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala index 79875336f278..54505a05b370 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/coprocessor/GeoMesaCoprocessor.scala @@ -14,7 +14,7 @@ import java.util.concurrent._ import com.google.common.util.concurrent.MoreExecutors import com.google.protobuf.{ByteString, RpcCallback, RpcController, Service} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.hbase.client.coprocessor.Batch.Call import org.apache.hadoop.hbase.client.{Scan, Table} import org.apache.hadoop.hbase.coprocessor.{CoprocessorException, CoprocessorService, RegionCoprocessorEnvironment} diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseConnectionPool.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseConnectionPool.scala index d500a1883276..728361049e09 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseConnectionPool.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseConnectionPool.scala @@ -12,7 +12,7 @@ import java.io.Serializable import java.security.PrivilegedExceptionAction import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.hbase.{HBaseConfiguration, HConstants} diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala index c611e2d73a5d..90b07dbc0efb 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.hbase.data import java.awt.RenderingHints import java.io.Serializable -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.apache.hadoop.hbase.HBaseConfiguration import org.apache.hadoop.hbase.client.Connection diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseFeatureCollection.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseFeatureCollection.scala index 35fe644fda6b..cca27c4a4dbe 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseFeatureCollection.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseFeatureCollection.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data._ import org.locationtech.geomesa.index.geotools.{GeoMesaFeatureCollection, GeoMesaFeatureSource} import org.locationtech.geomesa.process.GeoMesaProcessVisitor diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/filters/HBaseZFilters.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/filters/HBaseZFilters.scala index 113ece0d7b79..96170b7d25d8 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/filters/HBaseZFilters.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/filters/HBaseZFilters.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.hbase.filters import com.google.common.primitives.{Bytes, Ints} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.hbase.Cell import org.apache.hadoop.hbase.exceptions.DeserializationException import org.apache.hadoop.hbase.filter.{Filter, FilterBase} diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseFeatureIndex.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseFeatureIndex.scala index 53669eb2e20a..a6515d5e2247 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseFeatureIndex.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/index/HBaseFeatureIndex.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.hbase.index import java.util.Locale -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.apache.hadoop.hbase._ import org.apache.hadoop.hbase.client._ diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseArrowTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseArrowTest.scala index 3b5b0b3f6bd8..57d1778e6ec0 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseArrowTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseArrowTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.hbase.data import java.io.{ByteArrayInputStream, ByteArrayOutputStream} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.arrow.memory.{BufferAllocator, RootAllocator} import org.geotools.data.{DataStoreFinder, Query, Transaction} import org.geotools.filter.text.ecql.ECQL diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseBinAggregatorTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseBinAggregatorTest.scala index 878c2b853696..923fe270d7bc 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseBinAggregatorTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseBinAggregatorTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.hbase.data import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import org.geotools.data._ import org.geotools.data.simple.SimpleFeatureStore diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala index 32ad91d8b064..007b2a79533a 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.hbase.TableName import org.geotools.data._ import org.geotools.data.collection.ListFeatureCollection diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDensityFilterTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDensityFilterTest.scala index fc126dd5579b..9f4760510db4 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDensityFilterTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseDensityFilterTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.hbase.data import java.time.{ZoneOffset, ZonedDateTime} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Envelope import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.SimpleFeatureStore diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseStatsAggregatorTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseStatsAggregatorTest.scala index 897017aafe00..6b9d4f745ea1 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseStatsAggregatorTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseStatsAggregatorTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.SimpleFeatureStore import org.geotools.data.{DataStoreFinder, Query} diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseTestRunnerTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseTestRunnerTest.scala index 36df9e4c17d8..9d4e181b26e1 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseTestRunnerTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseTestRunnerTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.hbase.HBaseTestingUtility import org.apache.hadoop.hbase.client.Connection import org.apache.hadoop.hbase.coprocessor.CoprocessorHost diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseVisibilityTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseVisibilityTest.scala index d772da6323c3..0e716a7fecf2 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseVisibilityTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBaseVisibilityTest.scala @@ -12,7 +12,7 @@ import java.io.Serializable import java.security.PrivilegedExceptionAction import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Envelope import org.apache.hadoop.hbase.TableName import org.apache.hadoop.hbase.client.security.SecurityCapability diff --git a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala index 2a1796796024..2973fcad589d 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala +++ b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.jobs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.hbase.HBaseConfiguration import org.apache.hadoop.hbase.client.Result diff --git a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/HBaseIndexFileMapper.scala b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/HBaseIndexFileMapper.scala index dfd3d65962e0..2db15de7e626 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/HBaseIndexFileMapper.scala +++ b/geomesa-hbase/geomesa-hbase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/HBaseIndexFileMapper.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.jobs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.fs.Path import org.apache.hadoop.hbase.client.{Mutation, Put} import org.apache.hadoop.hbase.io.ImmutableBytesWritable diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime/src/test/scala/org/locationtech/geomesa/hbase/spark/HBaseSparkProviderIntegrationTest.scala b/geomesa-hbase/geomesa-hbase-spark-runtime/src/test/scala/org/locationtech/geomesa/hbase/spark/HBaseSparkProviderIntegrationTest.scala index bd8cd034b0eb..c3044d98c635 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime/src/test/scala/org/locationtech/geomesa/hbase/spark/HBaseSparkProviderIntegrationTest.scala +++ b/geomesa-hbase/geomesa-hbase-spark-runtime/src/test/scala/org/locationtech/geomesa/hbase/spark/HBaseSparkProviderIntegrationTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.hbase.spark -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.spark.sql.{DataFrame, SQLContext, SQLTypes, SparkSession} import org.geotools.data.{Query, Transaction} import org.geotools.factory.CommonFactoryFinder diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/Splitters.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/Splitters.scala index 89c84a5056a6..8be9e9f5bdfd 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/Splitters.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/Splitters.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.index.conf import java.nio.charset.StandardCharsets -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.index.index.id.IdIndex import org.locationtech.geomesa.utils.text.KVPairParser import org.opengis.feature.simple.SimpleFeatureType diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/splitter/DefaultSplitter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/splitter/DefaultSplitter.scala index 2534f191cb81..e3ea16bcc267 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/splitter/DefaultSplitter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/splitter/DefaultSplitter.scala @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets import java.util.Date import com.google.common.primitives.{Bytes, Longs, Shorts} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.util.Converters import org.locationtech.geomesa.curve.BinnedTime import org.locationtech.geomesa.index.conf.TableSplitter diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/filters/DtgAgeOffFilter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/filters/DtgAgeOffFilter.scala index be7ebd056b57..df17702e611b 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/filters/DtgAgeOffFilter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/filters/DtgAgeOffFilter.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.index.filters import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.features.SerializationOption.SerializationOptions import org.locationtech.geomesa.features.kryo.KryoBufferSimpleFeature import org.locationtech.geomesa.index.api.{GeoMesaFeatureIndex, GeoMesaIndexManager} diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geoserver/ViewParams.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geoserver/ViewParams.scala index 6db20786fe58..53518b0ffc89 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geoserver/ViewParams.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geoserver/ViewParams.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.index.geoserver import java.util.{Locale, Map => jMap} import com.google.common.collect.ImmutableBiMap -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.factory.Hints import org.geotools.geometry.jts.ReferencedEnvelope diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureSource.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureSource.scala index f4dafbfc7c0f..02985fa40a53 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureSource.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureSource.scala @@ -15,7 +15,7 @@ import java.util.Collections import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong} import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data._ import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureIterator, SimpleFeatureSource} import org.geotools.data.store.DataFeatureCollection diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureWriter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureWriter.scala index 26edad8246bc..cace87866ba6 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureWriter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/GeoMesaFeatureWriter.scala @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong import com.github.benmanes.caffeine.cache.Caffeine -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.simple.SimpleFeatureWriter import org.geotools.data.{Query, Transaction} import org.geotools.factory.Hints diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/MetadataBackedDataStore.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/MetadataBackedDataStore.scala index 227c96b0cbf8..bdf6927ab438 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/MetadataBackedDataStore.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/geotools/MetadataBackedDataStore.scala @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets import java.time.{Instant, ZoneOffset} import java.util.{List => jList} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data._ import org.geotools.data.simple.{SimpleFeatureSource, SimpleFeatureWriter} import org.geotools.factory.Hints diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/BaseFeatureIndex.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/BaseFeatureIndex.scala index f4354447ab9b..316fd84cd79b 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/BaseFeatureIndex.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/BaseFeatureIndex.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.index -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.Hints import org.locationtech.geomesa.filter._ import org.locationtech.geomesa.index.api.{FilterStrategy, GeoMesaFeatureIndex, QueryPlan, WrappedFeature} diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/IndexAdapter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/IndexAdapter.scala index 904c4bc0a1d6..c2254e7dbc23 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/IndexAdapter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/IndexAdapter.scala @@ -13,7 +13,7 @@ package org.locationtech.geomesa.index.index -import com.typesafe.scalalogging.{LazyLogging, Logger} +import com.typesafe.scalalogging.slf4j.{LazyLogging, Logger} import org.geotools.factory.Hints import org.locationtech.geomesa.index.api.{FilterStrategy, QueryPlan, WrappedFeature} import org.locationtech.geomesa.index.geotools.GeoMesaDataStore diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/AttributeIndexKeySpace.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/AttributeIndexKeySpace.scala index 1ea089886878..eb303bbfe38b 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/AttributeIndexKeySpace.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/AttributeIndexKeySpace.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.index.index.attribute import java.nio.charset.StandardCharsets -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.factory.Hints import org.locationtech.geomesa.filter.{Bounds, FilterHelper, FilterValues, filterToString} import org.locationtech.geomesa.index.geotools.GeoMesaDataStoreFactory.GeoMesaDataStoreConfig diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/legacy/AttributeShardedIndex.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/legacy/AttributeShardedIndex.scala index 9a1886f07e7a..c6bc7b1bfbb0 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/legacy/AttributeShardedIndex.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/legacy/AttributeShardedIndex.scala @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets import java.util.{Locale, Collection => JCollection} import com.google.common.primitives.{Bytes, Shorts, UnsignedBytes} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.calrissian.mango.types.{LexiTypeEncoders, TypeRegistry} import org.geotools.data.DataUtilities import org.geotools.factory.Hints diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/DensityScan.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/DensityScan.scala index 549d7f3016c8..f51493f9ce04 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/DensityScan.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/DensityScan.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.index.iterators import java.awt.image.BufferedImage -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.geotools.factory.Hints import org.geotools.factory.Hints.ClassKey diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/StatsScan.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/StatsScan.scala index 317bc4f620ac..30a325b95469 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/StatsScan.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/iterators/StatsScan.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.iterators -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.codec.binary.Base64 import org.geotools.factory.Hints import org.locationtech.geomesa.features.ScalaSimpleFeature diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/metadata/CachedLazyMetadata.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/metadata/CachedLazyMetadata.scala index 0a0fe1e359e5..279e8beefb51 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/metadata/CachedLazyMetadata.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/metadata/CachedLazyMetadata.scala @@ -13,7 +13,7 @@ import java.nio.charset.StandardCharsets import java.util.concurrent.TimeUnit import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.collection.{CloseableIterator, IsSynchronized, MaybeSynchronized, NotSynchronized} import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import org.locationtech.geomesa.utils.io.WithClose diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/FilterSplitter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/FilterSplitter.scala index 43208cbf79bb..db9010216058 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/FilterSplitter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/FilterSplitter.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.planning -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.filter._ import org.locationtech.geomesa.filter.visitor.IdDetectingFilterVisitor import org.locationtech.geomesa.index.api.{FilterPlan, FilterStrategy, GeoMesaFeatureIndex, WrappedFeature} diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala index acae49e94f52..da683f772978 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.planning -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.geotools.data.Query import org.geotools.feature.AttributeTypeBuilder diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/StrategyDecider.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/StrategyDecider.scala index 44267da80ec5..d4be4aa36cf2 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/StrategyDecider.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/StrategyDecider.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.planning -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.index.api._ import org.locationtech.geomesa.index.geotools.GeoMesaDataStore import org.locationtech.geomesa.index.planning.QueryPlanner.CostEvaluation diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala index 58b6a61bc902..3ed26577a04b 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/stats/MetadataBackedStats.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.index.stats import java.time.{Instant, ZoneOffset} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.curve.BinnedTime import org.locationtech.geomesa.filter.visitor.QueryPlanFilterVisitor import org.locationtech.geomesa.index.geotools.GeoMesaDataStore diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Explainer.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Explainer.scala index 0d6c1ab9233f..43b9f6bbb595 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Explainer.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/Explainer.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.index.utils import java.io.PrintStream -import com.typesafe.scalalogging.Logger +import com.typesafe.scalalogging.slf4j.Logger import org.slf4j.LoggerFactory trait Explainer { diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala index 0fa5e656a5eb..42c9fd9a8308 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/ThreadManagement.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.util.concurrent.{ScheduledFuture, ScheduledThreadPoolExecutor, TimeUnit} import com.google.common.util.concurrent.MoreExecutors -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import scala.util.control.NonFatal diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/bin/BinSorter.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/bin/BinSorter.scala index 58390ebf2857..5b1600d355eb 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/bin/BinSorter.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/utils/bin/BinSorter.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.utils.bin -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging /** * Sorts aggregated bin arrays diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala index 80ef0270828f..89e2a3d0dce8 100644 --- a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.index.index -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.{Query, Transaction} import org.geotools.factory.Hints import org.geotools.filter.text.ecql.ECQL diff --git a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/JobUtils.scala b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/JobUtils.scala index ca730cdd4cea..4002604b82a4 100644 --- a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/JobUtils.scala +++ b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/JobUtils.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.jobs import java.io.File -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.locationtech.geomesa.utils.classpath.ClassPathUtils diff --git a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/ConverterInputFormat.scala b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/ConverterInputFormat.scala index 5af816849272..7bc25d3464a5 100644 --- a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/ConverterInputFormat.scala +++ b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/ConverterInputFormat.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.jobs.mapreduce import java.io.{Closeable, InputStream} import com.typesafe.config.ConfigFactory -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{Path, Seekable} import org.apache.hadoop.mapreduce._ diff --git a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/FileStreamInputFormat.scala b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/FileStreamInputFormat.scala index d59e5abab023..15f7336bbad2 100644 --- a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/FileStreamInputFormat.scala +++ b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/FileStreamInputFormat.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.jobs.mapreduce import java.io.{Closeable, InputStream} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{Path, Seekable} diff --git a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaOutputFormat.scala b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaOutputFormat.scala index 03a8cb73c39e..f85407d2a991 100644 --- a/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaOutputFormat.scala +++ b/geomesa-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaOutputFormat.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.jobs.mapreduce import java.io.IOException -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.io.Text import org.apache.hadoop.mapreduce._ import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala index 5a7f358f4928..1d4d1e322d1a 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{ConcurrentHashMap, Executors} import com.github.benmanes.caffeine.cache.{Cache, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.kafka.clients.consumer.{Consumer, ConsumerRecord} import org.geotools.data.simple.SimpleFeatureSource import org.geotools.data.{FeatureEvent, FeatureListener} diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala index b29fb12d7f4e..ea9ba599b92c 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala @@ -12,7 +12,7 @@ import java.io.IOException import java.util.{Properties, UUID} import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, Ticker} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import kafka.admin.AdminUtils import kafka.utils.ZkUtils import org.apache.kafka.clients.consumer.{Consumer, KafkaConsumer} diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureWriter.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureWriter.scala index 42248fd27325..874dd3c627d5 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureWriter.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureWriter.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.kafka.data import java.util.concurrent.atomic.AtomicLong -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.kafka.clients.producer.{Producer, ProducerRecord} import org.geotools.data.simple.SimpleFeatureWriter import org.geotools.factory.Hints diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheCqEngine.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheCqEngine.scala index ac193bf6dc1c..c8cd61859bc8 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheCqEngine.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheCqEngine.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.kafka.index import com.github.benmanes.caffeine.cache._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.kafka.index.KafkaFeatureCache.AbstractKafkaFeatureCache import org.locationtech.geomesa.memory.cqengine.GeoCQEngine import org.locationtech.geomesa.utils.geotools.Conversions._ diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheGuava.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheGuava.scala index 3f579dbb1426..cc3639027715 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheGuava.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureCacheGuava.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.kafka.index import com.github.benmanes.caffeine.cache._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Envelope import org.locationtech.geomesa.filter.index.SpatialIndexSupport import org.locationtech.geomesa.kafka.index.FeatureCacheGuava.FeatureHolder diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCache.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCache.scala index 72a5ec197268..7434f9a2a136 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCache.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCache.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.util.concurrent.{Executors, TimeUnit} import com.github.benmanes.caffeine.cache._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.opengis.feature.simple.SimpleFeature import org.opengis.filter.Filter diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/utils/GeoMessageSerializer.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/utils/GeoMessageSerializer.scala index 9f38e6c383ed..fae0c778ca20 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/utils/GeoMessageSerializer.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/utils/GeoMessageSerializer.scala @@ -12,7 +12,7 @@ import java.nio.ByteBuffer import java.nio.charset.StandardCharsets import java.time.Instant -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.kafka.clients.producer.Partitioner import org.apache.kafka.common.Cluster import org.locationtech.geomesa.features.SerializationOption.SerializationOptions diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala index 590b6d1a1b52..40ca46305b27 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala @@ -13,7 +13,7 @@ import java.util.Date import java.util.concurrent.atomic.AtomicInteger import java.{io, util} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import kafka.admin.AdminUtils import org.apache.curator.framework.CuratorFrameworkFactory diff --git a/geomesa-kafka/geomesa-kafka-tools/src/main/scala/org/locationtech/geomesa/kafka/tools/export/KafkaListenCommand.scala b/geomesa-kafka/geomesa-kafka-tools/src/main/scala/org/locationtech/geomesa/kafka/tools/export/KafkaListenCommand.scala index dbc8f4d4f998..dd60b1c2d2ff 100644 --- a/geomesa-kafka/geomesa-kafka-tools/src/main/scala/org/locationtech/geomesa/kafka/tools/export/KafkaListenCommand.scala +++ b/geomesa-kafka/geomesa-kafka-tools/src/main/scala/org/locationtech/geomesa/kafka/tools/export/KafkaListenCommand.scala @@ -12,7 +12,7 @@ import java.time.{Instant, ZoneOffset, ZonedDateTime} import java.time.format.DateTimeFormatter import com.beust.jcommander.{ParameterException, Parameters} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.{DataUtilities, FeatureEvent, FeatureListener} import org.locationtech.geomesa.kafka.tools.export.KafkaListenCommand.{ListenParameters, OutFeatureListener} import org.locationtech.geomesa.kafka.tools.{ConsumerDataStoreParams, KafkaDataStoreCommand} diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 14064eb99f55..6e849cb79e49 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -17,7 +17,11 @@ com.typesafe.scala-logging - scala-logging_${scala.binary.version} + scala-logging-api_${scala.binary.version} + + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} diff --git a/geomesa-kafka/geomesa-kafka-utils/src/main/scala/org/locationtech/geomesa/kafka/consumer/ThreadedConsumer.scala b/geomesa-kafka/geomesa-kafka-utils/src/main/scala/org/locationtech/geomesa/kafka/consumer/ThreadedConsumer.scala index fa427da2cc69..99eac0911faa 100644 --- a/geomesa-kafka/geomesa-kafka-utils/src/main/scala/org/locationtech/geomesa/kafka/consumer/ThreadedConsumer.scala +++ b/geomesa-kafka/geomesa-kafka-utils/src/main/scala/org/locationtech/geomesa/kafka/consumer/ThreadedConsumer.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{ExecutorService, Executors, TimeUnit} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.kafka.clients.consumer.{Consumer, ConsumerRecord, OffsetAndMetadata, OffsetCommitCallback} import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.errors.WakeupException diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala index 7a75eeb338dd..81096394c25e 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.lambda.data import java.time.Clock import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import kafka.admin.AdminUtils import org.apache.kafka.clients.producer.Producer import org.geotools.data._ diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/ZookeeperOffsetManager.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/ZookeeperOffsetManager.scala index 9de6c9a240c2..e76def5023f3 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/ZookeeperOffsetManager.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/ZookeeperOffsetManager.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.nio.charset.StandardCharsets import java.util.concurrent.{Executors, TimeUnit} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.curator.framework.recipes.cache.{PathChildrenCache, PathChildrenCacheEvent, PathChildrenCacheListener} import org.apache.curator.framework.recipes.locks.InterProcessSemaphoreMutex import org.apache.curator.framework.{CuratorFramework, CuratorFrameworkFactory} diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala index 39b29b791be3..a7c1b80684d6 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.time.Clock import java.util.concurrent.{Executors, TimeUnit} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.{DataStore, Transaction} import org.locationtech.geomesa.lambda.stream.OffsetManager import org.locationtech.geomesa.lambda.stream.kafka.KafkaFeatureCache.ExpiringFeatureCache diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala index 24b8de65f279..fe9a78d97363 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.locks.ReentrantLock -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.lambda.stream.OffsetManager.OffsetListener import org.locationtech.geomesa.lambda.stream.kafka.KafkaFeatureCache.{ExpiringFeatureCache, ReadableFeatureCache, WritableFeatureCache} import org.opengis.feature.simple.SimpleFeature diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala index 1b230dcea317..ce56acab654b 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala @@ -12,7 +12,7 @@ import java.time.Clock import java.util.{Properties, UUID} import com.google.common.primitives.Longs -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import kafka.admin.AdminUtils import kafka.common.TopicAlreadyMarkedForDeletionException import kafka.utils.ZkUtils diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala index 36d4a68425a0..88aa37350bcc 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.lambda import java.io.ByteArrayInputStream import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.arrow.memory.{BufferAllocator, RootAllocator} import org.geotools.data.{DataStoreFinder, DataUtilities, Query, Transaction} import org.geotools.factory.Hints diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaTestRunnerTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaTestRunnerTest.scala index 1e017cf91956..bf302667d27b 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaTestRunnerTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaTestRunnerTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.lambda import java.time.{Clock, Instant, ZoneId, ZoneOffset} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.accumulo.core.client.mock.MockInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken import org.junit.runner.RunWith diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala index c859cb47aca5..0af0f7dcbfca 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/ZookeeperOffsetManagerTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.lambda -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.lambda.LambdaTestRunnerTest.LambdaTest import org.locationtech.geomesa.lambda.stream.OffsetManager.OffsetListener import org.locationtech.geomesa.lambda.stream.ZookeeperOffsetManager diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCacheTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCacheTest.scala index f79d6c2cb74a..211562125b8b 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCacheTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCacheTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.lambda.stream.kafka -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.features.ScalaSimpleFeature.ImmutableSimpleFeature import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStoreTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStoreTest.scala index 6cc37821aa2b..bf572bc716e5 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStoreTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStoreTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.lambda.stream.kafka import java.util.concurrent.atomic.AtomicInteger -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import kafka.admin.AdminUtils import kafka.javaapi.TopicMetadataRequest import org.geotools.data.memory.MemoryDataStore diff --git a/geomesa-memory/geomesa-cqengine-datastore/src/main/scala/org/locationtech/geomesa/memory/cqengine/datastore/GeoCQEngineDataStore.scala b/geomesa-memory/geomesa-cqengine-datastore/src/main/scala/org/locationtech/geomesa/memory/cqengine/datastore/GeoCQEngineDataStore.scala index b2a97ef9831c..c2165d19bb73 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/src/main/scala/org/locationtech/geomesa/memory/cqengine/datastore/GeoCQEngineDataStore.scala +++ b/geomesa-memory/geomesa-cqengine-datastore/src/main/scala/org/locationtech/geomesa/memory/cqengine/datastore/GeoCQEngineDataStore.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.memory.cqengine.datastore import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.store.{ContentDataStore, ContentEntry, ContentFeatureSource} import org.geotools.feature.NameImpl diff --git a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/GeoCQEngine.scala b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/GeoCQEngine.scala index 97d4bbe8394b..25b714f45f6d 100644 --- a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/GeoCQEngine.scala +++ b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/GeoCQEngine.scala @@ -20,7 +20,7 @@ import com.googlecode.cqengine.query.option.DeduplicationStrategy import com.googlecode.cqengine.query.simple.{All, Equal} import com.googlecode.cqengine.query.{Query, QueryFactory} import com.googlecode.cqengine.{ConcurrentIndexedCollection, IndexedCollection} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.locationtech.geomesa.memory.cqengine.index.GeoIndex import org.locationtech.geomesa.memory.cqengine.utils._ diff --git a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQIndexingOptions.scala b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQIndexingOptions.scala index bd5ed6be5230..558c01fa9fb7 100644 --- a/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQIndexingOptions.scala +++ b/geomesa-memory/geomesa-cqengine/src/main/scala/org/locationtech/geomesa/memory/cqengine/utils/CQIndexingOptions.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.memory.cqengine.utils -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.memory.cqengine.utils.CQIndexType.CQIndexType import org.opengis.feature.`type`.AttributeDescriptor diff --git a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala index a7d8b2241bba..2983363d3f08 100644 --- a/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala +++ b/geomesa-memory/geomesa-cqengine/src/test/scala/org/locationtech/geomesa/memory/cqengine/utils/GeoCQEngineTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.memory.cqengine.utils -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.memory.cqengine.GeoCQEngine import org.locationtech.geomesa.memory.cqengine.utils.SampleFeatures._ diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index 219259ab0bae..3337396acc76 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -53,7 +53,11 @@ com.typesafe.scala-logging - scala-logging_${scala.binary.version} + scala-logging-api_${scala.binary.version} + + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} diff --git a/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/config/MetricsConfig.scala b/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/config/MetricsConfig.scala index 401c4ec4e554..218453d12a87 100644 --- a/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/config/MetricsConfig.scala +++ b/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/config/MetricsConfig.scala @@ -17,7 +17,7 @@ import com.codahale.metrics.ganglia.GangliaReporter import com.codahale.metrics.graphite.{Graphite, GraphiteReporter} import com.codahale.metrics.{MetricRegistry, _} import com.typesafe.config.{ConfigFactory, Config} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import info.ganglia.gmetric4j.gmetric.GMetric import info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode import org.locationtech.geomesa.metrics.reporters.{DelimitedFileReporter, AccumuloReporter} diff --git a/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/servlet/AggregatedMetricsFilter.scala b/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/servlet/AggregatedMetricsFilter.scala index 32f2083522a9..dbcd4a0a47e5 100644 --- a/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/servlet/AggregatedMetricsFilter.scala +++ b/geomesa-metrics/src/main/scala/org/locationtech/geomesa/metrics/servlet/AggregatedMetricsFilter.scala @@ -15,7 +15,7 @@ import javax.servlet.http.{HttpSessionEvent, HttpSessionListener, HttpServletReq import com.codahale.metrics._ import com.typesafe.config.ConfigFactory -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.metrics.config.MetricsConfig /** diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/MinMaxProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/MinMaxProcess.scala index b415c7ee78ac..621c48a8c8d4 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/MinMaxProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/MinMaxProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.analytic -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/SamplingProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/SamplingProcess.scala index 517d4a4a5574..6dc5493f9319 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/SamplingProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/SamplingProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.analytic -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/StatsProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/StatsProcess.scala index 4ca588096eb6..db28174fcfd8 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/StatsProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/StatsProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.analytic -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/UniqueProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/UniqueProcess.scala index 8a70c68b6625..0a06184e1db0 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/UniqueProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/analytic/UniqueProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.analytic -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNNQuery.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNNQuery.scala index 3b7b71c4cb17..9203b2be30bb 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNNQuery.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNNQuery.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.knn -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.simple.SimpleFeatureSource import org.geotools.geometry.jts.ReferencedEnvelope diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNearestNeighborSearchProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNearestNeighborSearchProcess.scala index a2cf483012c6..53aec9ecb1eb 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNearestNeighborSearchProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/knn/KNearestNeighborSearchProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.knn -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import org.geotools.data.Query import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/JoinProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/JoinProcess.scala index 465405526f3a..a4c2b833e3f2 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/JoinProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/JoinProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.query -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureIterator} import org.geotools.feature.AttributeTypeBuilder diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/ProximitySearchProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/ProximitySearchProcess.scala index 56212c6fecc8..500f45906e2f 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/ProximitySearchProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/ProximitySearchProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.query -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/QueryProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/QueryProcess.scala index 732cd9f557d2..065b93c88503 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/QueryProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/QueryProcess.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.process.query -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/RouteSearchProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/RouteSearchProcess.scala index 9eef23a437ff..1e47c5b30fef 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/RouteSearchProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/query/RouteSearchProcess.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.process.query import java.util.concurrent.ConcurrentHashMap -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import com.vividsolutions.jts.operation.distance.DistanceOp import org.geotools.data.Query diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/ArrowConversionProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/ArrowConversionProcess.scala index 4798e2db0bfa..659e6757fc86 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/ArrowConversionProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/ArrowConversionProcess.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.process.transform import java.io.ByteArrayOutputStream -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} import org.geotools.feature.visitor._ diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/BinConversionProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/BinConversionProcess.scala index 056853c7a46e..aef89c09d4fe 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/BinConversionProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/transform/BinConversionProcess.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.process.transform import java.util.Locale -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.Query import org.geotools.data.simple.{SimpleFeatureCollection, SimpleFeatureSource} import org.geotools.feature.visitor._ diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeBuilder.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeBuilder.scala index 4e9a117b7ea8..a3fd76f15491 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeBuilder.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeBuilder.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.process.tube import java.util.Date import java.util.concurrent.atomic.AtomicInteger -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import com.vividsolutions.jts.geom.impl.CoordinateArraySequence import org.geotools.data.simple.SimpleFeatureCollection diff --git a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeSelectProcess.scala b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeSelectProcess.scala index 8766c7803c25..df64ea8a5585 100644 --- a/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeSelectProcess.scala +++ b/geomesa-process/geomesa-process-vector/src/main/scala/org/locationtech/geomesa/process/tube/TubeSelectProcess.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.process.tube import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.geotools.data.Query import org.geotools.data.collection.ListFeatureCollection diff --git a/geomesa-security/src/main/scala/org/locationtech/geomesa/security/DataStoreSecurityService.scala b/geomesa-security/src/main/scala/org/locationtech/geomesa/security/DataStoreSecurityService.scala index 879a03062dc2..2edf8791176b 100644 --- a/geomesa-security/src/main/scala/org/locationtech/geomesa/security/DataStoreSecurityService.scala +++ b/geomesa-security/src/main/scala/org/locationtech/geomesa/security/DataStoreSecurityService.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.security import java.util.ServiceLoader -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.{FeatureReader, FeatureSource, Query} import org.geotools.feature.FeatureCollection import org.locationtech.geomesa.utils.geotools.{ContentFeatureSourceSupport, FR} diff --git a/geomesa-spark/geomesa-spark-converter/src/main/scala/org/locationtech/geomesa/spark/converter/ConverterSpatialRDDProvider.scala b/geomesa-spark/geomesa-spark-converter/src/main/scala/org/locationtech/geomesa/spark/converter/ConverterSpatialRDDProvider.scala index ad4521aeb636..66a5aeae4bc2 100644 --- a/geomesa-spark/geomesa-spark-converter/src/main/scala/org/locationtech/geomesa/spark/converter/ConverterSpatialRDDProvider.scala +++ b/geomesa-spark/geomesa-spark-converter/src/main/scala/org/locationtech/geomesa/spark/converter/ConverterSpatialRDDProvider.scala @@ -12,7 +12,7 @@ import java.io.Serializable import java.util import com.typesafe.config.{ConfigFactory, ConfigRenderOptions} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.io.LongWritable import org.apache.hadoop.mapreduce.Job diff --git a/geomesa-spark/geomesa-spark-core/src/main/scala/org/apache/spark/geomesa/GeoMesaSparkKryoRegistratorEndpoint.scala b/geomesa-spark/geomesa-spark-core/src/main/scala/org/apache/spark/geomesa/GeoMesaSparkKryoRegistratorEndpoint.scala index 95e14f907c8b..c58b120a8314 100644 --- a/geomesa-spark/geomesa-spark-core/src/main/scala/org/apache/spark/geomesa/GeoMesaSparkKryoRegistratorEndpoint.scala +++ b/geomesa-spark/geomesa-spark-core/src/main/scala/org/apache/spark/geomesa/GeoMesaSparkKryoRegistratorEndpoint.scala @@ -10,7 +10,7 @@ package org.apache.spark.geomesa import java.io.Serializable -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.spark.rpc.{RpcCallContext, RpcEndpoint, RpcEnv, RpcTimeout} import org.apache.spark.util.RpcUtils import org.apache.spark.{SparkContext, SparkEnv} diff --git a/geomesa-spark/geomesa-spark-geotools/src/main/scala/org/locationtech/geomesa/spark/geotools/GeoToolsSpatialRDDProvider.scala b/geomesa-spark/geomesa-spark-geotools/src/main/scala/org/locationtech/geomesa/spark/geotools/GeoToolsSpatialRDDProvider.scala index a17c57c8256e..abc59bfde2bf 100644 --- a/geomesa-spark/geomesa-spark-geotools/src/main/scala/org/locationtech/geomesa/spark/geotools/GeoToolsSpatialRDDProvider.scala +++ b/geomesa-spark/geomesa-spark-geotools/src/main/scala/org/locationtech/geomesa/spark/geotools/GeoToolsSpatialRDDProvider.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.spark.geotools import java.io.Serializable import java.util -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala index fdda7273386c..1e62c1bb5e84 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/apache/spark/sql/SQLRules.scala @@ -11,7 +11,7 @@ package org.apache.spark.sql import java.time.{LocalDateTime, ZoneId, ZoneOffset} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Envelope, Geometry} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.logical._ diff --git a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala index c8dd69bc40f2..45bc10a93998 100644 --- a/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala +++ b/geomesa-spark/geomesa-spark-sql/src/main/scala/org/locationtech/geomesa/spark/GeoMesaSparkSQL.scala @@ -12,7 +12,7 @@ import java.sql.Timestamp import java.time.Instant import java.util.{Date, UUID} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import com.vividsolutions.jts.index.strtree.{AbstractNode, Boundable, STRtree} import com.vividsolutions.jts.index.sweepline.{SweepLineIndex, SweepLineInterval, SweepLineOverlapAction} diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala index 7c99a2d5eae0..b41b1f6664dd 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLDataTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.spark import java.{util => ju} import java.util.{Map => JMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, GeometryFactory, Point} import org.apache.spark.sql.{Column, DataFrame, SQLContext, SQLTypes, SparkSession} import org.geotools.data.{DataStore, DataStoreFinder} diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLGeometricDistanceFunctionsTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLGeometricDistanceFunctionsTest.scala index ca5868b7dc36..ccfa6e19d70b 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLGeometricDistanceFunctionsTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLGeometricDistanceFunctionsTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.spark import java.util.{Map => JMap} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.DataStoreFinder import org.junit.runner.RunWith import org.specs2.mutable.Specification diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLSpatialRelationshipsTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLSpatialRelationshipsTest.scala index e05475a77bd1..7069e1192205 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLSpatialRelationshipsTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLSpatialRelationshipsTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.spark import java.util.{Map => JMap} import java.io.Serializable -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import org.apache.spark.sql.{DataFrame, SQLContext, SQLTypes, SparkSession} import org.geotools.data.{DataStore, DataStoreFinder} diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ConvertCommand.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ConvertCommand.scala index b68f9adc78af..cbc6e34fbcaf 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ConvertCommand.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ConvertCommand.scala @@ -12,7 +12,7 @@ import java.io._ import java.util.zip.Deflater import com.beust.jcommander.{ParameterException, Parameters} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.geotools.data.Query import org.geotools.factory.Hints diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/Runner.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/Runner.scala index 17e48a009e8e..777a5722419e 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/Runner.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/Runner.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.tools import java.io.File import com.beust.jcommander.{JCommander, ParameterException} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.FileUtils import org.locationtech.geomesa.tools.utils.GeoMesaIStringConverterFactory diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/ExportCommand.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/ExportCommand.scala index e07f0a26ec1c..3a56545b0880 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/ExportCommand.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/ExportCommand.scala @@ -12,7 +12,7 @@ import java.io._ import java.util.zip.{Deflater, GZIPOutputStream} import com.beust.jcommander.ParameterException -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.simple.SimpleFeatureCollection import org.geotools.data.{DataStore, Query} import org.geotools.factory.Hints diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/DelimitedExporter.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/DelimitedExporter.scala index 9689c1078f01..05eeaca3e8cc 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/DelimitedExporter.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/DelimitedExporter.scala @@ -12,7 +12,7 @@ import java.io.Writer import java.time.{Instant, ZoneOffset} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.apache.commons.csv.{CSVFormat, QuoteMode} import org.locationtech.geomesa.tools.export.ExportCommand.ExportAttributes diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/LeafletMapExporter.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/LeafletMapExporter.scala index aff230f5ba1c..43d8977bc3de 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/LeafletMapExporter.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/export/formats/LeafletMapExporter.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.tools.export.formats import java.io._ -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Geometry} import org.geotools.geojson.feature.FeatureJSON import org.locationtech.geomesa.tools.Command.user diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngest.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngest.scala index c0b90aefbd82..bc3e7c6cca78 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngest.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngest.scala @@ -13,7 +13,7 @@ import java.util.concurrent._ import java.util.concurrent.atomic.AtomicLong import com.beust.jcommander.ParameterException -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.IOUtils import org.geotools.data._ import org.geotools.factory.Hints diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala index 61448d477c0e..991cb9256e68 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/AbstractIngestJob.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.tools.ingest import java.io.File -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.io.{LongWritable, Text} import org.apache.hadoop.mapreduce.lib.input.FileInputFormat diff --git a/geomesa-tools/src/test/scala/org/locationtech/geomesa/tools/ConvertCommandTest.scala b/geomesa-tools/src/test/scala/org/locationtech/geomesa/tools/ConvertCommandTest.scala index dc91194413de..37a7584f3201 100644 --- a/geomesa-tools/src/test/scala/org/locationtech/geomesa/tools/ConvertCommandTest.scala +++ b/geomesa-tools/src/test/scala/org/locationtech/geomesa/tools/ConvertCommandTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.tools import java.io.{File, FilenameFilter} import java.nio.charset.StandardCharsets -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.FileUtils import org.junit.runner.RunWith import org.locationtech.geomesa.tools.utils.DataFormats.DataFormat diff --git a/geomesa-utils/pom.xml b/geomesa-utils/pom.xml index 057f8f1701d8..1abd198cedca 100644 --- a/geomesa-utils/pom.xml +++ b/geomesa-utils/pom.xml @@ -137,7 +137,11 @@ com.typesafe.scala-logging - scala-logging_${scala.binary.version} + scala-logging-api_${scala.binary.version} + + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/audit/AuditedEvent.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/audit/AuditedEvent.scala index 3238120bb737..76e64e78d54b 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/audit/AuditedEvent.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/audit/AuditedEvent.scala @@ -12,7 +12,7 @@ import java.io.Closeable import java.time.ZonedDateTime import com.google.gson.{Gson, GsonBuilder} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import scala.reflect.ClassTag diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/bin/BinaryOutputEncoder.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/bin/BinaryOutputEncoder.scala index e2b4a19c5722..2137a9b74f2a 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/bin/BinaryOutputEncoder.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/bin/BinaryOutputEncoder.scala @@ -13,7 +13,7 @@ import java.nio.charset.StandardCharsets import java.nio.{ByteBuffer, ByteOrder} import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Geometry, LineString, Point} import org.locationtech.geomesa.utils.bin.BinaryEncodeCallback.{ByteArrayCallback, ByteStreamCallback} import org.locationtech.geomesa.utils.bin.BinaryOutputEncoder.ToValues diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/cache/FilePersistence.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/cache/FilePersistence.scala index 4906f662a3c6..c3d98bf9f256 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/cache/FilePersistence.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/cache/FilePersistence.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.cache import java.io.{File, FileInputStream, FileOutputStream} import java.util.Properties -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging /** * Simple persistence strategy that keeps values in memory and writes them to a prop file on disk. diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/classpath/ClassPathUtils.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/classpath/ClassPathUtils.scala index ba6ba0561296..89171f0712cb 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/classpath/ClassPathUtils.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/classpath/ClassPathUtils.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.classpath import java.io.{File, FileFilter, FilenameFilter} import java.net.{URLClassLoader, URLDecoder} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import scala.collection.mutable.ArrayBuffer diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ArgResolver.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ArgResolver.scala index 39fd2f252a89..419d925fbfe9 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ArgResolver.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ArgResolver.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.utils.conf import com.typesafe.config.ConfigParseOptions -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging /** * Trait for resolving sft/config parameters and handling errors around diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ConfigLoader.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ConfigLoader.scala index 3bfdab55c630..4ec237aaba77 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ConfigLoader.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/ConfigLoader.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.conf import java.io.InputStream -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import scala.util.control.NonFatal import scala.util.{Failure, Try} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaProperties.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaProperties.scala index fa77dab0b5da..da96df53077e 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaProperties.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaProperties.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.conf import java.util.Properties -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging object GeoMesaProperties extends LazyLogging { diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaSystemProperties.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaSystemProperties.scala index 56b4d868a96d..133de4feaf94 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaSystemProperties.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/conf/GeoMesaSystemProperties.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.conf -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.text.Suffixes import scala.concurrent.duration.Duration diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeoHash.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeoHash.scala index 30d1ac7ba8c6..195d901c55bc 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeoHash.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeoHash.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.geohash -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, GeometryFactory, Point, PrecisionModel} import scala.collection.BitSet diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeohashUtils.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeohashUtils.scala index 049e2ea94426..eb60a9c62e81 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeohashUtils.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geohash/GeohashUtils.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.utils.geohash import org.locationtech.spatial4j.context.jts.JtsSpatialContext -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.locationtech.geomesa.utils.geotools.GeometryUtils import org.locationtech.geomesa.utils.iterators.CartesianProductIterable diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeneralShapefileIngest.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeneralShapefileIngest.scala index 34a2817bc2a0..5675edf526a8 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeneralShapefileIngest.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeneralShapefileIngest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.geotools import java.io.File -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data._ import org.geotools.data.simple.SimpleFeatureCollection import org.geotools.feature.simple.SimpleFeatureTypeBuilder diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParam.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParam.scala index 9eb3e547221f..e5ee318adc0a 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParam.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParam.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.geotools import java.io.{IOException, Serializable, StringReader, StringWriter} import java.util.{Collections, Properties} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.DataAccessFactory.Param import org.geotools.data.Parameter import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SftArgResolver.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SftArgResolver.scala index a10b80be058c..9bffc01e22e2 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SftArgResolver.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SftArgResolver.scala @@ -12,7 +12,7 @@ import java.io.{File, InputStreamReader, Reader, StringReader} import java.nio.charset.StandardCharsets import com.typesafe.config.ConfigFactory -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.io.FileUtils import org.locationtech.geomesa.utils.conf.ArgResolver import org.locationtech.geomesa.utils.io.{PathUtils, WithClose} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeaturePropertyAccessor.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeaturePropertyAccessor.scala index 9e2da16ab008..6bef7af4fb38 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeaturePropertyAccessor.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeaturePropertyAccessor.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.geotools -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.filter.expression.{PropertyAccessor, PropertyAccessors} import org.opengis.feature.simple.SimpleFeature diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypeLoader.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypeLoader.scala index 13547c24608c..afe7e257e95f 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypeLoader.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypeLoader.scala @@ -12,7 +12,7 @@ import java.net.URL import java.util.{ServiceLoader, List => JList} import com.typesafe.config.{Config, ConfigFactory, ConfigRenderOptions} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import org.opengis.feature.simple.SimpleFeatureType diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/index/GeoMesaSchemaValidator.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/index/GeoMesaSchemaValidator.scala index 35fcd12b733c..f77b3cc51f6d 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/index/GeoMesaSchemaValidator.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/index/GeoMesaSchemaValidator.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.index -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import org.locationtech.geomesa.utils.geotools.RichAttributeDescriptors.RichAttributeDescriptor diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/SafeClose.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/SafeClose.scala index 5c0461b8a6d7..b273506d58eb 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/SafeClose.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/SafeClose.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.io -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.io.SafeClose.AnyCloseable import org.locationtech.geomesa.utils.io.SafeFlush.AnyFlushable diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Histogram.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Histogram.scala index 61eb6bc322ab..653dc636678d 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Histogram.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Histogram.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.stats import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Geometry} import org.locationtech.geomesa.utils.geotools.GeometryUtils import org.opengis.feature.simple.SimpleFeature diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MethodProfiling.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MethodProfiling.scala index 31f65389ce5d..4823fba13c95 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MethodProfiling.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MethodProfiling.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.stats import java.util.concurrent.atomic.AtomicLong -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging trait MethodProfiling { diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MinMax.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MinMax.scala index f6d188802e4b..bbf57f7acd48 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MinMax.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/MinMax.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.stats import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Geometry} import org.geotools.geometry.jts.JTSFactoryFinder import org.locationtech.geomesa.utils.clearspring.HyperLogLog diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/TopK.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/TopK.scala index c8a6639e0be3..2e476307e3bf 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/TopK.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/TopK.scala @@ -7,7 +7,7 @@ ***********************************************************************/ package org.locationtech.geomesa.utils.stats -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.utils.clearspring.StreamSummary import org.opengis.feature.simple.SimpleFeature diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Frequency.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Frequency.scala index 5cfbded95a31..03516a390f26 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Frequency.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Frequency.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.stats import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Geometry import org.locationtech.geomesa.curve.TimePeriod.TimePeriod import org.locationtech.geomesa.curve.{BinnedTime, Z3SFC} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Histogram.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Histogram.scala index 0bf8c287a3e3..7e4a4c27ec85 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Histogram.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/stats/Z3Histogram.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.stats import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Coordinate, Geometry, Point} import org.geotools.geometry.jts.JTSFactoryFinder import org.locationtech.geomesa.curve.TimePeriod.TimePeriod diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/StringSerialization.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/StringSerialization.scala index 582d76f7c561..3b87721a2554 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/StringSerialization.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/StringSerialization.scala @@ -12,7 +12,7 @@ import java.time.{ZoneOffset, ZonedDateTime} import java.time.format.DateTimeFormatter import java.util.Date -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.csv.{CSVFormat, CSVParser, CSVPrinter} import org.opengis.feature.simple.SimpleFeatureType diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/Suffixes.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/Suffixes.scala index f46b8d5795bb..ecfdb75709c2 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/Suffixes.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/text/Suffixes.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.text import java.util.concurrent.TimeUnit import java.util.regex.Pattern -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import scala.concurrent.duration.Duration import scala.util.{Failure, Success, Try} diff --git a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGenerator.scala b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGenerator.scala index 7a084553fc52..223760c7d834 100644 --- a/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGenerator.scala +++ b/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGenerator.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.uuid import java.util.{Date, UUID} import com.google.common.primitives.{Bytes, Longs, Shorts} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.{Geometry, Point} import org.locationtech.geomesa.curve.TimePeriod.TimePeriod import org.locationtech.geomesa.curve.{BinnedTime, Z3SFC} diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/GeoMesaPropertiesTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/GeoMesaPropertiesTest.scala index c9c1c7fb0057..d39d136c2bcf 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/GeoMesaPropertiesTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/GeoMesaPropertiesTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.conf -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import org.specs2.mutable.Specification diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/SemanticVersionTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/SemanticVersionTest.scala index 31280e17380f..76219499e1f5 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/SemanticVersionTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/conf/SemanticVersionTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.conf -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/BoundingBoxTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/BoundingBoxTest.scala index c1e8bf0d92f0..b689cf496697 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/BoundingBoxTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/BoundingBoxTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.geohash -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.{Assert, Test} class BoundingBoxTest extends LazyLogging { diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeoHashTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeoHashTest.scala index 24139bcad0bd..72616053efd6 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeoHashTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeoHashTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.geohash -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import org.junit.runner.RunWith import org.locationtech.geomesa.utils.text.WKTUtils diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeohashUtilsTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeohashUtilsTest.scala index fb0d3c8a0db3..a2abfa1788d5 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeohashUtilsTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geohash/GeohashUtilsTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.utils.geohash -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.junit.Ignore import org.junit.runner.RunWith diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParamTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParamTest.scala index c21420b47d24..18058168298f 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParamTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GeoMesaParamTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.geotools import java.io.IOException -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty import org.locationtech.geomesa.utils.geotools.GeoMesaParam.{SystemPropertyBooleanParam, SystemPropertyDurationParam, SystemPropertyIntegerParam, SystemPropertyStringParam} diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GridSnapTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GridSnapTest.scala index 98a03ecb1172..c5a7655e31f1 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GridSnapTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/GridSnapTest.scala @@ -9,7 +9,7 @@ package org.locationtech.geomesa.utils.geotools -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom._ import org.junit.runner.RunWith import org.specs2.mutable.Specification diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/BucketIndexTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/BucketIndexTest.scala index 486ff6649252..caf6bbc26137 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/BucketIndexTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/BucketIndexTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.index import java.util.concurrent.atomic.AtomicBoolean -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Envelope import org.junit.runner.RunWith import org.locationtech.geomesa.utils.text.WKTUtils diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/SynchronizedQuadtreeTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/SynchronizedQuadtreeTest.scala index 917e8d90ab04..6e6d3d7b6536 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/SynchronizedQuadtreeTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/index/SynchronizedQuadtreeTest.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.utils.index import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.locks.Lock -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import com.vividsolutions.jts.geom.Point import org.junit.runner.RunWith import org.locationtech.geomesa.utils.text.WKTUtils diff --git a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/io/SafeCloseTest.scala b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/io/SafeCloseTest.scala index 11cbfb605994..e296139ccc7c 100644 --- a/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/io/SafeCloseTest.scala +++ b/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/io/SafeCloseTest.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.utils.io import java.io.{Closeable, IOException} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/GeoMesaServletCatalog.scala b/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/GeoMesaServletCatalog.scala index 22ab80506dd0..90b04bef272a 100644 --- a/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/GeoMesaServletCatalog.scala +++ b/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/GeoMesaServletCatalog.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.web.core import java.util.concurrent.ConcurrentHashMap -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.locationtech.geomesa.accumulo.data.AccumuloDataStore import org.opengis.feature.simple.SimpleFeatureType diff --git a/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/SpringScalatraBootstrap.scala b/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/SpringScalatraBootstrap.scala index 78653ea061af..4dbf5e7b3c55 100644 --- a/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/SpringScalatraBootstrap.scala +++ b/geomesa-web/geomesa-web-core/src/main/scala/org/locationtech/geomesa/web/core/SpringScalatraBootstrap.scala @@ -11,7 +11,7 @@ package org.locationtech.geomesa.web.core import javax.servlet.ServletContext import javax.servlet.http.{HttpServletRequest, HttpServletRequestWrapper, HttpServletResponse} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.apache.commons.lang.exception.ExceptionUtils import org.locationtech.geomesa.accumulo.data.{AccumuloDataStoreFactory, AccumuloDataStoreParams} import org.scalatra.servlet.RichServletContext diff --git a/geomesa-web/geomesa-web-data/src/main/scala/org/locationtech/geomesa/web/data/DataEndpoint.scala b/geomesa-web/geomesa-web-data/src/main/scala/org/locationtech/geomesa/web/data/DataEndpoint.scala index 94e73f74f870..ddf4bc090d0e 100644 --- a/geomesa-web/geomesa-web-data/src/main/scala/org/locationtech/geomesa/web/data/DataEndpoint.scala +++ b/geomesa-web/geomesa-web-data/src/main/scala/org/locationtech/geomesa/web/data/DataEndpoint.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.web.data -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.data.DataStoreFinder import org.locationtech.geomesa.web.core.GeoMesaScalatraServlet import org.scalatra.{BadRequest, InternalServerError, Ok} diff --git a/geomesa-web/geomesa-web-stats/src/main/scala/org/locationtech/geomesa/web/stats/GeoMesaStatsEndpoint.scala b/geomesa-web/geomesa-web-stats/src/main/scala/org/locationtech/geomesa/web/stats/GeoMesaStatsEndpoint.scala index 4e5d23896711..ce9e749b2d56 100644 --- a/geomesa-web/geomesa-web-stats/src/main/scala/org/locationtech/geomesa/web/stats/GeoMesaStatsEndpoint.scala +++ b/geomesa-web/geomesa-web-stats/src/main/scala/org/locationtech/geomesa/web/stats/GeoMesaStatsEndpoint.scala @@ -10,7 +10,7 @@ package org.locationtech.geomesa.web.stats import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.geotools.filter.text.ecql.ECQL import org.json4s.{DefaultFormats, Formats} import org.locationtech.geomesa.index.stats.GeoMesaStats diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index 7c3580bf38e1..b55992ae47fd 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -26,7 +26,11 @@ com.typesafe.scala-logging - scala-logging_${scala.binary.version} + scala-logging-api_${scala.binary.version} + + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} org.specs2 diff --git a/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ2SFCTest.scala b/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ2SFCTest.scala index bc3053b857d5..bac3146c8d54 100644 --- a/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ2SFCTest.scala +++ b/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ2SFCTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.curve -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ3SFCTest.scala b/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ3SFCTest.scala index beab014aeaa7..dd1790279c2a 100644 --- a/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ3SFCTest.scala +++ b/geomesa-z3/src/test/scala/org/locationtech/geomesa/curve/XZ3SFCTest.scala @@ -8,7 +8,7 @@ package org.locationtech.geomesa.curve -import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.slf4j.LazyLogging import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/pom.xml b/pom.xml index 39eec0245f49..ab44be1be15c 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 3.4.10 0.9.3 2.6.4 - 2.2.0 + 2.2.1 1.3.1 12.0.1 3.0.0 @@ -117,7 +117,7 @@ 1.7.21 - 3.1.0 + 2.1.2 1.2.17 4.12 @@ -336,7 +336,12 @@ com.typesafe.scala-logging - scala-logging_${scala.binary.version} + scala-logging-api_${scala.binary.version} + ${scalalogging.version} + + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} ${scalalogging.version}