diff --git a/.github/maven-badge.svg b/.github/maven-badge.svg index e937e7201a1..e18369e0e57 100644 --- a/.github/maven-badge.svg +++ b/.github/maven-badge.svg @@ -17,7 +17,7 @@ font-size="110"> maven maven - v5.0.1 - v5.0.1 + v5.1.0 + v5.1.0 diff --git a/README.md b/README.md index c91cce439c9..54de07e2302 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ geospatial analytics. * [Main documentation](https://www.geomesa.org/documentation/) * [Upgrade Guide](https://www.geomesa.org/documentation/user/upgrade.html) * Quick Starts: - [HBase](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-hbase.html) | [Accumulo](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-accumulo.html) | + [HBase](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-hbase.html) | [Cassandra](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-cassandra.html) | [Kafka](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-kafka.html) | [Redis](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-redis.html) | @@ -37,16 +37,16 @@ geospatial analytics. ## Downloads -**Current release: [5.0.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-5.0.1)** +**Current release: [5.1.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-5.1.0)**      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-hbase_2.12-5.0.1-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-accumulo_2.12-5.0.1-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-cassandra_2.12-5.0.1-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-kafka_2.12-5.0.1-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-redis_2.12-5.0.1-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-fs_2.12-5.0.1-bin.tar.gz) | - [**PostGIS**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.0.1/geomesa-gt_2.12-5.0.1-bin.tar.gz) + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-accumulo_2.12-5.1.0-bin.tar.gz) | + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-hbase_2.12-5.1.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-cassandra_2.12-5.1.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-kafka_2.12-5.1.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-redis_2.12-5.1.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-fs_2.12-5.1.0-bin.tar.gz) | + [**PostGIS**](https://github.com/locationtech/geomesa/releases/download/geomesa-5.1.0/geomesa-gt_2.12-5.1.0-bin.tar.gz) ### Verifying Downloads @@ -60,7 +60,7 @@ $ gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys CD24F317 Then verify the file: ```bash -$ gpg2 --verify geomesa-accumulo_2.12-5.0.1-bin.tar.gz.asc geomesa-accumulo_2.12-5.0.1-bin.tar.gz +$ gpg2 --verify geomesa-accumulo_2.12-5.1.0-bin.tar.gz.asc geomesa-accumulo_2.12-5.1.0-bin.tar.gz ``` The keys currently used for signing are: @@ -79,11 +79,27 @@ GeoMesa is hosted on Maven Central. To include it as a dependency, add the desir ```xml org.locationtech.geomesa - geomesa-hbase-datastore_2.12 - 5.0.1 + geomesa-accumulo-datastore_2.12 + 5.1.0 ``` +GeoMesa provides a bill-of-materials module, which can simplify version management: + +```xml + + + + org.locationtech.geomesa + geomesa-bom_2.12 + 5.1.0 + pom + import + + + +``` + GeoMesa depends on several third-party libraries that are only available in separate repositories. To include GeoMesa in your project, add the following repositories to your pom: @@ -130,7 +146,7 @@ DataStore implementations: org.locationtech.geomesa geomesa-gt-spark-runtime_2.12 - 5.0.1 + 5.1.0 @@ -156,13 +172,13 @@ resolvers ++= Seq( // Select desired modules libraryDependencies ++= Seq( - "org.locationtech.geomesa" %% "geomesa-utils" % "5.0.1" + "org.locationtech.geomesa" %% "geomesa-utils" % "5.1.0" ) ``` ## Building from Source -**Development version: 5.1.0-SNAPSHOT** +**Development version: 5.2.0-SNAPSHOT**      [![Build Status](https://github.com/locationtech/geomesa/actions/workflows/build-and-test-2.12.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/build-and-test-2.12.yml?query=branch%3Amain) diff --git a/build/scripts/do-release.sh b/build/scripts/do-release.sh index 99c475e4ffd..1921c61ad10 100755 --- a/build/scripts/do-release.sh +++ b/build/scripts/do-release.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -e +set -u +set -o pipefail cd "$(dirname "$0")/../.." || exit @@ -12,7 +14,7 @@ where : exit 1 } -if [[ ($# -ne 0) || ( $1 == "--help") || $1 == "-h" ]]; then +if [[ ($# -ne 0) ]]; then usage fi @@ -30,6 +32,7 @@ readPomVersion() { } copyReleaseArtifacts() { + echo "Copying release artifacts" while IFS= read -r -d '' file; do pushd "$(dirname "$file")" >/dev/null gpg --armor --detach-sign "$(basename "$file")" diff --git a/build/templates/README.md b/build/templates/README.md index 530c6171b2c..ac1244bdf07 100644 --- a/build/templates/README.md +++ b/build/templates/README.md @@ -27,8 +27,8 @@ geospatial analytics. * [Main documentation](https://www.geomesa.org/documentation/) * [Upgrade Guide](https://www.geomesa.org/documentation/user/upgrade.html) * Quick Starts: - [HBase](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-hbase.html) | [Accumulo](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-accumulo.html) | + [HBase](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-hbase.html) | [Cassandra](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-cassandra.html) | [Kafka](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-kafka.html) | [Redis](https://www.geomesa.org/documentation/tutorials/geomesa-quickstart-redis.html) | @@ -40,8 +40,8 @@ geospatial analytics. **Current release: [${geomesa.release.version}](https://github.com/locationtech/geomesa/releases/tag/geomesa-${geomesa.release.version})**      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-hbase_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-accumulo_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-hbase_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-cassandra_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-kafka_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-${geomesa.release.version}/geomesa-redis_${scala.binary.version}-${geomesa.release.version}-bin.tar.gz) | @@ -79,11 +79,27 @@ GeoMesa is hosted on Maven Central. To include it as a dependency, add the desir ```xml org.locationtech.geomesa - geomesa-hbase-datastore_${scala.binary.version} + geomesa-accumulo-datastore_${scala.binary.version} ${geomesa.release.version} ``` +GeoMesa provides a bill-of-materials module, which can simplify version management: + +```xml + + + + org.locationtech.geomesa + geomesa-bom_${scala.binary.version} + ${geomesa.release.version} + pom + import + + + +``` + GeoMesa depends on several third-party libraries that are only available in separate repositories. To include GeoMesa in your project, add the following repositories to your pom: diff --git a/docs/pom.xml b/docs/pom.xml index 6313cfff29b..1d7dd438b57 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.locationtech.geomesa geomesa_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/docs/user/cassandra/install.rst b/docs/user/cassandra/install.rst index 5b28c5d39b6..0e74737c603 100644 --- a/docs/user/cassandra/install.rst +++ b/docs/user/cassandra/install.rst @@ -135,7 +135,7 @@ Cassandra data stores in GeoServer. The plugin files are in the GeoMesa Cassandra distribution directory. To install the plugins, extract the archive and copy the contents to the ``WEB-INF/lib`` -directory of your GeoServer installation:: +directory of your GeoServer installation: .. code-block:: bash diff --git a/docs/user/download.rst b/docs/user/download.rst index 23a79b1c1ac..f480fbbe54b 100644 --- a/docs/user/download.rst +++ b/docs/user/download.rst @@ -41,7 +41,7 @@ repositories to your pom: -and then include the desired ``geomesa-*`` dependencies: +and then include the desired GeoMesa dependencies: .. parsed-literal:: @@ -58,6 +58,22 @@ and then include the desired ``geomesa-*`` dependencies: ${geomesa.version} +GeoMesa provides a bill-of-materials module, which can simplify version management: + +.. code-block:: xml + + + + + org.locationtech.geomesa + geomesa-bom_${scala.binary.version} + ${geomesa.version} + pom + import + + + + For cutting-edge development, nightly snapshots are available from Eclipse: .. code-block:: xml diff --git a/docs/user/index.rst b/docs/user/index.rst index 30075da3a45..61d5c49fe3d 100644 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -19,13 +19,13 @@ User Manual spark/index nifi/index process - hbase/index accumulo/index + hbase/index cassandra/index + postgis/index kafka/index redis/index filesystem/index - postgis/index lambda/index ds_views upgrade diff --git a/docs/user/install.rst b/docs/user/install.rst index 1c6421dfe6e..44316c0c044 100644 --- a/docs/user/install.rst +++ b/docs/user/install.rst @@ -5,8 +5,8 @@ Installation Installation instructions are available for each data store implementation: -* :doc:`/user/hbase/install` * :doc:`/user/accumulo/install` +* :doc:`/user/hbase/install` * :doc:`/user/cassandra/install` * :doc:`/user/kafka/install` * :doc:`/user/redis/install` diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index c8d6713b6a3..507ea80868d 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-accumulo-datastore_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index 7de95148efc..98abf487713 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-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 b5f41984b1a..c5efe6e18ae 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-accumulo-distributed-runtime_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index c03ba820fb5..c7f160129c4 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-indices/pom.xml b/geomesa-accumulo/geomesa-accumulo-indices/pom.xml index eb681a6a4f4..706083c20bd 100644 --- a/geomesa-accumulo/geomesa-accumulo-indices/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-indices/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-accumulo-indices_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-iterators/pom.xml b/geomesa-accumulo/geomesa-accumulo-iterators/pom.xml index d5a4156de0e..3aff7f9028d 100644 --- a/geomesa-accumulo/geomesa-accumulo-iterators/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-iterators/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-accumulo-iterators_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index e99c4573297..18402b32184 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml index 3fbe801b056..a3d6ea674ac 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo21/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo21/pom.xml index eefc3e59aa0..5c62571f24e 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo21/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo21/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index ab3d0418f0a..04a78e671c7 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-accumulo_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh index 22d50e06712..6a80bbb9dc1 100755 --- a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh +++ b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh @@ -50,6 +50,13 @@ function dependencies() { "com.fasterxml.woodstox:woodstox-core:5.3.0:jar" "org.codehaus.woodstox:stax2-api:4.2.1:jar" "com.google.guava:guava:${guava_install_version}:jar" + "io.netty:netty-codec:%%netty.version%%:jar" + "io.netty:netty-handler:%%netty.version%%:jar" + "io.netty:netty-resolver:%%netty.version%%:jar" + "io.netty:netty-transport:%%netty.version%%:jar" + "io.netty:netty-transport-classes-epoll:%%netty.version%%:jar" + "io.netty:netty-transport-native-epoll:%%netty.version%%:jar:linux-x86_64" + "io.netty:netty-transport-native-unix-common:%%netty.version%%:jar" ) # add accumulo 2.1 jars if needed @@ -79,6 +86,7 @@ function dependencies() { else gavs+=( "org.apache.thrift:libthrift:0.12.0:jar" + "org.apache.htrace:htrace-core:3.1.0-incubating:jar" ) fi diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index 37d2e247dd3..2c4f74caee8 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-accumulo_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index 8117da0aa9e..72802d5e041 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml b/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml index 573fec66a36..f39a1381789 100644 --- a/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml @@ -5,7 +5,7 @@ geomesa-archetypes_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-archetypes-binary-dist_2.12 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 223686039be..2520e42f07c 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -5,7 +5,7 @@ geomesa-archetypes_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-archetypes-gs-plugin_2.12 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index 97fe08f7ee2..074ebd3beab 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-archetypes_2.12 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index 998952ed130..8e519ef09f1 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index 410a1928cb3..40bab1c4f8c 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index 8bd1fa19f48..e63eb059f32 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -3,7 +3,7 @@ geomesa-arrow_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index 6d48580ee7f..3a4b7f6d262 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -4,7 +4,7 @@ geomesa-arrow_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index bd51acf32de..14dd6b82902 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index 52aadc1c3ae..fe0ed4e1faa 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index aa89e1fd95d..944a4dbfb8b 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -4,7 +4,7 @@ geomesa-cassandra_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index 47efd476a05..169a4848d9e 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-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 ccb7f3abc80..6977cc27f99 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index eaa936dc2e7..74a02ad532f 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-cassandra_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index c863cd73d87..fc596683904 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 14a3e2adfe1..f9f3e38bae5 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml b/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml index fec8b37cd92..2fdcd68b917 100644 --- a/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml +++ b/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index 7fb51662430..6fafa11c696 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index a3ae43b3966..f87cfce1f1b 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index 448d3a74eb4..5e0621fc4d9 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index 5e6b161152f..51b6c40de52 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index ae11e5a073b..4e26a1ede72 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-parquet/pom.xml b/geomesa-convert/geomesa-convert-parquet/pom.xml index 59ae970eacf..9dba5606b77 100644 --- a/geomesa-convert/geomesa-convert-parquet/pom.xml +++ b/geomesa-convert/geomesa-convert-parquet/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 074ac454d4d..a93900f9db5 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-shp/pom.xml b/geomesa-convert/geomesa-convert-shp/pom.xml index 9554f2a8a72..a21fbea6bb5 100644 --- a/geomesa-convert/geomesa-convert-shp/pom.xml +++ b/geomesa-convert/geomesa-convert-shp/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 77b42559316..95e52cd1240 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -3,7 +3,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index f64a1c95df2..df075ced9cd 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index 762c4b68272..a2ff9534202 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -4,7 +4,7 @@ geomesa-convert_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index 049afbc12bb..ba03064a121 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 92b2fd97a92..8b73b8e755b 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index 50e954f1eb5..24b9ad74669 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index e51d4ee44d0..0b83f56f85e 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-exporters/pom.xml b/geomesa-features/geomesa-feature-exporters/pom.xml index b146efa0fe0..d3564bfa009 100644 --- a/geomesa-features/geomesa-feature-exporters/pom.xml +++ b/geomesa-features/geomesa-feature-exporters/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-features_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index b9d8c8fa456..e5048dc2af1 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -3,7 +3,7 @@ geomesa-features_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index 2c6bd1fc39a..e293cb2c97e 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index a9673f1ccc2..d0ee193372c 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index ed5a04f8a38..3fa5d9acf83 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index 01d041a7c6b..2253e106e5a 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-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 32bdacab252..eb2b28e4634 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-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 b29f739c879..e21458d019d 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index 3955164b095..b2c946eff01 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 74be80b2c8b..a64e9972fb8 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 45453837dfb..d478dd1bc2d 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 7cbfe5bd9e4..8f2605ed4a4 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 af6fcbd1e8e..591d1fe6b81 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-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 b0878ece802..e5067fc0ff1 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.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index cd3b89302bd..8f823aa3ba2 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index f166d9ed1fe..f008de65ebf 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -3,7 +3,7 @@ geomesa-fs_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index 888f8f676b6..b67dde6672c 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-gt/geomesa-gt-dist/pom.xml b/geomesa-gt/geomesa-gt-dist/pom.xml index 01c1325a97f..782d0f45b49 100644 --- a/geomesa-gt/geomesa-gt-dist/pom.xml +++ b/geomesa-gt/geomesa-gt-dist/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 pom diff --git a/geomesa-gt/geomesa-gt-gs-plugin/pom.xml b/geomesa-gt/geomesa-gt-gs-plugin/pom.xml index 04e3135b320..2d95e0970ba 100644 --- a/geomesa-gt/geomesa-gt-gs-plugin/pom.xml +++ b/geomesa-gt/geomesa-gt-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-gt/geomesa-gt-partitioning/pom.xml b/geomesa-gt/geomesa-gt-partitioning/pom.xml index 3eb147160e6..5828e402c61 100644 --- a/geomesa-gt/geomesa-gt-partitioning/pom.xml +++ b/geomesa-gt/geomesa-gt-partitioning/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-gt_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 @@ -24,6 +24,10 @@ org.locationtech.geomesa geomesa-filter_${scala.binary.version} + + org.locationtech.geomesa + geomesa-index-api_${scala.binary.version} + org.geotools.jdbc gt-jdbc-postgis diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala index 95998b8c88b..449056db13e 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala @@ -9,6 +9,7 @@ package org.locationtech.geomesa.gt.partition.postgis.dialect import com.typesafe.scalalogging.StrictLogging +import org.geotools.api.data.Query import org.geotools.api.feature.`type`.{AttributeDescriptor, GeometryDescriptor} import org.geotools.api.feature.simple.SimpleFeatureType import org.geotools.api.filter.Filter @@ -22,8 +23,9 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.functions.{LogClean import org.locationtech.geomesa.gt.partition.postgis.dialect.procedures._ import org.locationtech.geomesa.gt.partition.postgis.dialect.tables._ import org.locationtech.geomesa.gt.partition.postgis.dialect.triggers.{DeleteTrigger, InsertTrigger, UpdateTrigger, WriteAheadTrigger} +import org.locationtech.geomesa.index.planning.QueryInterceptor.QueryInterceptorFactory import org.locationtech.geomesa.utils.geotools.{Conversions, SimpleFeatureTypes} -import org.locationtech.geomesa.utils.io.WithClose +import org.locationtech.geomesa.utils.io.{CloseWithLogging, WithClose} import org.locationtech.jts.geom._ import java.sql.{Connection, DatabaseMetaData, ResultSet, Types} @@ -55,6 +57,12 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto override def initialValue(): Boolean = false } + private val interceptors = { + val factory = QueryInterceptorFactory(store) + sys.addShutdownHook(CloseWithLogging(factory)) // we don't have any API hooks to dispose of things... + factory + } + /** * Re-create the PLPG/SQL procedures associated with a feature type. This can be used * to 'upgrade in place' if the code is changed. @@ -240,7 +248,10 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto override def splitFilter(filter: Filter, schema: SimpleFeatureType): Array[Filter] = { import PartitionedPostgisDialect.Config.ConfigConversions - super.splitFilter(SplitFilterVisitor(filter, schema.isFilterWholeWorld), schema) + val simplified = SplitFilterVisitor(filter, schema.isFilterWholeWorld) + val query = new Query(schema.getTypeName, simplified) + interceptors(schema).foreach(_.rewrite(query)) + super.splitFilter(query.getFilter, schema) } override def registerClassToSqlMappings(mappings: java.util.Map[Class[_], Integer]): Unit = { diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/UserDataTable.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/UserDataTable.scala index 2f549e98eab..fada2fc7e2b 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/UserDataTable.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/UserDataTable.scala @@ -47,15 +47,17 @@ class UserDataTable extends Sql { s"INSERT INTO ${table.quoted} (type_name, key, value) VALUES (?, ?, ?) " + s"ON CONFLICT (type_name, key) DO UPDATE SET value = EXCLUDED.value;" - def insert(config: String, value: Option[String]): Unit = - value.foreach(v => ex.executeUpdate(insertSql, Seq(info.typeName, config, v))) + def insert(config: String, value: String): Unit = + ex.executeUpdate(insertSql, Seq(info.typeName, config, value)) - insert(SimpleFeatureTypes.Configs.DefaultDtgField, Some(info.cols.dtg.raw)) - insert(Config.IntervalHours, Some(Integer.toString(info.partitions.hoursPerPartition))) - insert(Config.PagesPerRange, Some(Integer.toString(info.partitions.pagesPerRange))) - insert(Config.MaxPartitions, info.partitions.maxPartitions.map(Integer.toString)) - insert(Config.CronMinute, info.partitions.cronMinute.map(Integer.toString)) - insert(Config.FilterWholeWorld, info.userData.get(Config.FilterWholeWorld)) + insert(SimpleFeatureTypes.Configs.DefaultDtgField, info.cols.dtg.raw) + insert(Config.IntervalHours, Integer.toString(info.partitions.hoursPerPartition)) + insert(Config.PagesPerRange, Integer.toString(info.partitions.pagesPerRange)) + info.partitions.maxPartitions.map(Integer.toString).foreach(insert(Config.MaxPartitions, _)) + info.partitions.cronMinute.map(Integer.toString).foreach(insert(Config.CronMinute, _)) + Seq(Config.FilterWholeWorld, SimpleFeatureTypes.Configs.QueryInterceptors).foreach { key => + info.userData.get(key).foreach(insert(key, _)) + } } override def drop(info: TypeInfo)(implicit ex: ExecutionContext): Unit = { diff --git a/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala index 3d46f485aa3..9a49c35cf4d 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala @@ -577,6 +577,48 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll } } + "support query interceptors" in { + val sft = SimpleFeatureTypes.renameSft(this.sft, "interceptor") + sft.getUserData.put(SimpleFeatureTypes.Configs.QueryInterceptors, classOf[TestQueryInterceptor].getName) + + val ds = DataStoreFinder.getDataStore(params.asJava) + ds must not(beNull) + + try { + ds must beAnInstanceOf[JDBCDataStore] + + ds.getTypeNames.toSeq must not(contain(sft.getTypeName)) + ds.createSchema(sft) + + val schema = Try(ds.getSchema(sft.getTypeName)).getOrElse(null) + schema must not(beNull) + schema.getUserData.asScala must containAllOf(sft.getUserData.asScala.toSeq) + logger.debug(s"Schema: ${SimpleFeatureTypes.encodeType(schema)}") + + val Array(left, right) = ds.asInstanceOf[JDBCDataStore].getSQLDialect.splitFilter(Filter.EXCLUDE, schema) + left mustEqual Filter.INCLUDE + right mustEqual Filter.INCLUDE + + // write some data + WithClose(new DefaultTransaction()) { tx => + WithClose(ds.getFeatureWriterAppend(sft.getTypeName, tx)) { writer => + features.foreach { feature => + FeatureUtils.write(writer, feature, useProvidedFid = true) + } + } + tx.commit() + } + + // verify that filter is re-written to be Filter.INCLUDE + WithClose(ds.getFeatureReader(new Query(sft.getTypeName, ECQL.toFilter("IN('1')")), Transaction.AUTO_COMMIT)) { reader => + val result = SelfClosingIterator(reader).toList + result.map(compFromDb) must containTheSameElementsAs(features.map(compWithFid(_, sft))) + } + } finally { + ds.dispose() + } + } + "support idle_in_transaction_session_timeout" in { val sft = SimpleFeatureTypes.renameSft(this.sft, "timeout") diff --git a/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/TestQueryInterceptor.scala b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/TestQueryInterceptor.scala new file mode 100644 index 00000000000..f8be78530bb --- /dev/null +++ b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/TestQueryInterceptor.scala @@ -0,0 +1,25 @@ +/*********************************************************************** + * Copyright (c) 2013-2024 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.gt.partition.postgis + +import org.geotools.api.data.{DataStore, Query} +import org.geotools.api.feature.simple.SimpleFeatureType +import org.geotools.api.filter.Filter +import org.locationtech.geomesa.index.planning.QueryInterceptor + +class TestQueryInterceptor extends QueryInterceptor { + + var sft: SimpleFeatureType = _ + + override def init(ds: DataStore, sft: SimpleFeatureType): Unit = this.sft = sft + + override def rewrite(query: Query): Unit = query.setFilter(Filter.INCLUDE) + + override def close(): Unit = {} +} diff --git a/geomesa-gt/geomesa-gt-spark-runtime/pom.xml b/geomesa-gt/geomesa-gt-spark-runtime/pom.xml index 4a4efaa5fcb..317163411fc 100644 --- a/geomesa-gt/geomesa-gt-spark-runtime/pom.xml +++ b/geomesa-gt/geomesa-gt-spark-runtime/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-gt_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-gt/geomesa-gt-spark/pom.xml b/geomesa-gt/geomesa-gt-spark/pom.xml index 772f17d21c6..404242df722 100644 --- a/geomesa-gt/geomesa-gt-spark/pom.xml +++ b/geomesa-gt/geomesa-gt-spark/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-gt_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-gt/geomesa-gt-tools/pom.xml b/geomesa-gt/geomesa-gt-tools/pom.xml index ddd15e1d8a1..c0119e8e89f 100644 --- a/geomesa-gt/geomesa-gt-tools/pom.xml +++ b/geomesa-gt/geomesa-gt-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-gt_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-gt/pom.xml b/geomesa-gt/pom.xml index 800ce377b31..d7eded6b44e 100644 --- a/geomesa-gt/pom.xml +++ b/geomesa-gt/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index 3f86b75d7fb..63b7fb432eb 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index 72c8ea94299..2b0fa1a2784 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml index 1f1dcefb0de..d21b943c22f 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-hbase_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-hbase-distributed-runtime-hbase2_2.12 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index eb89a9ac694..95dc19784d9 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-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 6e0751058f8..054fbfdfd5c 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-rpc/pom.xml b/geomesa-hbase/geomesa-hbase-rpc/pom.xml index 0ba050e037b..a7c2a439102 100644 --- a/geomesa-hbase/geomesa-hbase-rpc/pom.xml +++ b/geomesa-hbase/geomesa-hbase-rpc/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml index 6e065d63da4..541216db846 100644 --- a/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-server/pom.xml b/geomesa-hbase/geomesa-hbase-server/pom.xml index 104a1d576dd..43d865d1211 100644 --- a/geomesa-hbase/geomesa-hbase-server/pom.xml +++ b/geomesa-hbase/geomesa-hbase-server/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml index 325d9a99c04..e15f7d8674d 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index ff305456364..4751b071fad 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -3,7 +3,7 @@ geomesa-hbase_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index f5d5c2f74ef..468d4f54c30 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index ab1e25c2f09..e5877e5c5df 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index 3d86ae07a42..56e606faa5b 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryInterceptor.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryInterceptor.scala index b04b49a5132..4b74387efab 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryInterceptor.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryInterceptor.scala @@ -111,7 +111,7 @@ object QueryInterceptor extends LazyLogging { classes.split(",").toSeq.flatMap { c => var interceptor: QueryInterceptor = null try { - interceptor = Class.forName(c).newInstance().asInstanceOf[QueryInterceptor] + interceptor = Class.forName(c).getDeclaredConstructor().newInstance().asInstanceOf[QueryInterceptor] interceptor.init(ds, sft) Seq(interceptor) } catch { diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index 77a9533d0ea..b2f0abdc9ff 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-confluent/pom.xml b/geomesa-kafka/geomesa-kafka-confluent/pom.xml index d70a9e960bc..775abbbfab5 100644 --- a/geomesa-kafka/geomesa-kafka-confluent/pom.xml +++ b/geomesa-kafka/geomesa-kafka-confluent/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index 5af52590691..1b31e859061 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-kafka_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index ce2fce9a7a6..072bfc7d890 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-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 58126a4c215..9c17ca8b904 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index dfd3b35cc33..c150c591ef6 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 9dd6e0067e1..441b7a08f7a 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index 994adb5ca33..f6b2fcd7377 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index 7ff1ed6b76f..e85ccb8fbed 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT geomesa-lambda-datastore_2.12 diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index 6a840ecdcaf..4d3fafc2220 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-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 c56633bab7c..2e34369931f 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-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 16b70589c27..eb5f75af79c 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.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index 9851a36f7b3..b0e4552eef4 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index 6caf9fa4e0f..a1de11e8f2d 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -4,7 +4,7 @@ geomesa-memory_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index 3f67f70fcdd..7eade1dd373 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -4,7 +4,7 @@ geomesa-memory_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index ae7ad7d70e1..d3d0b199653 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml b/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml index 194c8bdb521..4c25abd466a 100644 --- a/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml +++ b/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-metrics_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-core/pom.xml b/geomesa-metrics/geomesa-metrics-core/pom.xml index 90e7609280a..b08bda3479f 100644 --- a/geomesa-metrics/geomesa-metrics-core/pom.xml +++ b/geomesa-metrics/geomesa-metrics-core/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-metrics_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-graphite/pom.xml b/geomesa-metrics/geomesa-metrics-graphite/pom.xml index a1806683acf..488f1328c26 100644 --- a/geomesa-metrics/geomesa-metrics-graphite/pom.xml +++ b/geomesa-metrics/geomesa-metrics-graphite/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-metrics_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-micrometer/pom.xml b/geomesa-metrics/geomesa-metrics-micrometer/pom.xml index 31d56cf119a..8ba101ec2e8 100644 --- a/geomesa-metrics/geomesa-metrics-micrometer/pom.xml +++ b/geomesa-metrics/geomesa-metrics-micrometer/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-metrics_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-prometheus/pom.xml b/geomesa-metrics/geomesa-metrics-prometheus/pom.xml index dd5fe0c7624..ea504f35134 100644 --- a/geomesa-metrics/geomesa-metrics-prometheus/pom.xml +++ b/geomesa-metrics/geomesa-metrics-prometheus/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-metrics_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index 03487cb7d2a..f0fcf4c6344 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index 146a6da4bf2..17ae63681f1 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index 29847878181..0aa85742fbd 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -3,7 +3,7 @@ geomesa-process_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index 1759866e2ef..be45c519ebc 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-redis/geomesa-redis-datastore/pom.xml b/geomesa-redis/geomesa-redis-datastore/pom.xml index 63631b05512..a28082ad759 100644 --- a/geomesa-redis/geomesa-redis-datastore/pom.xml +++ b/geomesa-redis/geomesa-redis-datastore/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-redis_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 jar diff --git a/geomesa-redis/geomesa-redis-dist/pom.xml b/geomesa-redis/geomesa-redis-dist/pom.xml index bf9b5e2b2b9..6d995104232 100644 --- a/geomesa-redis/geomesa-redis-dist/pom.xml +++ b/geomesa-redis/geomesa-redis-dist/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-binary-dist_2.12 ../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 pom diff --git a/geomesa-redis/geomesa-redis-gs-plugin/pom.xml b/geomesa-redis/geomesa-redis-gs-plugin/pom.xml index 837b8d6ddd2..80b05f9ed9c 100644 --- a/geomesa-redis/geomesa-redis-gs-plugin/pom.xml +++ b/geomesa-redis/geomesa-redis-gs-plugin/pom.xml @@ -5,7 +5,7 @@ org.locationtech.geomesa geomesa-archetypes-gs-plugin_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-redis/geomesa-redis-tools/pom.xml b/geomesa-redis/geomesa-redis-tools/pom.xml index 9628eac9c6b..3663a866e92 100644 --- a/geomesa-redis/geomesa-redis-tools/pom.xml +++ b/geomesa-redis/geomesa-redis-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-redis_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-redis/pom.xml b/geomesa-redis/pom.xml index bd79f874439..6ecb6827d3a 100644 --- a/geomesa-redis/pom.xml +++ b/geomesa-redis/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index 9a98c7e3808..aff1cdc31b9 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index 560e062145e..9304fdc1f90 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index 07c5fd7465b..bbf01ec9ed3 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index 520b39de188..3aa304fd8b0 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml b/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml index 6c89eae9e27..37c87160b04 100644 --- a/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml +++ b/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index 80da2279017..8c572d4a34d 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-test-with-sedona/pom.xml b/geomesa-spark/geomesa-spark-test-with-sedona/pom.xml index 72c6e0b09f9..95c79d98a6b 100644 --- a/geomesa-spark/geomesa-spark-test-with-sedona/pom.xml +++ b/geomesa-spark/geomesa-spark-test-with-sedona/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa-spark-test-without-sedona/pom.xml b/geomesa-spark/geomesa-spark-test-without-sedona/pom.xml index a9a48e2bbc1..22d43617a3f 100644 --- a/geomesa-spark/geomesa-spark-test-without-sedona/pom.xml +++ b/geomesa-spark/geomesa-spark-test-without-sedona/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index a16dc8ef601..0752f473e49 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -3,7 +3,7 @@ geomesa-spark_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index 558a7f792a0..4e80bf3a7de 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index d7c0b6e5eaf..e0bbb1fa2d6 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-utils-parent/geomesa-bom/generate-pom.sh b/geomesa-utils-parent/geomesa-bom/generate-pom.sh new file mode 100755 index 00000000000..747f6bf106a --- /dev/null +++ b/geomesa-utils-parent/geomesa-bom/generate-pom.sh @@ -0,0 +1,67 @@ +#!/bin/bash +set -e +set -u +set -o pipefail + +cd "$(dirname "$0")/../.." || exit + +export LC_ALL=C # ensure stable sort order across different locales +POM="geomesa-utils-parent/geomesa-bom/pom.xml" + +echo "Running maven build to generate installed artifact list" +deps=() +# mapfile reads the results into an array +# we get the list of artifacts from `mvn clean install` (seems to be only way...) +mapfile -t deps < <( + mvn clean install -DskipTests -Pzinc -B -T2C 2>&1 | + grep Installing | # pull out installed artifacts only + grep -v -e "\-sources\.jar$" -e "\.pom$" | # skip sources jars and poms + sed 's|.*\.m2/repository/org/locationtech/geomesa/||' | # strip line prefix + sed 's|\.|!|g' | # replace . with ! so that classifiers sort after regular artifact + sort | # sort artifacts + sed 's|!|.|g' # undo classifier sort hack +) + +# truncate everything after the opening dependencyManagement +sed -i '/ /q' "$POM" +echo -e " \n" >> "$POM" + +function printDependency() { + local dep="$1" + # elements look like 'geomesa-utils_2.12/4.0.0-SNAPSHOT/geomesa-utils_2.12-4.0.0-SNAPSHOT.jar' + artifact="$(echo "$dep" | awk -F '/' '{ print $1 }')" + version="$(echo "$dep" | awk -F '/' '{ print $2 }')" + classifier="" + if ! [[ $dep =~ .*$artifact-$version.jar ]]; then + classifier=$'\n'" $(echo "$dep" | sed -E 's/.*-([a-z]+)\.jar/\1/')" + if [[ $classifier =~ test ]]; then + classifier="$classifier"$'\n'" test" + fi + fi + { + echo " " + echo " org.locationtech.geomesa" + echo " ${artifact%_*}_\${scala.binary.version}" + echo " \${geomesa.version}$classifier" + echo " " + } | tee -a "$POM" +} + +for dep in "${deps[@]}"; do + if ! [[ $dep =~ .*tests.jar ]]; then + printDependency "$dep" + fi +done + +echo -e "\n \n" | tee -a "$POM" + +for dep in "${deps[@]}"; do + if [[ $dep =~ .*tests.jar ]]; then + printDependency "$dep" + fi +done + +echo " + + +" >> "$POM" diff --git a/geomesa-utils-parent/geomesa-bom/pom.xml b/geomesa-utils-parent/geomesa-bom/pom.xml new file mode 100644 index 00000000000..ecadc28e269 --- /dev/null +++ b/geomesa-utils-parent/geomesa-bom/pom.xml @@ -0,0 +1,509 @@ + + + + + geomesa-utils-parent_2.12 + org.locationtech.geomesa + 5.2.0-SNAPSHOT + + 4.0.0 + + geomesa-bom_2.12 + GeoMesa Bill Of Materials + pom + + + + + + org.locationtech.geomesa + geomesa-accumulo-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-distributed-runtime_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-indices_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-iterators_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-jobs_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-spark-runtime-accumulo20_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-spark-runtime-accumulo21_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-spark_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-accumulo-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-arrow-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-arrow-gt_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-arrow-jts_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-arrow-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-cassandra-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-cassandra-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-all_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-avro-schema-registry_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-avro_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-common_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-fixedwidth_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-jdbc_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-json_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-parquet_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-redis-cache_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-shp_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-simplefeature_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-text_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-convert-xml_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-cqengine-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-cqengine_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-feature-all_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-feature-avro_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-feature-common_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-feature-exporters_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-feature-kryo_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-filter_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-spark-runtime_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-spark_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-storage-api_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-storage-common_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-storage-convert_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-storage-orc_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-storage-parquet_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-fs-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-gt-partitioning_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-gt-spark-runtime_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-gt-spark_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-gt-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hadoop-utils_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-distributed-runtime-hbase2_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-jobs_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-rpc_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-server-hbase2_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-server_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-spark-runtime-hbase2_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-spark_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-hbase-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-index-api_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-jobs_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-kafka-confluent_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-kafka-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-kafka-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-kafka-utils_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-lambda-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-lambda-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-metrics-cloudwatch_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-metrics-core_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-metrics-graphite_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-metrics-micrometer_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-metrics-prometheus_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-process-vector_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-process-wps_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-redis-datastore_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-redis-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-security_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-spark-converter_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-spark-core_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-spark-jts_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-spark-jupyter-leaflet_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-spark-sql_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-tools_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-tools_${scala.binary.version} + ${geomesa.version} + data + + + org.locationtech.geomesa + geomesa-utils_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-z3_${scala.binary.version} + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-zk-utils_${scala.binary.version} + ${geomesa.version} + + + + + + org.locationtech.geomesa + geomesa-accumulo-datastore_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-fs-datastore_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-hbase-datastore_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-index-api_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-kafka-datastore_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-spark-jts_${scala.binary.version} + ${geomesa.version} + tests + test + + + org.locationtech.geomesa + geomesa-spark-sql_${scala.binary.version} + ${geomesa.version} + tests + test + + + + + diff --git a/geomesa-utils-parent/geomesa-hadoop-utils/pom.xml b/geomesa-utils-parent/geomesa-hadoop-utils/pom.xml index ac48c5424c7..660c523a2ce 100644 --- a/geomesa-utils-parent/geomesa-hadoop-utils/pom.xml +++ b/geomesa-utils-parent/geomesa-hadoop-utils/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-utils-parent_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-utils-parent/geomesa-utils/pom.xml b/geomesa-utils-parent/geomesa-utils/pom.xml index 4a99e6442c3..4a6c5aedfd0 100644 --- a/geomesa-utils-parent/geomesa-utils/pom.xml +++ b/geomesa-utils-parent/geomesa-utils/pom.xml @@ -4,7 +4,7 @@ org.locationtech.geomesa geomesa-utils-parent_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-utils-parent/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/PathUtils.scala b/geomesa-utils-parent/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/PathUtils.scala index dd5a9c9e340..58e11f09382 100644 --- a/geomesa-utils-parent/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/PathUtils.scala +++ b/geomesa-utils-parent/geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/io/PathUtils.scala @@ -28,9 +28,12 @@ object PathUtils extends FileSystemDelegate with LazyLogging { // delegate allows us to avoid a runtime dependency on hadoop private val hadoopDelegate: FileSystemDelegate = - Try(Class.forName("org.locationtech.geomesa.utils.hadoop.HadoopDelegate").newInstance()) - .getOrElse(null) - .asInstanceOf[FileSystemDelegate] + try { + Class.forName("org.locationtech.geomesa.utils.hadoop.HadoopDelegate") + .getDeclaredConstructor().newInstance().asInstanceOf[FileSystemDelegate] + } catch { + case _: Throwable => null + } override def interpretPath(path: String): Seq[FileHandle] = chooseDelegate(path).interpretPath(path) diff --git a/geomesa-utils-parent/geomesa-zk-utils/pom.xml b/geomesa-utils-parent/geomesa-zk-utils/pom.xml index 1144bb3c7f4..bc75a14d5a3 100644 --- a/geomesa-utils-parent/geomesa-zk-utils/pom.xml +++ b/geomesa-utils-parent/geomesa-zk-utils/pom.xml @@ -3,7 +3,7 @@ org.locationtech.geomesa geomesa-utils-parent_2.12 - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/geomesa-utils-parent/pom.xml b/geomesa-utils-parent/pom.xml index 7db46883fad..c5d4bd4f5a5 100644 --- a/geomesa-utils-parent/pom.xml +++ b/geomesa-utils-parent/pom.xml @@ -3,7 +3,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 @@ -12,6 +12,7 @@ pom + geomesa-bom geomesa-hadoop-utils geomesa-utils geomesa-zk-utils diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index eb82ae2c7a3..5d6f83becc7 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -4,7 +4,7 @@ geomesa_2.12 org.locationtech.geomesa - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 9f940b2a090..8ff19c1cce8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.locationtech.geomesa geomesa_2.12 pom - 5.1.0-SNAPSHOT + 5.2.0-SNAPSHOT @@ -210,8 +210,8 @@ - 5.0.1 - 5.1.0-SNAPSHOT + 5.1.0 + 5.2.0-SNAPSHOT 2024