Skip to content

Commit 0ba2275

Browse files
authored
GEOMESA-3531 Drop support for Accumulo 2.0.1 (#3447)
1 parent b0f456e commit 0ba2275

File tree

9 files changed

+9
-280
lines changed

9 files changed

+9
-280
lines changed

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def ultimateReplace(app, docname, source):
2929

3030

3131
ultimate_replacements = {
32-
"{{accumulo_supported_versions}}": "versions 2.0.1 and " + target.versions.accumulo_version,
33-
"{{accumulo_required_version}}": "2.0.1 or " + target.versions.accumulo_version,
32+
"{{accumulo_supported_versions}}": target.versions.accumulo_version,
33+
"{{accumulo_required_version}}": target.versions.accumulo_version,
3434
"{{cassandra_supported_versions}}": "version " + target.versions.cassandra_version,
3535
"{{cassandra_required_version}}": target.versions.cassandra_version,
3636
"{{scylladb_supported_versions}}": "version " + target.versions.scylladb_version,

docs/user/spark/providers.rst

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ Accumulo RDD Provider
99
^^^^^^^^^^^^^^^^^^^^^
1010

1111
The ``AccumuloSpatialRDDProvider`` is a spatial RDD provider for Accumulo data stores. The core code is in
12-
the ``geomesa-accumulo-spark`` module, and the shaded JAR-with-dependencies are available in the
13-
``geomesa-accumulo-spark-runtime-accumulo20`` and ``geomesa-accumulo-spark-runtime-accumulo21`` modules.
14-
15-
.. note::
16-
17-
The GeoMesa Spark runtime JARs are convenient bundles of all the required dependencies for each data store.
18-
There are two Accumulo Spark runtime JARs, one for Accumulo 2.0.x (``geomesa-accumulo-spark-runtime-accumulo20``)
19-
and one for Accumulo 2.1.x (``geomesa-accumulo-spark-runtime-accumulo21``). Make sure that you use the JAR
20-
corresponding to your Accumulo version.
12+
the ``geomesa-accumulo-spark`` module, and the shaded JAR-with-dependencies is available in the
13+
``geomesa-accumulo-spark-runtime-accumulo21`` module.
2114

2215
This provider can read from and write to a GeoMesa ``AccumuloDataStore``. The configuration parameters
2316
are the same as those passed to ``DataStoreFinder.getDataStore()``. See :ref:`accumulo_parameters` for details.

docs/user/upgrade.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ Minimum Java Version
9898

9999
With the latest versions of GeoTools and GeoServer, Java 17 is now the minimum required version.
100100

101+
Accumulo Version Support
102+
------------------------
103+
104+
GeoMesa no longer supports Accumulo 2.0. Users should upgrade to Accumulo 2.1.4.
105+
101106
Dependency Version Upgrades
102107
---------------------------
103108

geomesa-accumulo/geomesa-accumulo-dist/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
</dependency>
6161

6262
<!-- Spark (dist)-->
63-
<dependency>
64-
<groupId>org.locationtech.geomesa</groupId>
65-
<artifactId>geomesa-accumulo-spark-runtime-accumulo20_${scala.binary.version}</artifactId>
66-
</dependency>
6763
<dependency>
6864
<groupId>org.locationtech.geomesa</groupId>
6965
<artifactId>geomesa-accumulo-spark-runtime-accumulo21_${scala.binary.version}</artifactId>

geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml

Lines changed: 0 additions & 226 deletions
This file was deleted.

geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/src/main/scala/org/locationtech/geomesa/accumulo/spark/runtime/ScalaDocs.scala

Lines changed: 0 additions & 15 deletions
This file was deleted.

geomesa-accumulo/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<module>geomesa-accumulo-iterators</module>
2525
<module>geomesa-accumulo-jobs</module>
2626
<module>geomesa-accumulo-spark</module>
27-
<module>geomesa-accumulo-spark-runtime-accumulo20</module>
2827
<module>geomesa-accumulo-spark-runtime-accumulo21</module>
2928
<module>geomesa-accumulo-tools</module>
3029
</modules>

geomesa-utils-parent/geomesa-bom/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@
5151
<artifactId>geomesa-accumulo-jobs_${scala.binary.version}</artifactId>
5252
<version>${project.version}</version>
5353
</dependency>
54-
<dependency>
55-
<groupId>org.locationtech.geomesa</groupId>
56-
<artifactId>geomesa-accumulo-spark-runtime-accumulo20_${scala.binary.version}</artifactId>
57-
<version>${project.version}</version>
58-
<!-- this is a shaded jar with all dependencies already included -->
59-
<exclusions>
60-
<exclusion>
61-
<groupId>*</groupId>
62-
<artifactId>*</artifactId>
63-
</exclusion>
64-
</exclusions>
65-
</dependency>
6654
<dependency>
6755
<groupId>org.locationtech.geomesa</groupId>
6856
<artifactId>geomesa-accumulo-spark-runtime-accumulo21_${scala.binary.version}</artifactId>

pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -525,17 +525,6 @@
525525
<artifactId>geomesa-accumulo-spark_${scala.binary.version}</artifactId>
526526
<version>${project.version}</version>
527527
</dependency>
528-
<dependency>
529-
<groupId>org.locationtech.geomesa</groupId>
530-
<artifactId>geomesa-accumulo-spark-runtime-accumulo20_${scala.binary.version}</artifactId>
531-
<version>${project.version}</version>
532-
<exclusions>
533-
<exclusion>
534-
<groupId>*</groupId>
535-
<artifactId>*</artifactId>
536-
</exclusion>
537-
</exclusions>
538-
</dependency>
539528
<dependency>
540529
<groupId>org.locationtech.geomesa</groupId>
541530
<artifactId>geomesa-accumulo-spark-runtime-accumulo21_${scala.binary.version}</artifactId>

0 commit comments

Comments
 (0)