Merge branch 'main' into 2.12-2

locationtech · Jan 13, 2021 · c10a701 · c10a701
2 parents d65ee3f + 9f8e833
commit c10a701
Show file tree

Hide file tree

Showing 1,602 changed files with 2,332 additions and 1,720 deletions.
diff --git a/benchmarks/src/main/scala/org/locationtech/geomesa/benchmarks/JsonPathBenchmarks.scala b/benchmarks/src/main/scala/org/locationtech/geomesa/benchmarks/JsonPathBenchmarks.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/build/copyright/ccri-dstl-2016.txt b/build/copyright/ccri-dstl-2016.txt
diff --git a/build/copyright/ccri-dstl-2020.txt b/build/copyright/ccri-dstl-2020.txt
diff --git a/build/copyright/ccri-dstl.txt b/build/copyright/ccri-dstl.txt
@@ -1,5 +1,5 @@
 Copyright (c) ${project.inceptionYear}-${year} ${owner}
-Portions Crown Copyright (c) 2017-${year} Dstl
+Portions Crown Copyright (c) 2016-${year} Dstl
 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

diff --git a/build/copyright/dstl.txt b/build/copyright/dstl.txt
@@ -1,4 +1,4 @@
-Crown Copyright (c) 2017-${year} Dstl
+Crown Copyright (c) 2016-${year} Dstl
 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

diff --git a/docs/common.py b/docs/common.py
@@ -52,7 +52,7 @@
 # General information about the project.
 project = u'GeoMesa'
 # note: shown in our custom footer
-copyright = u'2013-2020'
+copyright = u'2013-2021'
 author = u''
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/docs/user/datastores/index_basics.rst b/docs/user/datastores/index_basics.rst
@@ -136,6 +136,7 @@ The following versions are available:
         4             1.3.1           Support for table sharing
         5             2.0.0           Uses fixed Z-curve implementation
         6             2.3.0           Configurable attributes
+        7             3.2.0           Fixes yearly epoch indexing
         ============= =============== =================================================================
 
     .. tab:: Z2
@@ -161,6 +162,7 @@ The following versions are available:
         ============= =============== =================================================================
         1             1.2.5           Initial implementation
         2             2.3.0           Configurable attributes
+        3             3.2.0           Fixes yearly epoch indexing
         ============= =============== =================================================================
 
     .. tab:: XZ2

diff --git a/docs/user/datastores/query_config.rst b/docs/user/datastores/query_config.rst
@@ -106,6 +106,38 @@ QueryHints.EXACT_COUNT ``Boolean`` ``true`` or ``false``
 
         ...&viewparams=EXACT_COUNT:true
 
+Filter Compatibility
+--------------------
+
+GeoMesa provides a limited compatibility mode, which allows for using a newer client version with
+an older distributed-runtime version, for back-ends that have a distributed installation. Currently
+only GeoMesa 1.3.7 on Accumulo is supported, with the compatibility flag ``1.3``. Only basic
+spatio-temporal queries are supported, without transforms or advanced options.
+
+======================== ======================= ===========================
+Key                      Type                    GeoServer Conversion
+======================== ======================= ===========================
+QueryHints.FILTER_COMPAT String                  distributed install version
+======================== ======================= ===========================
+
+.. tabs::
+
+    .. code-tab:: java
+
+        import org.locationtech.geomesa.index.conf.QueryHints;
+
+        query.getHints().put(QueryHints.FILTER_COMPAT(), "1.3");
+
+    .. code-tab:: scala
+
+        import org.locationtech.geomesa.index.conf.QueryHints
+
+        query.getHints.put(QueryHints.FILTER_COMPAT, "1.3")
+
+    .. code-tab:: none GeoServer
+
+        ...&viewparams=FILTER_COMPAT:1.3
+
 .. _query_index_hint:
 
 Query Index

diff --git a/docs/user/geoserver.rst b/docs/user/geoserver.rst
@@ -22,13 +22,21 @@ version to install. It is recommended to use the latest GeoServer bug-fix releas
 +-------------------+-------------------+
 | GeoMesa Version   | GeoServer Version |
 +===================+===================+
