diff --git a/build/cqs.tsv b/build/cqs.tsv
index fff95b3ffd57..55a9980f267e 100644
--- a/build/cqs.tsv
+++ b/build/cqs.tsv
@@ -149,11 +149,11 @@ org.apache.accumulo:accumulo-core	2.0.1	compile
 org.apache.accumulo:accumulo-core	2.1.3	compile
 org.apache.accumulo:accumulo-hadoop-mapreduce	2.0.1	compile
 org.apache.accumulo:accumulo-hadoop-mapreduce	2.1.3	compile
-org.apache.arrow:arrow-format	17.0.0	compile
-org.apache.arrow:arrow-memory-core	17.0.0	compile
-org.apache.arrow:arrow-memory-netty	17.0.0	compile
-org.apache.arrow:arrow-memory-netty-buffer-patch	17.0.0	compile
-org.apache.arrow:arrow-vector	17.0.0	compile
+org.apache.arrow:arrow-format	18.1.0	compile
+org.apache.arrow:arrow-memory-core	18.1.0	compile
+org.apache.arrow:arrow-memory-netty	18.1.0	compile
+org.apache.arrow:arrow-memory-netty-buffer-patch	18.1.0	compile
+org.apache.arrow:arrow-vector	18.1.0	compile
 org.apache.avro:avro	1.11.4	compile
 org.apache.commons:commons-collections4	4.4	compile
 org.apache.commons:commons-compress	1.26.0	compile
@@ -324,7 +324,7 @@ com.uber:h3	4.1.1	test
 commons-lang:commons-lang	2.6	test
 junit:junit	4.13.2	test
 org.apache.accumulo:accumulo-test	2.1.3	test
-org.apache.arrow:arrow-vector	tests:17.0.0	test
+org.apache.arrow:arrow-vector	tests:18.1.0	test
 org.apache.cassandra:cassandra-all	3.11.14	test
 org.apache.cassandra:cassandra-thrift	3.11.14	test
 org.apache.curator:curator-test	5.6.0	test
diff --git a/docs/user/geoserver.rst b/docs/user/geoserver.rst
index 219286718c98..e5419cfd6bde 100644
--- a/docs/user/geoserver.rst
+++ b/docs/user/geoserver.rst
@@ -23,6 +23,8 @@ although this may occasionally cause errors as GeoServer does not follow semanti
 +-------------------+-------------------+
 | GeoMesa Version   | GeoServer Version |
 +===================+===================+
+| 5.2.0             | 2.26.1            |
++-------------------+-------------------+
 | 5.1.0             | 2.26.0            |
 +-------------------+-------------------+
 | 5.0.0             | 2.24.2            |
diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst
index bfe4ca7b6d53..51d351e044fa 100644
--- a/docs/user/upgrade.rst
+++ b/docs/user/upgrade.rst
@@ -98,6 +98,7 @@ Dependency Version Upgrades
 
 The following dependencies have been upgraded:
 
+* arrow ``17.0.0`` -> ``18.1.0``
 * geotools ``32.0`` -> ``32.1``
 * hbase ``2.5.8-hadoop3`` -> ``2.6.1-hadoop3``
 * hadoop ``3.4.0`` -> ``3.4.1``
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java
index e6422af54b51..5eb2179f9ab8 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class LineStringFloatVector extends AbstractLineStringVector<Float4Vector
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST;
 
-  public LineStringFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public LineStringFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public LineStringFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public LineStringFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java
index 6f9aef73c551..4931d80c5362 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class LineStringVector extends AbstractLineStringVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST;
 
-  public LineStringVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public LineStringVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public LineStringVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public LineStringVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java
index bbba3e638b4b..bae46da58e26 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiLineStringFloatVector extends AbstractMultiLineStringVector<Fl
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST_2;
 
-  public MultiLineStringFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiLineStringFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java
index 876fb34642b9..2a3c725da537 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiLineStringVector extends AbstractMultiLineStringVector<Float8V
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST_2;
 
-  public MultiLineStringVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiLineStringVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java
index 4ce6e3ca0e72..192995c32220 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiPointFloatVector extends AbstractMultiPointVector<Float4Vector
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST;
 
-  public MultiPointFloatVector(String name, BufferAllocator allocator,@Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointFloatVector(String name, BufferAllocator allocator,Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPointFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java
index aeb4905d9b6f..459bb4e0dfd8 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiPointVector extends AbstractMultiPointVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST;
 
-  public MultiPointVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPointVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java
index 5410adfc52e6..cd2605042acd 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiPolygonFloatVector extends AbstractMultiPolygonVector<Float4Ve
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST_3;
 
-  public MultiPolygonFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPolygonFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java
index a12da2b59db4..9559f7cbe85a 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiPolygonVector extends AbstractMultiPolygonVector<Float8Vector>
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST_3;
 
-  public MultiPolygonVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPolygonVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java
index 410492112b73..55f499cdb8d8 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class PointFloatVector extends AbstractPointVector<Float4Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT;
 
-  public PointFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public PointFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public PointFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public PointFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointVector.java
index 5e09e8eea2de..58cf9a3e4ea7 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class PointVector extends AbstractPointVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE;
 
-  public PointVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public PointVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public PointVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public PointVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonFloatVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonFloatVector.java
index 49879d56ff89..fce5249a3768 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonFloatVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class PolygonFloatVector extends AbstractPolygonVector<Float4Vector>  {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST_2;
 
-  public PolygonFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public PolygonFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public PolygonFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public PolygonFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonVector.java
index 014e48c66057..2202352f3c7c 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PolygonVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class PolygonVector extends AbstractPolygonVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST_2;
 
-  public PolygonVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public PolygonVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public PolygonVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public PolygonVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 
diff --git a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/WKBGeometryVector.java b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/WKBGeometryVector.java
index 4068d1609463..584ead747499 100644
--- a/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/WKBGeometryVector.java
+++ b/geomesa-arrow/geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/WKBGeometryVector.java
@@ -19,7 +19,6 @@
 import org.locationtech.jts.io.WKBReader;
 import org.locationtech.jts.io.WKBWriter;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
 /**
@@ -37,11 +36,25 @@ public static FieldType createFieldType(Map<String, String> metadata) {
     return new FieldType(true, ArrowType.Binary.INSTANCE, null, metadata);
   }
 
-  public WKBGeometryVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public WKBGeometryVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     this.vector = new VarBinaryVector(name, createFieldType(metadata), allocator);
   }
 
-  public WKBGeometryVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public WKBGeometryVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     this.vector = container.addOrGet(name, createFieldType(metadata), VarBinaryVector.class);
   }
 
diff --git a/pom.xml b/pom.xml
index de4f47d9cd52..23e50c56b72a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
         <!-- direct dependencies -->
         <accumulo.access.version>1.0.0-beta</accumulo.access.version>
-        <arrow.version>17.0.0</arrow.version>
+        <arrow.version>18.1.0</arrow.version>
         <avro.version>1.11.4</avro.version>
         <aws.sdk.version>1.12.735</aws.sdk.version> <!-- latest available as of 2024/06 -->
         <aws.sdk.v2.version>2.25.64</aws.sdk.v2.version> <!-- latest available as of 2024/06 -->