diff --git a/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortConsumer.java b/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortConsumer.java
index 7a944432904..3ac54cbf903 100644
--- a/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortConsumer.java
+++ b/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortConsumer.java
@@ -8,9 +8,9 @@
  * <pre>
  * {@code
  * bitmap.forEach(new ShortConsumer() {
- *   public boolean accept(short value) {
- *     // do something here
- *   }
+ *     public boolean accept(short value) {
+ *         // do something here
+ *     }
  * });
  * }
  * </pre>
diff --git a/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortRangeConsumer.java b/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortRangeConsumer.java
index c876c9868cb..62807ab0916 100644
--- a/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortRangeConsumer.java
+++ b/Container/src/main/java/io/deephaven/engine/rowset/impl/rsp/container/ShortRangeConsumer.java
@@ -10,9 +10,9 @@
  * <pre>
  * {@code
  * bitmap.forEach(new ShortConsumer() {
- *   public boolean accept(short value) {
- *     // do something here
- *   }
+ *     public boolean accept(short value) {
+ *         // do something here
+ *     }
  * });
  * }
  * </pre>
diff --git a/Plot/src/main/java/io/deephaven/plot/datasets/category/AbstractSwappableTableBasedCategoryDataSeries.java b/Plot/src/main/java/io/deephaven/plot/datasets/category/AbstractSwappableTableBasedCategoryDataSeries.java
index c74a44242a9..f111566b446 100644
--- a/Plot/src/main/java/io/deephaven/plot/datasets/category/AbstractSwappableTableBasedCategoryDataSeries.java
+++ b/Plot/src/main/java/io/deephaven/plot/datasets/category/AbstractSwappableTableBasedCategoryDataSeries.java
@@ -45,14 +45,14 @@ public CategoryDataSeries pointShape(final Function<Comparable, String> pointSha
         chart().figure().registerFigureFunction(new FigureImplFunction(figImpl -> {
             ((AbstractSwappableTableBasedCategoryDataSeries) figImpl.getFigure().getCharts()
                     .getChart(chart().row(), chart().column()).axes(axes().id()).series(id()))
-                            .shapesSetSpecific(
-                                    new AssociativeDataSwappableTable<Comparable, Shape, String>(getSwappableTable(),
-                                            getCategoryCol(), colName, Comparable.class, String.class, getPlotInfo()) {
-                                        @Override
-                                        public Shape convert(String v) {
-                                            return NamedShape.getShape(v);
-                                        }
-                                    });
+                    .shapesSetSpecific(
+                            new AssociativeDataSwappableTable<Comparable, Shape, String>(getSwappableTable(),
+                                    getCategoryCol(), colName, Comparable.class, String.class, getPlotInfo()) {
+                                @Override
+                                public Shape convert(String v) {
+                                    return NamedShape.getShape(v);
+                                }
+                            });
             return figImpl;
         }, this));
         return this;
@@ -67,8 +67,8 @@ public <NUMBER extends Number> CategoryDataSeries pointSize(final Function<Compa
         chart().figure().registerFigureFunction(new FigureImplFunction(figImpl -> {
             ((AbstractSwappableTableBasedCategoryDataSeries) figImpl.getFigure().getCharts()
                     .getChart(chart().row(), chart().column()).axes(axes().id()).series(id()))
-                            .sizesSetSpecific(new AssociativeDataSwappableTable<>(getSwappableTable(), getCategoryCol(),
-                                    colName, Comparable.class, Number.class, getPlotInfo()));
+                    .sizesSetSpecific(new AssociativeDataSwappableTable<>(getSwappableTable(), getCategoryCol(),
+                            colName, Comparable.class, Number.class, getPlotInfo()));
             return figImpl;
         }, this));
         return this;
@@ -83,8 +83,8 @@ public <COLOR extends Paint> CategoryDataSeries pointColor(final Function<Compar
         chart().figure().registerFigureFunction(new FigureImplFunction(figImpl -> {
             ((AbstractSwappableTableBasedCategoryDataSeries) figImpl.getFigure().getCharts()
                     .getChart(chart().row(), chart().column()).axes(axes().id()).series(id()))
-                            .colorsSetSpecific(new AssociativeDataSwappableTable<>(getSwappableTable(),
-                                    getCategoryCol(), colName, Comparable.class, Paint.class, getPlotInfo()));
+                    .colorsSetSpecific(new AssociativeDataSwappableTable<>(getSwappableTable(),
+                            getCategoryCol(), colName, Comparable.class, Paint.class, getPlotInfo()));
             return figImpl;
         }, this));
         return this;
@@ -99,14 +99,14 @@ public <COLOR extends Integer> CategoryDataSeries pointColorInteger(final Functi
         chart().figure().registerFigureFunction(new FigureImplFunction(figImpl -> {
             ((AbstractSwappableTableBasedCategoryDataSeries) figImpl.getFigure().getCharts()
                     .getChart(chart().row(), chart().column()).axes(axes().id()).series(id()))
-                            .colorsSetSpecific(
-                                    new AssociativeDataSwappableTable<Comparable, Paint, Integer>(getSwappableTable(),
-                                            getCategoryCol(), colName, Comparable.class, Integer.class, getPlotInfo()) {
-                                        @Override
-                                        public Paint convert(Integer v) {
-                                            return intToColor(chart(), v);
-                                        }
-                                    });
+                    .colorsSetSpecific(
+                            new AssociativeDataSwappableTable<Comparable, Paint, Integer>(getSwappableTable(),
+                                    getCategoryCol(), colName, Comparable.class, Integer.class, getPlotInfo()) {
+                                @Override
+                                public Paint convert(Integer v) {
+                                    return intToColor(chart(), v);
+                                }
+                            });
             return figImpl;
         }, this));
         return this;
@@ -121,14 +121,14 @@ public <LABEL> CategoryDataSeries pointLabel(final Function<Comparable, LABEL> p
         chart().figure().registerFigureFunction(new FigureImplFunction(figImpl -> {
             ((AbstractSwappableTableBasedCategoryDataSeries) figImpl.getFigure().getCharts()
                     .getChart(chart().row(), chart().column()).axes(axes().id()).series(id()))
-                            .labelsSetSpecific(
-                                    new AssociativeDataSwappableTable<Comparable, String, Object>(getSwappableTable(),
-                                            getCategoryCol(), colName, Comparable.class, Object.class, getPlotInfo()) {
-                                        @Override
-                                        public String convert(final Object o) {
-                                            return Objects.toString(o);
-                                        }
-                                    });
+                    .labelsSetSpecific(
+                            new AssociativeDataSwappableTable<Comparable, String, Object>(getSwappableTable(),
+                                    getCategoryCol(), colName, Comparable.class, Object.class, getPlotInfo()) {
+                                @Override
+                                public String convert(final Object o) {
+                                    return Objects.toString(o);
+                                }
+                            });
             return figImpl;
         }, this));
         return this;
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index dbd49e33e94..c640e711d43 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -30,7 +30,7 @@ dependencies {
         because('needed by plugin com.avast.gradle.docker-compose')
     }
 
-    implementation('com.diffplug.spotless:spotless-plugin-gradle:6.12.0') {
+    implementation('com.diffplug.spotless:spotless-plugin-gradle:6.18.0') {
         because('needed by plugin java-coding-conventions')
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
index de1e32acaf0..d1c9a2b7d2c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -2473,7 +2473,7 @@ private void rebase(final int newBase) {
                                 final WritableRowSet newRowSet = getUngroupIndex(
                                         computeSize(getRowSet(), arrayColumns, vectorColumns, nullFill),
                                         RowSetFactory.builderRandom(), newBase, getRowSet())
-                                                .build();
+                                        .build();
                                 final TrackingWritableRowSet rowSet = result.getRowSet().writableCast();
                                 final RowSet added = newRowSet.minus(rowSet);
                                 final RowSet removed = rowSet.minus(newRowSet);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
index 8e13d14a440..f5426ab4ddc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
@@ -249,11 +249,11 @@ private AggregationProcessor(
         final String duplicationErrorMessage = (type.isRollup
                 ? RollupAggregationOutputs.of(aggregations)
                 : AggregationOutputs.of(aggregations))
-                        .collect(Collectors.groupingBy(ColumnName::name, Collectors.counting())).entrySet()
-                        .stream()
-                        .filter(kv -> kv.getValue() > 1)
-                        .map(kv -> kv.getKey() + " used " + kv.getValue() + " times")
-                        .collect(Collectors.joining(", "));
+                .collect(Collectors.groupingBy(ColumnName::name, Collectors.counting())).entrySet()
+                .stream()
+                .filter(kv -> kv.getValue() > 1)
+                .map(kv -> kv.getKey() + " used " + kv.getValue() + " times")
+                .collect(Collectors.joining(", "));
         if (!duplicationErrorMessage.isBlank()) {
             throw new IllegalArgumentException("Duplicate output columns found: " + duplicationErrorMessage);
         }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/BaseNodeOperationsRecorder.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/BaseNodeOperationsRecorder.java
index 724b74a2806..15e54024ba3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/BaseNodeOperationsRecorder.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/BaseNodeOperationsRecorder.java
@@ -78,7 +78,7 @@ static Table applySorts(@Nullable final BaseNodeOperationsRecorder<?> nodeOperat
             return (nodeOperations.getRecordedAbsoluteViews().isEmpty()
                     ? input
                     : input.updateView(nodeOperations.getRecordedAbsoluteViews()))
-                            .sort(nodeOperations.getRecordedSorts());
+                    .sort(nodeOperations.getRecordedSorts());
         }
         // NB: We don't bother to drop the absolute columns; nothing gets to consume the output node tables directly.
         return input;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
index 602d4ff8c71..43030218c24 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
@@ -132,7 +132,7 @@ public static QueryLanguageParser.Result getCompiledFormula(Map<String, ColumnDe
                 context.getQueryLibrary().getPackageImports(),
                 classImports, context.getQueryLibrary().getStaticImports(), possibleVariables,
                 possibleVariableParameterizedTypes)
-                        .getResult();
+                .getResult();
     }
 
     public static class Result {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
index 34f4d8c1b36..8d78afb7ce7 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
@@ -192,7 +192,7 @@ public void setUp() throws Exception {
                         "Ext  = II % 1024  == 0  ? null        : new SimpleExternalizable(II)",
                         "Fix  = Sym == null      ? null        : new BigInteger(Sym, 10)",
                         "Var  = Str == null      ? null        : new BigInteger(Str, 10)"))
-                                .withDefinitionUnsafe(definition);
+                .withDefinitionUnsafe(definition);
         // TODO: Add (Fixed|Variable)WidthObjectCodec columns
 
         final Table inputMissingData = ((QueryTable) TableTools.emptyTable(TABLE_SIZE)
@@ -215,7 +215,8 @@ public void setUp() throws Exception {
                         "Ser  = (SimpleSerializable) null",
                         "Ext  = (SimpleExternalizable) null",
                         "Fix  = (BigInteger) null",
-                        "Var  = (BigInteger) null")).withDefinitionUnsafe(definition);
+                        "Var  = (BigInteger) null"))
+                .withDefinitionUnsafe(definition);
 
         dataDirectory = Files.createTempDirectory(Paths.get(""), "TestChunkedRegionedOperations-").toFile();
         dataDirectory.deleteOnExit();
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestDynamicTableWriter.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestDynamicTableWriter.java
index 407d343a65a..8bd1e2acb44 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestDynamicTableWriter.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestDynamicTableWriter.java
@@ -152,8 +152,8 @@ public void testNulls() throws IOException {
                 longCol("LC", 4),
                 floatCol("FC", 5.5f),
                 doubleCol("DC", QueryConstants.NULL_DOUBLE))
-                        .updateView("StrC=(String)null", "BLC=(Boolean)null", "DTC=(DateTime)null",
-                                "BIC=(java.math.BigInteger)null");
+                .updateView("StrC=(String)null", "BLC=(Boolean)null", "DTC=(DateTime)null",
+                        "BIC=(java.math.BigInteger)null");
         TstUtils.assertTableEquals(expected1, result);
 
         final Row row = writer.getRowWriter();
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
index 1c77d069826..6790214d388 100755
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
@@ -148,7 +148,7 @@ public static int makeTableSchemaPayload(
         final MutableInputTable inputTable = (MutableInputTable) attributes.get(Table.INPUT_TABLE_ATTRIBUTE);
         final List<Field> fields = columnDefinitionsToFields(
                 descriptions, inputTable, tableDefinition.getColumns(), ignored -> new HashMap<>())
-                        .collect(Collectors.toList());
+                .collect(Collectors.toList());
 
         return new Schema(fields, schemaMetadata).getSchema(builder);
     }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
index e6b08b156b5..c07b88951d7 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
@@ -212,7 +212,8 @@ public <METADATA_TYPE> METADATA_TYPE getMetadata(
                             localPageCache.castAttr(), endPosReader,
                             ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK,
                             makeToPage(columnTypes.get(END_POS), ParquetInstructions.EMPTY, END_POS,
-                                    endPosReader, LAST_KEY_COL_DEF)).pageStore).get();
+                                    endPosReader, LAST_KEY_COL_DEF)).pageStore)
+                    .get();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
index b38c17faf75..4539b683c42 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
@@ -262,7 +262,7 @@ public void groupingByStringKey() {
         final Table testTable =
                 ((QueryTable) TableTools.emptyTable(10).select("someInt = i", "someString  = `foo`")
                         .where("i % 2 == 0").groupBy("someString").ungroup("someInt"))
-                                .withDefinitionUnsafe(definition);
+                        .withDefinitionUnsafe(definition);
         final File dest = new File(rootFile, "ParquetTest_groupByString_test.parquet");
         ParquetTools.writeTable(testTable, dest);
         final Table fromDisk = ParquetTools.readTable(dest);
diff --git a/server/src/main/java/io/deephaven/server/session/SessionState.java b/server/src/main/java/io/deephaven/server/session/SessionState.java
index 4827cf2fdb8..b2e254ea20d 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionState.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionState.java
@@ -670,19 +670,19 @@ private synchronized void setWork(final Callable<T> exportMain, final ExportErro
          *
          * <pre>
          * {@code
-         *  <T> T getFromExport(ExportObject<T> export) {
-         *      if (export.tryRetainReference()) {
-         *          try {
-         *              if (export.getState() == ExportNotification.State.EXPORTED) {
-         *                  return export.get();
-         *              }
-         *          } finally {
-         *              export.dropReference();
-         *          }
-         *      }
-         *      return null;
-         *  }
-         *  }
+         * <T> T getFromExport(ExportObject<T> export) {
+         *     if (export.tryRetainReference()) {
+         *         try {
+         *             if (export.getState() == ExportNotification.State.EXPORTED) {
+         *                 return export.get();
+         *             }
+         *         } finally {
+         *             export.dropReference();
+         *         }
+         *     }
+         *     return null;
+         * }
+         * }
          * </pre>
          *
          * @return the result of the computed export