-| 2.1.x and earlier | 2.12.x            |
+| 3.2.x             | 2.17.3            |
++-------------------+-------------------+
+| 3.1.1             | 2.17.3            |
++-------------------+-------------------+
+| 3.1.0             | 2.17.0            |
 +-------------------+-------------------+
-| 2.2.x and 2.3.x   | 2.14.x            |
+| 3.0.x             | 2.17.0            |
 +-------------------+-------------------+
 | 2.4.x             | 2.15.x            |
 +-------------------+-------------------+
-| 3.0.x and 3.1.x   | 2.17.x            |
+| 2.3.x             | 2.14.x            |
++-------------------+-------------------+
+| 2.2.x             | 2.14.x            |
++-------------------+-------------------+
+| 2.1.x and earlier | 2.12.x            |
 +-------------------+-------------------+
 
 .. warning::

diff --git a/...accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/AccumuloVersion.scala b/...accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/AccumuloVersion.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...tastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloAuditService.scala b/...tastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloAuditService.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventReader.scala b/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventReader.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...store/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala b/...store/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventTransform.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala b/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloEventWriter.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/.../src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloQueryEventTransform.scala b/.../src/main/scala/org/locationtech/geomesa/accumulo/audit/AccumuloQueryEventTransform.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/ParamsAuditProvider.scala b/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/ParamsAuditProvider.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...tastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/SerializedQueryEvent.scala b/...tastore/src/main/scala/org/locationtech/geomesa/accumulo/audit/SerializedQueryEvent.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...astore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloBackedMetadata.scala b/...astore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloBackedMetadata.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloClientConfig.scala b/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloClientConfig.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStore.scala b/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStore.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...tore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreFactory.scala b/...tore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreFactory.scala
@@ -1,6 +1,6 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
- * Portions Crown Copyright (c) 2016-2020 Dstl
+ * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc.
+ * Portions Crown Copyright (c) 2016-2021 Dstl
  * 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

diff --git a/...store/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreParams.scala b/...store/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreParams.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala b/...atastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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
@@ -228,7 +228,8 @@ class AccumuloIndexAdapter(ds: AccumuloDataStore) extends IndexAdapter[AccumuloD
           // TODO pull this out to be SPI loaded so that new indices can be added seamlessly
           val indexIter = if (index.name == Z3Index.name) {
             strategy.values.toSeq.map { case v: Z3IndexValues =>
-              Z3Iterator.configure(v, index.keySpace.sharding.length + index.keySpace.sharing.length, ZIterPriority)
+              val offset = index.keySpace.sharding.length + index.keySpace.sharing.length
+              Z3Iterator.configure(v, offset, hints.getFilterCompatibility, ZIterPriority)
             }
           } else if (index.name == Z2Index.name) {
             strategy.values.toSeq.map { case v: Z2IndexValues =>

diff --git a/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloQueryPlan.scala b/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloQueryPlan.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...store/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloWritableFeature.scala b/...store/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloWritableFeature.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...re/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/AccumuloGeoMesaStats.scala b/...re/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/AccumuloGeoMesaStats.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsCombiner.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsRunner.scala b/...o-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/stats/StatsRunner.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/.../src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndexFactory.scala b/.../src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloFeatureIndexFactory.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloJoinIndex.scala b/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/AccumuloJoinIndex.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/IndexValueEncoder.scala b/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/IndexValueEncoder.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/JoinIndex.scala b/...accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/JoinIndex.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV2.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV2.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV3.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV3.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV4.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV4.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV5.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV5.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV6.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV6.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV7.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/index/legacy/JoinIndexV7.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AgeOffIterator.scala b/...datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/AgeOffIterator.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/ArrowIterator.scala b/...-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/ArrowIterator.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/...rc/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeKeyValueIterator.scala b/...rc/main/scala/org/locationtech/geomesa/accumulo/iterators/AttributeKeyValueIterator.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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

diff --git a/.../src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala b/.../src/main/scala/org/locationtech/geomesa/accumulo/iterators/BaseAggregatingIterator.scala
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2013-2020 Commonwealth Computer Research, Inc.
+ * Copyright (c) 2013-2021 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