Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for next development iteration #33

Merged
merged 9 commits into from
Oct 18, 2024
Merged

Prepare for next development iteration #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
daa465e
GEOMESA-3388 Accumulo - fix CLI dependency downloads (#3213)
elahrvivaz Oct 10, 2024
d8b5150
GEOMESA-3402 CLI - Fix required Hadoop dependency (#3214)
elahrvivaz Oct 10, 2024
c78ec66
Docs - Fix formatting of Cassandra code block (#3215)
elahrvivaz Oct 11, 2024
bf13d58
Set version for release 5.1.0
elahrvivaz Oct 11, 2024
babb127
[maven-release-plugin] prepare release geomesa-5.1.0
elahrvivaz Oct 11, 2024
17a537d
[maven-release-plugin] prepare for next development iteration
elahrvivaz Oct 11, 2024
58bec85
Set pipefail in release script
elahrvivaz Oct 11, 2024
ff83fb0
GEOMESA-3404 Provide BOM module (#3216)
elahrvivaz Oct 11, 2024
fe52183
GEOMESA-3405 Postgis - support query interceptors (#3219)
elahrvivaz Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/maven-badge.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 31 additions & 15 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand All @@ -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

Expand All @@ -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:
Expand All @@ -79,11 +79,27 @@ GeoMesa is hosted on Maven Central. To include it as a dependency, add the desir
```xml
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-hbase-datastore_2.12</artifactId>
<version>5.0.1</version>
<artifactId>geomesa-accumulo-datastore_2.12</artifactId>
<version>5.1.0</version>
</dependency>
```

GeoMesa provides a bill-of-materials module, which can simplify version management:

```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-bom_2.12</artifactId>
<version>5.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
```

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:

Expand Down Expand Up @@ -130,7 +146,7 @@ DataStore implementations:
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-gt-spark-runtime_2.12</artifactId>
<version>5.0.1</version>
<version>5.1.0</version>
<exclusions>
<exclusion>
<!-- if groupId wildcards are not supported, the two main ones are jline:* and org.geotools:* -->
Expand All @@ -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**

&nbsp;&nbsp;&nbsp;&nbsp;
[![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)
Expand Down
5 changes: 4 additions & 1 deletion build/scripts/do-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env bash

set -e
set -u
set -o pipefail

cd "$(dirname "$0")/../.." || exit

Expand All @@ -12,7 +14,7 @@ where :
exit 1
}

if [[ ($# -ne 0) || ( $1 == "--help") || $1 == "-h" ]]; then
if [[ ($# -ne 0) ]]; then
usage
fi

Expand All @@ -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")"
Expand Down
22 changes: 19 additions & 3 deletions build/templates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand All @@ -40,8 +40,8 @@ geospatial analytics.
**Current release: [${geomesa.release.version}](https://github.com/locationtech/geomesa/releases/tag/geomesa-${geomesa.release.version})**

&nbsp;&nbsp;&nbsp;&nbsp;
[**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) |
Expand Down Expand Up @@ -79,11 +79,27 @@ GeoMesa is hosted on Maven Central. To include it as a dependency, add the desir
```xml
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-hbase-datastore_${scala.binary.version}</artifactId>
<artifactId>geomesa-accumulo-datastore_${scala.binary.version}</artifactId>
<version>${geomesa.release.version}</version>
</dependency>
```

GeoMesa provides a bill-of-materials module, which can simplify version management:

```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-bom_${scala.binary.version}</artifactId>
<version>${geomesa.release.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
```

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:

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion docs/user/cassandra/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 17 additions & 1 deletion docs/user/download.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ repositories to your pom:
</repository>
</repositories>

and then include the desired ``geomesa-*`` dependencies:
and then include the desired GeoMesa dependencies:

.. parsed-literal::

Expand All @@ -58,6 +58,22 @@ and then include the desired ``geomesa-*`` dependencies:
<version>${geomesa.version}</version>
</dependency>

GeoMesa provides a bill-of-materials module, which can simplify version management:

.. code-block:: xml

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-bom_${scala.binary.version}</artifactId>
<version>${geomesa.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

For cutting-edge development, nightly snapshots are available from Eclipse:

.. code-block:: xml
Expand Down
4 changes: 2 additions & 2 deletions docs/user/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/user/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>

<artifactId>geomesa-accumulo-datastore_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-archetypes-binary-dist_2.12</artifactId>
<relativePath>../../geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml</relativePath>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>

<artifactId>geomesa-accumulo-distributed-runtime_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-archetypes-gs-plugin_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
<relativePath>../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-indices/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>

<artifactId>geomesa-accumulo-indices_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-iterators/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>

<artifactId>geomesa-accumulo-iterators_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-jobs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>geomesa-accumulo_2.12</artifactId>
<groupId>org.locationtech.geomesa</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo21/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>geomesa-accumulo_2.12</artifactId>
<groupId>org.locationtech.geomesa</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>geomesa-accumulo_2.12</artifactId>
<groupId>org.locationtech.geomesa</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
8 changes: 8 additions & 0 deletions geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/geomesa-accumulo-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.locationtech.geomesa</groupId>
<artifactId>geomesa-accumulo_2.12</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>geomesa_2.12</artifactId>
<groupId>org.locationtech.geomesa</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geomesa-archetypes_2.12</artifactId>
<groupId>org.locationtech.geomesa</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
</parent>

<artifactId>geomesa-archetypes-binary-dist_2.12</artifactId>
Expand Down
Loading