diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index eab4d572c3..dee7d3472b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -29,3 +29,4 @@ updates:
     schedule:
       interval: "weekly"
       day: "sunday"
+    open-pull-requests-limit: 50
diff --git a/.github/workflows/stale-prs.yml b/.github/workflows/stale-prs.yml
new file mode 100644
index 0000000000..fe726c4812
--- /dev/null
+++ b/.github/workflows/stale-prs.yml
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Stale pull requests
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-slim
+    steps:
+      - name: Mark and close stale pull requests
+        uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # Don't touch issues.
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          # PRs stale after 2 months of inactivity and closed 1 month later.
+          days-before-pr-stale: 60
+          days-before-pr-close: 30
+          stale-pr-label: stale
+          stale-pr-message: >
+            This pull request has been automatically marked as stale because it has
+            had no activity for at least 2 months. If you are still working on this
+            change or plan to move it forward, please leave a comment or push a new
+            commit so we know to keep it open. Otherwise, this PR will be closed
+            automatically in about one month. Thank you for your contribution to
+            Apache Parquet!
+          close-pr-message: >
+            Closing this pull request due to at least 3 months of inactivity. If you
+            would like to continue the work, please feel free to reopen this pull
+            request or open a new one. Thank you for your contribution to
+            Apache Parquet!
diff --git a/README.md b/README.md
index ff6f162151..221970ee93 100644
--- a/README.md
+++ b/README.md
@@ -153,29 +153,29 @@ The build runs in [GitHub Actions](https://github.com/apache/parquet-java/action
 
 ## Add Parquet as a dependency in Maven
 
-The current release is version `1.15.1`.
+The current release is version `1.17.0`.
 
 ```xml
   <dependencies>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-common</artifactId>
-      <version>1.15.1</version>
+      <version>1.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-encoding</artifactId>
-      <version>1.15.1</version>
+      <version>1.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-column</artifactId>
-      <version>1.15.1</version>
+      <version>1.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-hadoop</artifactId>
-      <version>1.15.1</version>
+      <version>1.17.0</version>
     </dependency>
   </dependencies>
 ```
diff --git a/dev/ci-before_install.sh b/dev/ci-before_install.sh
index 6b57624a23..2cfaee56a3 100755
--- a/dev/ci-before_install.sh
+++ b/dev/ci-before_install.sh
@@ -23,14 +23,24 @@
 export THRIFT_VERSION=0.22.0
 
 set -e
+set -o pipefail
 date
 sudo apt-get update -qq
 sudo apt-get install -qq --no-install-recommends build-essential pv autoconf automake libtool curl make \
-   g++ unzip libboost-dev libboost-test-dev libboost-program-options-dev \
+   g++ unzip libboost-dev libboost-test-dev libboost-program-options-dev wget \
    libevent-dev automake libtool flex bison pkg-config g++ libssl-dev xmlstarlet
 date
 pwd
-wget -qO- https://archive.apache.org/dist/thrift/$THRIFT_VERSION/thrift-$THRIFT_VERSION.tar.gz | tar zxf -
+for attempt in 1 2 3; do
+  if wget -nv -O- https://archive.apache.org/dist/thrift/$THRIFT_VERSION/thrift-$THRIFT_VERSION.tar.gz | tar zxf -; then
+    break
+  fi
+  if [[ "$attempt" -eq 3 ]]; then
+    echo "Failed to download thrift after ${attempt} attempts." >&2
+    exit 1
+  fi
+  sleep $((attempt * 5))
+done
 cd thrift-${THRIFT_VERSION}
 chmod +x ./configure
 ./configure --disable-libs
diff --git a/parquet-arrow/pom.xml b/parquet-arrow/pom.xml
index de7a3d6789..d9a9e8fb28 100644
--- a/parquet-arrow/pom.xml
+++ b/parquet-arrow/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
   <url>https://parquet.apache.org</url>
 
   <properties>
-    <arrow.version>17.0.0</arrow.version>
+    <arrow.version>19.0.0</arrow.version>
   </properties>
 
   <dependencies>
diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java
index 532fa7c53a..e779b6b8c2 100644
--- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java
+++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java
@@ -179,6 +179,11 @@ public TypeMapping visit(ArrowType.ListView type) {
         return createListTypeMapping();
       }
 
+      @Override
+      public TypeMapping visit(ArrowType.LargeListView type) {
+        return createListTypeMapping();
+      }
+
       private ListTypeMapping createListTypeMapping() {
         if (children.size() != 1) {
           throw new IllegalArgumentException("list fields must have exactly one child: " + field);
@@ -349,6 +354,11 @@ public TypeMapping visit(ArrowType.Duration duration) {
         return primitiveFLBA(12, LogicalTypeAnnotation.IntervalLogicalTypeAnnotation.getInstance());
       }
 
+      @Override
+      public TypeMapping visit(ArrowType.RunEndEncoded runEndEncoded) {
+        throw new UnsupportedOperationException("Unsupported type " + runEndEncoded);
+      }
+
       @Override
       public TypeMapping visit(ArrowType.ExtensionType type) {
         return ArrowTypeVisitor.super.visit(type);
@@ -769,6 +779,11 @@ public TypeMapping visit(ArrowType.ListView type) {
         return createListTypeMapping(type);
       }
 
+      @Override
+      public TypeMapping visit(ArrowType.LargeListView type) {
+        return createListTypeMapping(type);
+      }
+
       private TypeMapping createListTypeMapping(ArrowType.ComplexType type) {
         if (arrowField.getChildren().size() != 1) {
           throw new IllegalArgumentException("Invalid list type: " + type);
@@ -893,6 +908,11 @@ public TypeMapping visit(ArrowType.Duration duration) {
         return primitive();
       }
 
+      @Override
+      public TypeMapping visit(ArrowType.RunEndEncoded runEndEncoded) {
+        throw new UnsupportedOperationException("Unsupported type " + runEndEncoded);
+      }
+
       @Override
       public TypeMapping visit(ArrowType.FixedSizeBinary fixedSizeBinary) {
         return primitive();
diff --git a/parquet-avro/pom.xml b/parquet-avro/pom.xml
index 68815da263..3c84eb66d0 100644
--- a/parquet-avro/pom.xml
+++ b/parquet-avro/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -112,25 +112,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.23.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>${powermock.version}</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java b/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
index fe412e001b..7daff59277 100644
--- a/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
+++ b/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
@@ -77,7 +77,7 @@
  *   <tr>
  *     <td>map</td>
  *     <td>group (with original type MAP) containing one repeated group
- *     field (with original type MAP_KEY_VALUE) of (key, value)</td>
+ *     field of (key, value)</td>
  *   </tr>
  *   <tr>
  *     <td>fixed</td>
@@ -148,7 +148,7 @@
  *   </tr>
  *   <tr>
  *     <td>group (with original type MAP) containing one repeated group
- *     field (with original type MAP_KEY_VALUE) of (key, value)</td>
+ *     field of (key, value)</td>
  *     <td>map</td>
  *   </tr>
  * </table>
diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroRecordConverter.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroRecordConverter.java
index 315320bbdc..7c1db48f46 100644
--- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroRecordConverter.java
+++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroRecordConverter.java
@@ -34,22 +34,25 @@
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;
 import org.apache.avro.specific.SpecificData;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(AvroRecordConverter.class)
 public class TestAvroRecordConverter {
 
+  private MockedStatic<AvroRecordConverter> avroRecordConverterMock;
+
   @Before
   public void setup() {
     // Default to calling real methods unless overridden in specific test
-    PowerMockito.mockStatic(AvroRecordConverter.class, CALLS_REAL_METHODS);
+    avroRecordConverterMock = Mockito.mockStatic(AvroRecordConverter.class, CALLS_REAL_METHODS);
+  }
+
+  @After
+  public void tearDown() {
+    avroRecordConverterMock.close();
   }
 
   @Test
@@ -86,7 +89,7 @@ public void testModelForGenericRecord() {
   // Test logical type support for older Avro versions
   @Test
   public void testModelForSpecificRecordWithLogicalTypesWithDeprecatedAvro1_8() {
-    Mockito.when(AvroRecordConverter.getRuntimeAvroVersion()).thenReturn("1.8.2");
+    avroRecordConverterMock.when(AvroRecordConverter::getRuntimeAvroVersion).thenReturn("1.8.2");
 
     // Test that model is generated correctly when record contains both top-level and nested logical types
     SpecificData model = AvroRecordConverter.getModelForSchema(LogicalTypesTestDeprecated.SCHEMA$);
@@ -108,7 +111,7 @@ public void testModelForSpecificRecordWithLogicalTypesWithDeprecatedAvro1_8() {
 
   @Test
   public void testModelForSpecificRecordWithLogicalTypesWithDeprecatedAvro1_7() {
-    Mockito.when(AvroRecordConverter.getRuntimeAvroVersion()).thenReturn("1.7.7");
+    avroRecordConverterMock.when(AvroRecordConverter::getRuntimeAvroVersion).thenReturn("1.7.7");
 
     // Test that model is generated correctly
     final SpecificData model = AvroRecordConverter.getModelForSchema(LogicalTypesTestDeprecated.SCHEMA$);
diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
index 346fafe7d3..412e8f2957 100644
--- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
+++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
@@ -62,25 +62,27 @@
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
 import org.apache.parquet.schema.Type;
 import org.apache.parquet.schema.Types;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(AvroRecordConverter.class)
 public class TestAvroSchemaConverter {
 
   private static final Configuration NEW_BEHAVIOR = new Configuration(false);
+  private MockedStatic<AvroRecordConverter> avroRecordConverterMock;
 
   @Before
   public void setupMockito() {
-    PowerMockito.mockStatic(AvroRecordConverter.class, CALLS_REAL_METHODS);
+    avroRecordConverterMock = Mockito.mockStatic(AvroRecordConverter.class, CALLS_REAL_METHODS);
+  }
+
+  @After
+  public void tearDown() {
+    avroRecordConverterMock.close();
   }
 
   @BeforeClass
@@ -119,7 +121,7 @@ public static void setupConf() {
       + "    }\n"
       + "  }\n"
       + "  required group mymap (MAP) {\n"
-      + "    repeated group map (MAP_KEY_VALUE) {\n"
+      + "    repeated group map {\n"
       + "      required binary key (UTF8);\n"
       + "      required int32 value;\n"
       + "    }\n"
@@ -212,13 +214,13 @@ public void testAllTypes() throws Exception {
             + "    }\n"
             + "  }\n"
             + "  required group mymap (MAP) {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      required int32 value;\n"
             + "    }\n"
             + "  }\n"
             + "  required group myemptymap (MAP) {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      required int32 value;\n"
             + "    }\n"
@@ -259,13 +261,13 @@ public void testAllTypesOldListBehavior() throws Exception {
             + "    repeated int32 array;\n"
             + "  }\n"
             + "  required group mymap (MAP) {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      required int32 value;\n"
             + "    }\n"
             + "  }\n"
             + "  required group myemptymap (MAP) {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      required int32 value;\n"
             + "    }\n"
@@ -320,7 +322,7 @@ public void testOptionalMapValue() throws Exception {
     testRoundTripConversion(
         schema,
         "message record1 {\n" + "  required group myintmap (MAP) {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      optional int32 value;\n"
             + "    }\n"
@@ -706,7 +708,9 @@ public void testTimestampMillisType() throws Exception {
 
     // Test that conversions for timestamp types only use APIs that are available in the user's Avro version
     for (String avroVersion : ImmutableSet.of("1.7.0", "1.8.0", "1.9.0", "1.10.0", "1.11.0")) {
-      Mockito.when(AvroRecordConverter.getRuntimeAvroVersion()).thenReturn(avroVersion);
+      avroRecordConverterMock
+          .when(AvroRecordConverter::getRuntimeAvroVersion)
+          .thenReturn(avroVersion);
       final Schema converted = new AvroSchemaConverter()
           .convert(Types.buildMessage()
               .addField(Types.primitive(INT64, Type.Repetition.REQUIRED)
@@ -792,7 +796,9 @@ public void testTimestampMicrosType() throws Exception {
 
     // Test that conversions for timestamp types only use APIs that are available in the user's Avro version
     for (String avroVersion : ImmutableSet.of("1.7.0", "1.8.0", "1.9.0", "1.10.0", "1.11.0")) {
-      Mockito.when(AvroRecordConverter.getRuntimeAvroVersion()).thenReturn(avroVersion);
+      avroRecordConverterMock
+          .when(AvroRecordConverter::getRuntimeAvroVersion)
+          .thenReturn(avroVersion);
       final Schema converted = new AvroSchemaConverter()
           .convert(Types.buildMessage()
               .addField(Types.primitive(INT64, Type.Repetition.REQUIRED)
@@ -971,7 +977,7 @@ public void testAvroFixed12AsParquetInt96Type() throws Exception {
             + "      repeated int96 array;\n"
             + "    }\n"
             + "    required group mymap (MAP) {\n"
-            + "      repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "      repeated group key_value {\n"
             + "        required binary key (STRING);\n"
             + "        required int96 value;\n"
             + "      }\n"
diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index b1003c2808..65d6dbf3ed 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/parquet-cli/pom.xml b/parquet-cli/pom.xml
index 86f895d370..3585287638 100644
--- a/parquet-cli/pom.xml
+++ b/parquet-cli/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.33.2</version>
+      <version>4.34.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -178,7 +178,7 @@
     <dependency>
       <groupId>${jackson.groupId}</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${jackson-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>${jackson.datatype.groupId}</groupId>
@@ -239,7 +239,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.3.5</version>
+      <version>1.3.6</version>
       <scope>${deps.scope}</scope>
     </dependency>
   </dependencies>
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
index 6de1c7badc..6694fb8ee5 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
@@ -24,8 +24,11 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -56,6 +59,18 @@ public ColumnSizeCommand(Logger console) {
       required = false)
   List<String> columns;
 
+  @Parameter(
+      names = {"-s", "--sort"},
+      description = "Sort columns by size in descending order",
+      required = false)
+  boolean sortBySize = false;
+
+  @Parameter(
+      names = {"-p", "--percentage"},
+      description = "Print ratio as percentage instead of decimal",
+      required = false)
+  boolean printAsPercentage = false;
+
   @Override
   @SuppressWarnings("unchecked")
   public int run() throws IOException {
@@ -67,6 +82,10 @@ public int run() throws IOException {
 
     // If user defined columns, only print out size for those columns
     if (columns != null && !columns.isEmpty()) {
+      // Collect aggregated column data
+      Map<String, Long> aggregatedSizes = new LinkedHashMap<>();
+      Map<String, Float> aggregatedRatios = new LinkedHashMap<>();
+
       for (String inputColumn : columns) {
         long size = 0;
         float ratio = 0;
@@ -76,18 +95,52 @@ public int run() throws IOException {
             ratio += columnRatio.get(column);
           }
         }
-        console.info(inputColumn + "->" + " Size In Bytes: " + size + " Size In Ratio: " + ratio);
+        aggregatedSizes.put(inputColumn, size);
+        aggregatedRatios.put(inputColumn, ratio);
+      }
+
+      // Sort if requested
+      List<Map.Entry<String, Long>> entries = new ArrayList<>(aggregatedSizes.entrySet());
+      if (sortBySize) {
+        entries.sort(Map.Entry.<String, Long>comparingByValue().reversed());
+      }
+
+      // Print results
+      for (Map.Entry<String, Long> entry : entries) {
+        String column = entry.getKey();
+        long size = entry.getValue();
+        float ratio = aggregatedRatios.get(column);
+        String ratioStr = formatRatio(ratio);
+        console.info(column + "->" + " Size In Bytes: " + size + " Size In Ratio: " + ratioStr);
       }
     } else {
-      for (String column : columnSizes.keySet()) {
-        console.info(column + "->" + " Size In Bytes: " + columnSizes.get(column) + " Size In Ratio: "
-            + columnRatio.get(column));
+      // Sort if requested
+      List<Map.Entry<String, Long>> entries = new ArrayList<>(columnSizes.entrySet());
+      if (sortBySize) {
+        entries.sort(Map.Entry.<String, Long>comparingByValue().reversed());
+      }
+
+      // Print results
+      for (Map.Entry<String, Long> entry : entries) {
+        String column = entry.getKey();
+        long size = entry.getValue();
+        float ratio = columnRatio.get(column);
+        String ratioStr = formatRatio(ratio);
+        console.info(column + "->" + " Size In Bytes: " + size + " Size In Ratio: " + ratioStr);
       }
     }
 
     return 0;
   }
 
+  private String formatRatio(float ratio) {
+    if (printAsPercentage) {
+      return String.format(Locale.US, "%.4f%%", ratio * 100);
+    } else {
+      return String.valueOf(ratio);
+    }
+  }
+
   @Override
   public List<String> getExamples() {
     return Lists.newArrayList(
@@ -96,7 +149,16 @@ public List<String> getExamples() {
         "sample.parquet -c col_1",
         "sample.parquet --column col_2",
         "sample.parquet --columns col_1 col_2",
-        "sample.parquet --columns col_1 col_2.sub_col_a");
+        "sample.parquet --columns col_1 col_2.sub_col_a",
+        "# Sort columns by size in descending order",
+        "sample.parquet --sort",
+        "sample.parquet -s",
+        "# Print ratio as percentage",
+        "sample.parquet --percentage",
+        "sample.parquet -p",
+        "# Combine sorting and percentage formatting",
+        "sample.parquet --sort --percentage",
+        "sample.parquet -s -p -c col_1 col_2");
   }
 
   // Make it public to allow some automation tools to call it
diff --git a/parquet-column/pom.xml b/parquet-column/pom.xml
index 8bd11dcc26..f9d976980e 100644
--- a/parquet-column/pom.xml
+++ b/parquet-column/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -90,7 +90,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
@@ -100,6 +100,12 @@
       <version>${commons-lang3.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/statistics/BinaryStatistics.java b/parquet-column/src/main/java/org/apache/parquet/column/statistics/BinaryStatistics.java
index 87d39bf16e..9488a38494 100644
--- a/parquet-column/src/main/java/org/apache/parquet/column/statistics/BinaryStatistics.java
+++ b/parquet-column/src/main/java/org/apache/parquet/column/statistics/BinaryStatistics.java
@@ -105,7 +105,7 @@ String stringify(Binary value) {
 
   @Override
   public boolean isSmallerThan(long size) {
-    return !hasNonNullValue() || ((min.length() + max.length()) < size);
+    return !hasNonNullValue() || (((long) min.length() + max.length()) < size);
   }
 
   public boolean isSmallerThanWithTruncation(long size, int truncationLength) {
@@ -113,8 +113,8 @@ public boolean isSmallerThanWithTruncation(long size, int truncationLength) {
       return true;
     }
 
-    int minTruncateLength = Math.min(min.length(), truncationLength);
-    int maxTruncateLength = Math.min(max.length(), truncationLength);
+    long minTruncateLength = Math.min(min.length(), truncationLength);
+    long maxTruncateLength = Math.min(max.length(), truncationLength);
 
     return minTruncateLength + maxTruncateLength < size;
   }
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/statistics/Statistics.java b/parquet-column/src/main/java/org/apache/parquet/column/statistics/Statistics.java
index 206ddadadc..bee9877738 100644
--- a/parquet-column/src/main/java/org/apache/parquet/column/statistics/Statistics.java
+++ b/parquet-column/src/main/java/org/apache/parquet/column/statistics/Statistics.java
@@ -142,10 +142,6 @@ public Statistics<?> build() {
 
   // Builder for FLOAT16 type to handle special cases of min/max values like NaN, -0.0, and 0.0
   private static class Float16Builder extends Builder {
-    private static final Binary POSITIVE_ZERO_LITTLE_ENDIAN = Binary.fromConstantByteArray(new byte[] {0x00, 0x00});
-    private static final Binary NEGATIVE_ZERO_LITTLE_ENDIAN =
-        Binary.fromConstantByteArray(new byte[] {0x00, (byte) 0x80});
-
     public Float16Builder(PrimitiveType type) {
       super(type);
       assert type.getPrimitiveTypeName() == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY;
@@ -162,15 +158,17 @@ public Statistics<?> build() {
         short max = bMax.get2BytesLittleEndian();
         // Drop min/max values in case of NaN as the sorting order of values is undefined for this case
         if (Float16.isNaN(min) || Float16.isNaN(max)) {
-          stats.setMinMax(POSITIVE_ZERO_LITTLE_ENDIAN, NEGATIVE_ZERO_LITTLE_ENDIAN);
+          stats.setMinMax(Float16.POSITIVE_ZERO_LITTLE_ENDIAN, Float16.POSITIVE_ZERO_LITTLE_ENDIAN);
           ((Statistics<?>) stats).hasNonNullValue = false;
         } else {
           // Updating min to -0.0 and max to +0.0 to ensure that no 0.0 values would be skipped
           if (min == (short) 0x0000) {
-            stats.setMinMax(NEGATIVE_ZERO_LITTLE_ENDIAN, bMax);
+            bMin = Float16.NEGATIVE_ZERO_LITTLE_ENDIAN;
+            stats.setMinMax(bMin, bMax);
           }
           if (max == (short) 0x8000) {
-            stats.setMinMax(bMin, POSITIVE_ZERO_LITTLE_ENDIAN);
+            bMax = Float16.POSITIVE_ZERO_LITTLE_ENDIAN;
+            stats.setMinMax(bMin, bMax);
           }
         }
       }
diff --git a/parquet-column/src/main/java/org/apache/parquet/example/data/simple/SimpleGroup.java b/parquet-column/src/main/java/org/apache/parquet/example/data/simple/SimpleGroup.java
index 7632081390..5f4873220e 100644
--- a/parquet-column/src/main/java/org/apache/parquet/example/data/simple/SimpleGroup.java
+++ b/parquet-column/src/main/java/org/apache/parquet/example/data/simple/SimpleGroup.java
@@ -230,7 +230,7 @@ public void add(int fieldIndex, Binary value) {
         break;
       default:
         throw new UnsupportedOperationException(
-            getType().asPrimitiveType().getName() + " not supported for Binary");
+            getType().getType(fieldIndex).asPrimitiveType().getName() + " not supported for Binary");
     }
   }
 
diff --git a/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/IncrementallyUpdatedFilterPredicate.java b/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/IncrementallyUpdatedFilterPredicate.java
index c2aab2b6bf..7aea56b2a0 100644
--- a/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/IncrementallyUpdatedFilterPredicate.java
+++ b/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/IncrementallyUpdatedFilterPredicate.java
@@ -18,7 +18,7 @@
  */
 package org.apache.parquet.filter2.recordlevel;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import org.apache.parquet.io.api.Binary;
 
@@ -153,7 +153,7 @@ abstract static class DelegatingValueInspector extends ValueInspector {
     private final Iterable<ValueInspector> delegates;
 
     DelegatingValueInspector(ValueInspector... delegates) {
-      this.delegates = Arrays.asList(delegates);
+      this.delegates = List.of(delegates);
     }
 
     /**
diff --git a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
index 1c546b5160..24de97d01e 100644
--- a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
+++ b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
@@ -23,6 +23,8 @@
 import java.util.List;
 import org.apache.parquet.filter2.predicate.Statistics;
 import org.apache.parquet.io.api.Binary;
+import org.apache.parquet.schema.Float16;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
 import org.apache.parquet.schema.PrimitiveComparator;
 import org.apache.parquet.schema.PrimitiveType;
 
@@ -82,6 +84,8 @@ int compareValueToMax(int arrayIndex) {
   private final List<Binary> maxValues = new ArrayList<>();
   private final BinaryTruncator truncator;
   private final int truncateLength;
+  private final boolean isFloat16;
+  private boolean invalid;
 
   private static Binary convert(ByteBuffer buffer) {
     return Binary.fromReusedByteBuffer(buffer);
@@ -94,6 +98,7 @@ private static ByteBuffer convert(Binary value) {
   BinaryColumnIndexBuilder(PrimitiveType type, int truncateLength) {
     truncator = BinaryTruncator.getTruncator(type);
     this.truncateLength = truncateLength;
+    this.isFloat16 = type.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.Float16LogicalTypeAnnotation;
   }
 
   @Override
@@ -104,12 +109,43 @@ void addMinMaxFromBytes(ByteBuffer min, ByteBuffer max) {
 
   @Override
   void addMinMax(Object min, Object max) {
-    minValues.add(min == null ? null : truncator.truncateMin((Binary) min, truncateLength));
-    maxValues.add(max == null ? null : truncator.truncateMax((Binary) max, truncateLength));
+    Binary bMin = (Binary) min;
+    Binary bMax = (Binary) max;
+
+    if (isFloat16 && bMin != null && bMax != null) {
+      if (bMin.length() != LogicalTypeAnnotation.Float16LogicalTypeAnnotation.BYTES
+          || bMax.length() != LogicalTypeAnnotation.Float16LogicalTypeAnnotation.BYTES) {
+        // Should not happen for Float16
+        invalid = true;
+      } else {
+        short sMin = bMin.get2BytesLittleEndian();
+        short sMax = bMax.get2BytesLittleEndian();
+
+        if (Float16.isNaN(sMin) || Float16.isNaN(sMax)) {
+          invalid = true;
+        }
+
+        // Sorting order is undefined for -0.0 so let min = -0.0 and max = +0.0 to
+        // ensure that no 0.0 values are skipped
+        // +0.0 is 0x0000, -0.0 is 0x8000 (little endian: 00 00, 00 80)
+        if (sMin == (short) 0x0000) {
+          bMin = Float16.NEGATIVE_ZERO_LITTLE_ENDIAN;
+        }
+        if (sMax == (short) 0x8000) {
+          bMax = Float16.POSITIVE_ZERO_LITTLE_ENDIAN;
+        }
+      }
+    }
+
+    minValues.add(bMin == null ? null : truncator.truncateMin(bMin, truncateLength));
+    maxValues.add(bMax == null ? null : truncator.truncateMax(bMax, truncateLength));
   }
 
   @Override
   ColumnIndexBase<Binary> createColumnIndex(PrimitiveType type) {
+    if (invalid) {
+      return null;
+    }
     BinaryColumnIndex columnIndex = new BinaryColumnIndex(type);
     columnIndex.minValues = minValues.toArray(new Binary[0]);
     columnIndex.maxValues = maxValues.toArray(new Binary[0]);
diff --git a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
index ac2f74be6e..46c4b714a2 100644
--- a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
+++ b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
@@ -488,6 +488,6 @@ protected Converter getRecordConsumer() {
 
   protected Iterable<ColumnReader> getColumnReaders() {
     // Converting the array to an iterable ensures that the array cannot be altered
-    return Arrays.asList(columnReaders);
+    return List.of(columnReaders);
   }
 }
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java b/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
index e4ede9f15a..2b812ff601 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
@@ -75,11 +75,7 @@ public static GroupType mapType(
           repetition,
           alias,
           LogicalTypeAnnotation.mapType(),
-          new GroupType(
-              Repetition.REPEATED,
-              mapAlias,
-              LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
-              keyType));
+          new GroupType(Repetition.REPEATED, mapAlias, keyType));
     } else {
       if (!valueType.getName().equals("value")) {
         throw new RuntimeException(valueType.getName() + " should be value");
@@ -88,12 +84,7 @@ public static GroupType mapType(
           repetition,
           alias,
           LogicalTypeAnnotation.mapType(),
-          new GroupType(
-              Repetition.REPEATED,
-              mapAlias,
-              LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
-              keyType,
-              valueType));
+          new GroupType(Repetition.REPEATED, mapAlias, keyType, valueType));
     }
   }
 
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/Float16.java b/parquet-column/src/main/java/org/apache/parquet/schema/Float16.java
index 6fe0e3d4c3..fc146a8890 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/Float16.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/Float16.java
@@ -46,6 +46,13 @@
  * Ref: https://android.googlesource.com/platform/libcore/+/master/luni/src/main/java/libcore/util/FP16.java
  */
 public class Float16 {
+  // Positive zero of type half-precision float.
+  public static final Binary POSITIVE_ZERO_LITTLE_ENDIAN =
+      Binary.fromConstantByteArray(new byte[] {0x00, 0x00}, 0, 2);
+  // Negative zero of type half-precision float.
+  public static final Binary NEGATIVE_ZERO_LITTLE_ENDIAN =
+      Binary.fromConstantByteArray(new byte[] {0x00, (byte) 0x80}, 0, 2);
+
   // Positive infinity of type half-precision float.
   private static final short POSITIVE_INFINITY = (short) 0x7c00;
   // A Not-a-Number representation of a half-precision float.
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
index be98e071f6..98bc5c0237 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
@@ -18,7 +18,6 @@
  */
 package org.apache.parquet.schema;
 
-import static java.util.Arrays.asList;
 import static java.util.Optional.empty;
 import static org.apache.parquet.schema.ColumnOrder.ColumnOrderName.TYPE_DEFINED_ORDER;
 import static org.apache.parquet.schema.ColumnOrder.ColumnOrderName.UNDEFINED;
@@ -33,8 +32,6 @@
 import static org.apache.parquet.schema.PrimitiveStringifier.TIME_STRINGIFIER;
 import static org.apache.parquet.schema.PrimitiveStringifier.TIME_UTC_STRINGIFIER;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -822,8 +819,7 @@ PrimitiveStringifier valueStringifier(PrimitiveType primitiveType) {
   }
 
   public static class IntLogicalTypeAnnotation extends LogicalTypeAnnotation {
-    private static final Set<Integer> VALID_BIT_WIDTH =
-        Collections.unmodifiableSet(new HashSet<>(asList(8, 16, 32, 64)));
+    private static final Set<Integer> VALID_BIT_WIDTH = Set.of(8, 16, 32, 64);
 
     private final int bitWidth;
     private final boolean isSigned;
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
index 7298a356b4..2f12991ab0 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
@@ -110,7 +110,7 @@
  *
  * <pre>
  *   // required group zipMap (MAP) {
- *   //   repeated group map (MAP_KEY_VALUE) {
+ *   //   repeated group map {
  *   //     required float key
  *   //     optional int32 value
  *   //   }
@@ -122,7 +122,7 @@
  *
  *
  *   // required group zipMap (MAP) {
- *   //   repeated group map (MAP_KEY_VALUE) {
+ *   //   repeated group map {
  *   //     required group key {
  *   //       optional int64 first;
  *   //       required group second {
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestSizeStatistics.java b/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestSizeStatistics.java
index 813298c2b6..786d2be2c3 100644
--- a/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestSizeStatistics.java
+++ b/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestSizeStatistics.java
@@ -18,8 +18,8 @@
  */
 package org.apache.parquet.column.statistics;
 
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import org.apache.parquet.io.api.Binary;
 import org.apache.parquet.schema.LogicalTypeAnnotation;
@@ -47,8 +47,8 @@ public void testAddBinaryType() {
     builder.add(1, 1);
     SizeStatistics statistics = builder.build();
     Assert.assertEquals(Optional.of(3L), statistics.getUnencodedByteArrayDataBytes());
-    Assert.assertEquals(Arrays.asList(3L, 3L, 1L), statistics.getRepetitionLevelHistogram());
-    Assert.assertEquals(Arrays.asList(2L, 2L, 3L), statistics.getDefinitionLevelHistogram());
+    Assert.assertEquals(List.of(3L, 3L, 1L), statistics.getRepetitionLevelHistogram());
+    Assert.assertEquals(List.of(2L, 2L, 3L), statistics.getDefinitionLevelHistogram());
   }
 
   @Test
@@ -67,7 +67,7 @@ public void testAddNonBinaryType() {
     builder.add(1, 0);
     SizeStatistics statistics = builder.build();
     Assert.assertEquals(Optional.empty(), statistics.getUnencodedByteArrayDataBytes());
-    Assert.assertEquals(Arrays.asList(2L, 4L), statistics.getRepetitionLevelHistogram());
+    Assert.assertEquals(List.of(2L, 4L), statistics.getRepetitionLevelHistogram());
     Assert.assertEquals(Collections.emptyList(), statistics.getDefinitionLevelHistogram());
   }
 
@@ -89,8 +89,8 @@ public void testMergeStatistics() {
     SizeStatistics statistics2 = builder2.build();
     statistics1.mergeStatistics(statistics2);
     Assert.assertEquals(Optional.of(5L), statistics1.getUnencodedByteArrayDataBytes());
-    Assert.assertEquals(Arrays.asList(3L, 1L, 1L), statistics1.getRepetitionLevelHistogram());
-    Assert.assertEquals(Arrays.asList(1L, 3L, 1L), statistics1.getDefinitionLevelHistogram());
+    Assert.assertEquals(List.of(3L, 1L, 1L), statistics1.getRepetitionLevelHistogram());
+    Assert.assertEquals(List.of(1L, 3L, 1L), statistics1.getDefinitionLevelHistogram());
   }
 
   @Test
@@ -122,8 +122,8 @@ public void testCopyStatistics() {
     SizeStatistics statistics = builder.build();
     SizeStatistics copy = statistics.copy();
     Assert.assertEquals(Optional.of(3L), copy.getUnencodedByteArrayDataBytes());
-    Assert.assertEquals(Arrays.asList(1L, 1L, 1L), copy.getRepetitionLevelHistogram());
-    Assert.assertEquals(Arrays.asList(1L, 1L, 1L), copy.getDefinitionLevelHistogram());
+    Assert.assertEquals(List.of(1L, 1L, 1L), copy.getRepetitionLevelHistogram());
+    Assert.assertEquals(List.of(1L, 1L, 1L), copy.getDefinitionLevelHistogram());
   }
 
   @Test
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestStatistics.java b/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestStatistics.java
index dec244f629..92eaa7a302 100644
--- a/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestStatistics.java
+++ b/parquet-column/src/test/java/org/apache/parquet/column/statistics/TestStatistics.java
@@ -927,4 +927,15 @@ public void testNoopStatistics() {
     assertThrows(UnsupportedOperationException.class, stats::minAsString);
     assertThrows(UnsupportedOperationException.class, () -> stats.isSmallerThan(0));
   }
+
+  @Test
+  public void testBinaryIsSmallerThanNoOverflowForLargeValues() {
+    BinaryStatistics stats = new BinaryStatistics();
+    // Create a Binary whose length() reports 2^30 without allocating 1 GB
+    Binary fakeLarge = Binary.fromConstantByteArray(new byte[0], 0, 1 << 30);
+    stats.updateStats(fakeLarge);
+
+    // min.length() + max.length() = 2^31, must not overflow int to negative
+    assertFalse(stats.isSmallerThan(4096));
+  }
 }
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/values/bytestreamsplit/ByteStreamSplitValuesReaderTest.java b/parquet-column/src/test/java/org/apache/parquet/column/values/bytestreamsplit/ByteStreamSplitValuesReaderTest.java
index 348d245595..dc37ed67ca 100644
--- a/parquet-column/src/test/java/org/apache/parquet/column/values/bytestreamsplit/ByteStreamSplitValuesReaderTest.java
+++ b/parquet-column/src/test/java/org/apache/parquet/column/values/bytestreamsplit/ByteStreamSplitValuesReaderTest.java
@@ -37,7 +37,7 @@ private static <Reader extends ValuesReader> Reader makeReader(byte[] input, int
       throws Exception {
     ByteBuffer buffer = ByteBuffer.wrap(input);
     ByteBufferInputStream stream = ByteBufferInputStream.wrap(buffer);
-    Reader reader = cls.newInstance();
+    Reader reader = cls.getDeclaredConstructor().newInstance();
     reader.initFromPage(length, stream);
     return reader;
   }
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/values/rle/TestRunLengthBitPackingHybridEncoder.java b/parquet-column/src/test/java/org/apache/parquet/column/values/rle/TestRunLengthBitPackingHybridEncoder.java
index 7ec5a9568c..93a6c8deb4 100644
--- a/parquet-column/src/test/java/org/apache/parquet/column/values/rle/TestRunLengthBitPackingHybridEncoder.java
+++ b/parquet-column/src/test/java/org/apache/parquet/column/values/rle/TestRunLengthBitPackingHybridEncoder.java
@@ -22,7 +22,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.apache.parquet.bytes.BytesUtils;
 import org.apache.parquet.bytes.DirectByteBufferAllocator;
@@ -187,7 +186,7 @@ public void testTransitionFromBitPackingToRle() throws Exception {
     assertEquals(3, BytesUtils.readUnsignedVarInt(is));
 
     List<Integer> values = unpack(3, 8, is);
-    assertEquals(Arrays.asList(0, 1, 0, 1, 0, 2, 2, 2), values);
+    assertEquals(List.of(0, 1, 0, 1, 0, 2, 2, 2), values);
 
     // header = 100 << 1 = 200
     assertEquals(200, BytesUtils.readUnsignedVarInt(is));
@@ -212,7 +211,7 @@ public void testPaddingZerosOnUnfinishedBitPackedRuns() throws Exception {
 
     List<Integer> values = unpack(5, 16, is);
 
-    assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0), values);
+    assertEquals(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0), values);
 
     assertEquals(-1, is.read());
   }
diff --git a/parquet-column/src/test/java/org/apache/parquet/filter2/recordlevel/TestValueInspector.java b/parquet-column/src/test/java/org/apache/parquet/filter2/recordlevel/TestValueInspector.java
index a164e96665..e0c55c2764 100644
--- a/parquet-column/src/test/java/org/apache/parquet/filter2/recordlevel/TestValueInspector.java
+++ b/parquet-column/src/test/java/org/apache/parquet/filter2/recordlevel/TestValueInspector.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.Arrays;
 import java.util.List;
 import org.apache.parquet.filter2.recordlevel.IncrementallyUpdatedFilterPredicate.ValueInspector;
 import org.junit.Test;
@@ -83,7 +82,7 @@ public void testLifeCycle() {
 
   @Test
   public void testReusable() {
-    List<Integer> values = Arrays.asList(2, 4, 7, 3, 8, 8, 11, 200);
+    List<Integer> values = List.of(2, 4, 7, 3, 8, 8, 11, 200);
     ValueInspector v = intIsEven();
 
     for (Integer x : values) {
diff --git a/parquet-column/src/test/java/org/apache/parquet/internal/column/columnindex/TestColumnIndexBuilder.java b/parquet-column/src/test/java/org/apache/parquet/internal/column/columnindex/TestColumnIndexBuilder.java
index 58a899eefc..6274f36263 100644
--- a/parquet-column/src/test/java/org/apache/parquet/internal/column/columnindex/TestColumnIndexBuilder.java
+++ b/parquet-column/src/test/java/org/apache/parquet/internal/column/columnindex/TestColumnIndexBuilder.java
@@ -18,7 +18,6 @@
  */
 package org.apache.parquet.internal.column.columnindex;
 
-import static java.util.Arrays.asList;
 import static org.apache.parquet.filter2.predicate.FilterApi.and;
 import static org.apache.parquet.filter2.predicate.FilterApi.binaryColumn;
 import static org.apache.parquet.filter2.predicate.FilterApi.booleanColumn;
@@ -688,8 +687,8 @@ public void testStaticBuildBinary() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(BINARY).as(UTF8).named("test_binary_utf8"),
         BoundaryOrder.ASCENDING,
-        asList(true, true, false, false, true, false, true, false),
-        asList(1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l),
+        List.of(true, true, false, false, true, false, true, false),
+        List.of(1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l),
         toBBList(
             null,
             null,
@@ -738,7 +737,7 @@ public void testFilterWithoutNullCounts() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(BINARY).as(UTF8).named("test_binary_utf8"),
         BoundaryOrder.ASCENDING,
-        asList(true, true, false, false, true, false, true, false),
+        List.of(true, true, false, false, true, false, true, false),
         null,
         toBBList(
             null,
@@ -904,8 +903,8 @@ public void testStaticBuildBoolean() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(BOOLEAN).named("test_boolean"),
         BoundaryOrder.DESCENDING,
-        asList(false, true, false, true, false, true),
-        asList(9l, 8l, 7l, 6l, 5l, 0l),
+        List.of(false, true, false, true, false, true),
+        List.of(9l, 8l, 7l, 6l, 5l, 0l),
         toBBList(false, null, false, null, true, null),
         toBBList(true, null, false, null, true, null));
     assertEquals(BoundaryOrder.DESCENDING, columnIndex.getBoundaryOrder());
@@ -1058,8 +1057,8 @@ public void testStaticBuildDouble() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(DOUBLE).named("test_double"),
         BoundaryOrder.UNORDERED,
-        asList(false, false, false, false, false, false),
-        asList(0l, 1l, 2l, 3l, 4l, 5l),
+        List.of(false, false, false, false, false, false),
+        List.of(0l, 1l, 2l, 3l, 4l, 5l),
         toBBList(-1.0, -2.0, -3.0, -4.0, -5.0, -6.0),
         toBBList(1.0, 2.0, 3.0, 4.0, 5.0, 6.0));
     assertEquals(BoundaryOrder.UNORDERED, columnIndex.getBoundaryOrder());
@@ -1211,8 +1210,8 @@ public void testStaticBuildFloat() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(FLOAT).named("test_float"),
         BoundaryOrder.ASCENDING,
-        asList(true, true, true, false, false, false),
-        asList(9l, 8l, 7l, 6l, 0l, 0l),
+        List.of(true, true, true, false, false, false),
+        List.of(9l, 8l, 7l, 6l, 0l, 0l),
         toBBList(null, null, null, -3.0f, -2.0f, 0.1f),
         toBBList(null, null, null, -2.0f, 0.0f, 6.0f));
     assertEquals(BoundaryOrder.ASCENDING, columnIndex.getBoundaryOrder());
@@ -1345,8 +1344,8 @@ public void testStaticBuildInt32() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(INT32).named("test_int32"),
         BoundaryOrder.DESCENDING,
-        asList(false, false, false, true, true, true),
-        asList(0l, 10l, 0l, 3l, 5l, 7l),
+        List.of(false, false, false, true, true, true),
+        List.of(0l, 10l, 0l, 3l, 5l, 7l),
         toBBList(10, 8, 6, null, null, null),
         toBBList(9, 7, 5, null, null, null));
     assertEquals(BoundaryOrder.DESCENDING, columnIndex.getBoundaryOrder());
@@ -1597,8 +1596,8 @@ public void testStaticBuildInt64() {
     ColumnIndex columnIndex = ColumnIndexBuilder.build(
         Types.required(INT64).named("test_int64"),
         BoundaryOrder.UNORDERED,
-        asList(true, false, true, false, true, false),
-        asList(1l, 2l, 3l, 4l, 5l, 6l),
+        List.of(true, false, true, false, true, false),
+        List.of(1l, 2l, 3l, 4l, 5l, 6l),
         toBBList(null, 2l, null, 4l, null, 9l),
         toBBList(null, 3l, null, 15l, null, 10l));
     assertEquals(BoundaryOrder.UNORDERED, columnIndex.getBoundaryOrder());
diff --git a/parquet-column/src/test/java/org/apache/parquet/io/ExpectationValidatingConverter.java b/parquet-column/src/test/java/org/apache/parquet/io/ExpectationValidatingConverter.java
index cf8e2edc09..99073c98ed 100644
--- a/parquet-column/src/test/java/org/apache/parquet/io/ExpectationValidatingConverter.java
+++ b/parquet-column/src/test/java/org/apache/parquet/io/ExpectationValidatingConverter.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayDeque;
-import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
 import org.apache.parquet.io.api.Binary;
@@ -48,7 +47,7 @@ public void validate(String got) {
   }
 
   public ExpectationValidatingConverter(String[] expectations, MessageType schema) {
-    this(new ArrayDeque<>(Arrays.asList(expectations)), schema);
+    this(new ArrayDeque<>(List.of(expectations)), schema);
   }
 
   public ExpectationValidatingConverter(Deque<String> expectations, MessageType schema) {
diff --git a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java
index ed1e232a8d..fa4fab710c 100644
--- a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java
+++ b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java
@@ -144,7 +144,7 @@ public class TestColumnIO {
   @Parameterized.Parameters
   public static Collection<Object[]> data() throws IOException {
     Object[][] data = {{true}, {false}};
-    return Arrays.asList(data);
+    return List.of(data);
   }
 
   private boolean useDictionary;
@@ -386,7 +386,7 @@ public void testOneOfEach() {
         .append("g", new NanoTime(1234, System.currentTimeMillis() * 1000))
         .append("h", Binary.fromString("abc"));
 
-    testSchema(oneOfEachSchema, Arrays.asList(g1));
+    testSchema(oneOfEachSchema, List.of(g1));
   }
 
   @Test
@@ -398,7 +398,7 @@ public void testRequiredOfRequired() {
     Group g1 = gf.newGroup();
     g1.addGroup("foo").append("bar", 2l);
 
-    testSchema(reqreqSchema, Arrays.asList(g1));
+    testSchema(reqreqSchema, List.of(g1));
   }
 
   @Test
diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestPrimitiveStringifier.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestPrimitiveStringifier.java
index 3101ecea0d..b165b200d2 100644
--- a/parquet-column/src/test/java/org/apache/parquet/schema/TestPrimitiveStringifier.java
+++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestPrimitiveStringifier.java
@@ -19,7 +19,6 @@
 package org.apache.parquet.schema;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -48,6 +47,7 @@
 import java.nio.ByteBuffer;
 import java.util.Calendar;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
@@ -175,7 +175,7 @@ public void testDateStringifier() {
   @Test
   public void testTimestampMillisStringifier() {
     for (PrimitiveStringifier stringifier :
-        asList(TIMESTAMP_MILLIS_STRINGIFIER, TIMESTAMP_MILLIS_UTC_STRINGIFIER)) {
+        List.of(TIMESTAMP_MILLIS_STRINGIFIER, TIMESTAMP_MILLIS_UTC_STRINGIFIER)) {
       String timezoneAmendment = (stringifier == TIMESTAMP_MILLIS_STRINGIFIER ? "" : "+0000");
 
       assertEquals(withZoneString("1970-01-01T00:00:00.000", timezoneAmendment), stringifier.stringify(0l));
@@ -202,7 +202,7 @@ public void testTimestampMillisStringifier() {
   @Test
   public void testTimestampMicrosStringifier() {
     for (PrimitiveStringifier stringifier :
-        asList(TIMESTAMP_MICROS_STRINGIFIER, TIMESTAMP_MICROS_UTC_STRINGIFIER)) {
+        List.of(TIMESTAMP_MICROS_STRINGIFIER, TIMESTAMP_MICROS_UTC_STRINGIFIER)) {
       String timezoneAmendment = (stringifier == TIMESTAMP_MICROS_STRINGIFIER ? "" : "+0000");
 
       assertEquals(withZoneString("1970-01-01T00:00:00.000000", timezoneAmendment), stringifier.stringify(0l));
@@ -228,7 +228,7 @@ public void testTimestampMicrosStringifier() {
 
   @Test
   public void testTimestampNanosStringifier() {
-    for (PrimitiveStringifier stringifier : asList(TIMESTAMP_NANOS_STRINGIFIER, TIMESTAMP_NANOS_UTC_STRINGIFIER)) {
+    for (PrimitiveStringifier stringifier : List.of(TIMESTAMP_NANOS_STRINGIFIER, TIMESTAMP_NANOS_UTC_STRINGIFIER)) {
       String timezoneAmendment = (stringifier == TIMESTAMP_NANOS_STRINGIFIER ? "" : "+0000");
 
       assertEquals(withZoneString("1970-01-01T00:00:00.000000000", timezoneAmendment), stringifier.stringify(0l));
@@ -254,7 +254,7 @@ public void testTimestampNanosStringifier() {
 
   @Test
   public void testTimeStringifier() {
-    for (PrimitiveStringifier stringifier : asList(TIME_STRINGIFIER, TIME_UTC_STRINGIFIER)) {
+    for (PrimitiveStringifier stringifier : List.of(TIME_STRINGIFIER, TIME_UTC_STRINGIFIER)) {
       String timezoneAmendment = (stringifier == TIME_STRINGIFIER ? "" : "+0000");
 
       assertEquals(withZoneString("00:00:00.000", timezoneAmendment), stringifier.stringify(0));
@@ -290,7 +290,7 @@ public void testTimeStringifier() {
 
   @Test
   public void testTimeNanoStringifier() {
-    for (PrimitiveStringifier stringifier : asList(TIME_NANOS_STRINGIFIER, TIME_NANOS_UTC_STRINGIFIER)) {
+    for (PrimitiveStringifier stringifier : List.of(TIME_NANOS_STRINGIFIER, TIME_NANOS_UTC_STRINGIFIER)) {
       String timezoneAmendment = (stringifier == TIME_NANOS_STRINGIFIER ? "" : "+0000");
 
       assertEquals(withZoneString("00:00:00.000000000", timezoneAmendment), stringifier.stringify(0l));
@@ -434,7 +434,7 @@ private Binary toBinary(int... bytes) {
   }
 
   private void checkThrowingUnsupportedException(PrimitiveStringifier stringifier, Class<?>... excludes) {
-    Set<Class<?>> set = new HashSet<>(asList(excludes));
+    Set<Class<?>> set = new HashSet<>(List.of(excludes));
     if (!set.contains(Integer.TYPE)) {
       try {
         stringifier.stringify(0);
diff --git a/parquet-common/pom.xml b/parquet-common/pom.xml
index 08a3b1188b..037e65799b 100644
--- a/parquet-common/pom.xml
+++ b/parquet-common/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -64,7 +64,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/parquet-common/src/test/java/org/apache/parquet/SemanticVersionTest.java b/parquet-common/src/test/java/org/apache/parquet/SemanticVersionTest.java
index 602ea374cb..e29352d402 100644
--- a/parquet-common/src/test/java/org/apache/parquet/SemanticVersionTest.java
+++ b/parquet-common/src/test/java/org/apache/parquet/SemanticVersionTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
 
@@ -51,7 +50,7 @@ public void testCompare() {
 
   @Test
   public void testSemverPrereleaseExamples() throws Exception {
-    List<String> examples = Arrays.asList(
+    List<String> examples = List.of(
         "1.0.0-alpha",
         "1.0.0-alpha.1",
         "1.0.0-alpha.beta",
diff --git a/parquet-common/src/test/java/org/apache/parquet/bytes/TestBytesInput.java b/parquet-common/src/test/java/org/apache/parquet/bytes/TestBytesInput.java
index 6ffe3c650a..38d4b79219 100644
--- a/parquet-common/src/test/java/org/apache/parquet/bytes/TestBytesInput.java
+++ b/parquet-common/src/test/java/org/apache/parquet/bytes/TestBytesInput.java
@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -401,6 +401,6 @@ private void validateToByteBufferIsInternal(Supplier<BytesInput> factory) {
     Consumer<ByteBuffer> callbackMock = Mockito.mock(Consumer.class);
     factory.get().toByteBuffer(allocatorMock, callbackMock);
     verify(allocatorMock, never()).allocate(anyInt());
-    verify(callbackMock, never()).accept(anyObject());
+    verify(callbackMock, never()).accept(any());
   }
 }
diff --git a/parquet-common/src/test/java/org/apache/parquet/bytes/TestConcatenatingByteBufferCollector.java b/parquet-common/src/test/java/org/apache/parquet/bytes/TestConcatenatingByteBufferCollector.java
index 8b3a9cabaf..d973a7c96a 100644
--- a/parquet-common/src/test/java/org/apache/parquet/bytes/TestConcatenatingByteBufferCollector.java
+++ b/parquet-common/src/test/java/org/apache/parquet/bytes/TestConcatenatingByteBufferCollector.java
@@ -24,7 +24,7 @@
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
+import java.util.List;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -54,7 +54,7 @@ public void test() throws IOException {
         ConcatenatingByteBufferCollector inner = new ConcatenatingByteBufferCollector(allocator)) {
       outer.collect(BytesInput.concat(
           BytesInput.from(byteBuffer("This"), byteBuffer(" "), byteBuffer("is")),
-          BytesInput.from(Arrays.asList(byteBuffer(" a"), byteBuffer(" "), byteBuffer("test"))),
+          BytesInput.from(List.of(byteBuffer(" a"), byteBuffer(" "), byteBuffer("test"))),
           BytesInput.from(inputStream(" text to blabla"), 8),
           BytesInput.from(bytes(" ")),
           BytesInput.from(bytes("blabla validate blabla"), 7, 9),
diff --git a/parquet-common/src/test/java/org/apache/parquet/bytes/TestMultiBufferInputStream.java b/parquet-common/src/test/java/org/apache/parquet/bytes/TestMultiBufferInputStream.java
index a6ddfe794d..2c1b1ff52a 100644
--- a/parquet-common/src/test/java/org/apache/parquet/bytes/TestMultiBufferInputStream.java
+++ b/parquet-common/src/test/java/org/apache/parquet/bytes/TestMultiBufferInputStream.java
@@ -21,13 +21,12 @@
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class TestMultiBufferInputStream extends TestByteBufferInputStreams {
-  private static final List<ByteBuffer> DATA = Arrays.asList(
+  private static final List<ByteBuffer> DATA = List.of(
       ByteBuffer.wrap(new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8}),
       ByteBuffer.wrap(new byte[] {9, 10, 11, 12}),
       ByteBuffer.wrap(new byte[] {}),
diff --git a/parquet-common/src/test/java/org/apache/parquet/glob/TestGlob.java b/parquet-common/src/test/java/org/apache/parquet/glob/TestGlob.java
index 34bf7f4182..433cc360f6 100644
--- a/parquet-common/src/test/java/org/apache/parquet/glob/TestGlob.java
+++ b/parquet-common/src/test/java/org/apache/parquet/glob/TestGlob.java
@@ -21,7 +21,7 @@
 import static junit.framework.Assert.fail;
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
+import java.util.List;
 import junit.framework.Assert;
 import org.apache.parquet.Strings;
 import org.apache.parquet.glob.GlobParser.GlobParseException;
@@ -31,28 +31,28 @@ public class TestGlob {
 
   @Test
   public void testNoGlobs() {
-    assertEquals(Arrays.asList("foo"), Strings.expandGlob("foo"));
+    assertEquals(List.of("foo"), Strings.expandGlob("foo"));
   }
 
   @Test
   public void testEmptyGroup() {
-    assertEquals(Arrays.asList(""), Strings.expandGlob(""));
-    assertEquals(Arrays.asList(""), Strings.expandGlob("{}"));
-    assertEquals(Arrays.asList("a"), Strings.expandGlob("a{}"));
-    assertEquals(Arrays.asList("ab"), Strings.expandGlob("a{}b"));
-    assertEquals(Arrays.asList("a"), Strings.expandGlob("{}a"));
-    assertEquals(Arrays.asList("a"), Strings.expandGlob("a{}"));
-    assertEquals(Arrays.asList("", ""), Strings.expandGlob("{,}"));
-    assertEquals(Arrays.asList("ab", "a", "ac"), Strings.expandGlob("a{b,{},c}"));
+    assertEquals(List.of(""), Strings.expandGlob(""));
+    assertEquals(List.of(""), Strings.expandGlob("{}"));
+    assertEquals(List.of("a"), Strings.expandGlob("a{}"));
+    assertEquals(List.of("ab"), Strings.expandGlob("a{}b"));
+    assertEquals(List.of("a"), Strings.expandGlob("{}a"));
+    assertEquals(List.of("a"), Strings.expandGlob("a{}"));
+    assertEquals(List.of("", ""), Strings.expandGlob("{,}"));
+    assertEquals(List.of("ab", "a", "ac"), Strings.expandGlob("a{b,{},c}"));
   }
 
   @Test
   public void testSingleLevel() {
-    assertEquals(Arrays.asList("foobar", "foobaz"), Strings.expandGlob("foo{bar,baz}"));
-    assertEquals(Arrays.asList("startfooend", "startbarend"), Strings.expandGlob("start{foo,bar}end"));
-    assertEquals(Arrays.asList("fooend", "barend"), Strings.expandGlob("{foo,bar}end"));
+    assertEquals(List.of("foobar", "foobaz"), Strings.expandGlob("foo{bar,baz}"));
+    assertEquals(List.of("startfooend", "startbarend"), Strings.expandGlob("start{foo,bar}end"));
+    assertEquals(List.of("fooend", "barend"), Strings.expandGlob("{foo,bar}end"));
     assertEquals(
-        Arrays.asList(
+        List.of(
             "startfooenda",
             "startfooendb",
             "startfooendc",
@@ -62,14 +62,14 @@ public void testSingleLevel() {
             "startbarendc",
             "startbarendd"),
         Strings.expandGlob("start{foo,bar}end{a,b,c,d}"));
-    assertEquals(Arrays.asList("xa", "xb", "xc", "ya", "yb", "yc"), Strings.expandGlob("{x,y}{a,b,c}"));
-    assertEquals(Arrays.asList("x", "y", "z"), Strings.expandGlob("{x,y,z}"));
+    assertEquals(List.of("xa", "xb", "xc", "ya", "yb", "yc"), Strings.expandGlob("{x,y}{a,b,c}"));
+    assertEquals(List.of("x", "y", "z"), Strings.expandGlob("{x,y,z}"));
   }
 
   @Test
   public void testNested() {
     assertEquals(
-        Arrays.asList(
+        List.of(
             "startoneend",
             "startpretwopostend",
             "startprethreepostend",
@@ -84,9 +84,9 @@ public void testNested() {
 
   @Test
   public void testExtraBraces() {
-    assertEquals(Arrays.asList("x", "y", "z"), Strings.expandGlob("{{x,y,z}}"));
-    assertEquals(Arrays.asList("x", "y", "z"), Strings.expandGlob("{{{x,y,z}}}"));
-    assertEquals(Arrays.asList("startx", "starta", "startb", "starty"), Strings.expandGlob("start{x,{a,b},y}"));
+    assertEquals(List.of("x", "y", "z"), Strings.expandGlob("{{x,y,z}}"));
+    assertEquals(List.of("x", "y", "z"), Strings.expandGlob("{{{x,y,z}}}"));
+    assertEquals(List.of("startx", "starta", "startb", "starty"), Strings.expandGlob("start{x,{a,b},y}"));
   }
 
   @Test
@@ -102,17 +102,17 @@ public void testCommaInTopLevel() {
   @Test
   public void testCommaCornerCases() {
     // single empty string in each location
-    assertEquals(Arrays.asList("foobar", "foo", "foobaz"), Strings.expandGlob("foo{bar,,baz}"));
-    assertEquals(Arrays.asList("foo", "foobar", "foobaz"), Strings.expandGlob("foo{,bar,baz}"));
-    assertEquals(Arrays.asList("foobar", "foobaz", "foo"), Strings.expandGlob("foo{bar,baz,}"));
+    assertEquals(List.of("foobar", "foo", "foobaz"), Strings.expandGlob("foo{bar,,baz}"));
+    assertEquals(List.of("foo", "foobar", "foobaz"), Strings.expandGlob("foo{,bar,baz}"));
+    assertEquals(List.of("foobar", "foobaz", "foo"), Strings.expandGlob("foo{bar,baz,}"));
 
     // multiple empty strings
-    assertEquals(Arrays.asList("foobar", "foo", "foo", "foobaz"), Strings.expandGlob("foo{bar,,,baz}"));
-    assertEquals(Arrays.asList("foo", "foo", "foobar", "foobaz"), Strings.expandGlob("foo{,,bar,baz}"));
-    assertEquals(Arrays.asList("foobar", "foobaz", "foo", "foo"), Strings.expandGlob("foo{bar,baz,,}"));
+    assertEquals(List.of("foobar", "foo", "foo", "foobaz"), Strings.expandGlob("foo{bar,,,baz}"));
+    assertEquals(List.of("foo", "foo", "foobar", "foobaz"), Strings.expandGlob("foo{,,bar,baz}"));
+    assertEquals(List.of("foobar", "foobaz", "foo", "foo"), Strings.expandGlob("foo{bar,baz,,}"));
 
     // between groups
-    assertEquals(Arrays.asList("x", "y", "", "a", "b"), Strings.expandGlob("{{x,y},,{a,b}}"));
+    assertEquals(List.of("x", "y", "", "a", "b"), Strings.expandGlob("{{x,y},,{a,b}}"));
   }
 
   private void assertNotEnoughCloseBraces(String s) {
diff --git a/parquet-encoding/pom.xml b/parquet-encoding/pom.xml
index 8fef044823..7605bcad74 100644
--- a/parquet-encoding/pom.xml
+++ b/parquet-encoding/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml
index 5818f1dfdf..7ff9c6a113 100644
--- a/parquet-format-structures/pom.xml
+++ b/parquet-format-structures/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>parquet-format-structures</artifactId>
@@ -133,6 +133,25 @@
           <quiet>true</quiet>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.6.0</version>
+        <executions>
+          <execution>
+            <id>add-sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/thrift</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/parquet-generator/pom.xml b/parquet-generator/pom.xml
index b4f52428ba..959538601c 100644
--- a/parquet-generator/pom.xml
+++ b/parquet-generator/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/parquet-hadoop-bundle/pom.xml b/parquet-hadoop-bundle/pom.xml
index 78689cd350..e43c4b61fe 100644
--- a/parquet-hadoop-bundle/pom.xml
+++ b/parquet-hadoop-bundle/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 5d133a2be4..b31e78cb66 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>${jackson.groupId}</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${jackson-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>${jackson.groupId}</groupId>
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>org.xerial.snappy</groupId>
       <artifactId>snappy-java</artifactId>
-      <version>1.1.10.7</version>
+      <version>1.1.10.8</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>io.airlift</groupId>
       <artifactId>aircompressor</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
@@ -170,7 +170,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
@@ -191,6 +191,12 @@
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
index 002028cdf5..3597898c30 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
@@ -703,11 +703,13 @@ private void addRowGroup(
     rowGroups.add(rowGroup);
   }
 
-  private List<Encoding> toFormatEncodings(Set<org.apache.parquet.column.Encoding> encodings) {
+  // Visible for testing
+  List<Encoding> toFormatEncodings(Set<org.apache.parquet.column.Encoding> encodings) {
     List<Encoding> converted = new ArrayList<Encoding>(encodings.size());
     for (org.apache.parquet.column.Encoding encoding : encodings) {
       converted.add(getEncoding(encoding));
     }
+    Collections.sort(converted);
     return converted;
   }
 
@@ -1052,12 +1054,12 @@ enum SortOrder {
     UNKNOWN
   }
 
-  private static final Set<Class> STRING_TYPES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+  private static final Set<Class> STRING_TYPES = Set.of(
       LogicalTypeAnnotation.StringLogicalTypeAnnotation.class,
       LogicalTypeAnnotation.EnumLogicalTypeAnnotation.class,
       LogicalTypeAnnotation.JsonLogicalTypeAnnotation.class,
       LogicalTypeAnnotation.Float16LogicalTypeAnnotation.class,
-      LogicalTypeAnnotation.UnknownLogicalTypeAnnotation.class)));
+      LogicalTypeAnnotation.UnknownLogicalTypeAnnotation.class);
 
   /**
    * Returns whether to use signed order min and max with a type. It is safe to
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordReader.java
index c9842c9375..19b1d5426e 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordReader.java
@@ -294,6 +294,14 @@ private static <K, V> Map<K, Set<V>> toSetMultiMap(Map<K, V> map) {
     return Collections.unmodifiableMap(setMultiMap);
   }
 
+  /**
+   * Returns the 0-based index of the row group currently being read. Returns -1 if no row group
+   * has been read yet.
+   */
+  public int getCurrentRowGroupIndex() {
+    return currentBlock;
+  }
+
   /**
    * Returns the row index of the current row. If no row has been processed or if the
    * row index information is unavailable from the underlying @{@link PageReadStore}, returns -1.
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordWriter.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordWriter.java
index 41b068d01a..dd51d1ef09 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordWriter.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/InternalParquetRecordWriter.java
@@ -152,6 +152,9 @@ public void close() throws IOException, InterruptedException {
   }
 
   public void write(T value) throws IOException, InterruptedException {
+    if (aborted) {
+      throw new IOException("Writer has been aborted due to a previous error and cannot accept further writes");
+    }
     try {
       writeSupport.write(value);
       ++recordCount;
@@ -171,7 +174,9 @@ public long getDataSize() {
 
   private void checkBlockSizeReached() throws IOException {
     if (recordCount >= rowGroupRecordCountThreshold) {
-      LOG.debug("record count reaches threshold: flushing {} records to disk.", recordCount);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("record count reaches threshold: flushing {} records to disk.", recordCount);
+      }
       flushRowGroupToStore();
       initStore();
       recordCountForNextMemCheck = min(
@@ -185,7 +190,9 @@ private void checkBlockSizeReached() throws IOException {
       // flush the row group if it is within ~2 records of the limit
       // it is much better to be slightly under size than to be over at all
       if (memSize > (nextRowGroupSize - 2 * recordSize)) {
-        LOG.debug("mem size {} > {}: flushing {} records to disk.", memSize, nextRowGroupSize, recordCount);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("mem size {} > {}: flushing {} records to disk.", memSize, nextRowGroupSize, recordCount);
+        }
         flushRowGroupToStore();
         initStore();
         recordCountForNextMemCheck = min(
@@ -201,7 +208,9 @@ private void checkBlockSizeReached() throws IOException {
             recordCount
                 + props.getMaxRowCountForPageSizeCheck() // will not look more than max records ahead
             );
-        LOG.debug("Checked mem at {} will check again at: {}", recordCount, recordCountForNextMemCheck);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Checked mem at {} will check again at: {}", recordCount, recordCountForNextMemCheck);
+        }
       }
     }
   }
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
index 551b1bf6c7..e0b0d76e0e 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
@@ -1097,6 +1097,14 @@ public List<BlockMetaData> getRowGroups() {
     return blocks;
   }
 
+  /**
+   * Returns the 0-based index of the row group that was last read via {@link #readNextRowGroup()}
+   * or {@link #readNextFilteredRowGroup()}. Returns -1 if no row group has been read yet.
+   */
+  public int getCurrentRowGroupIndex() {
+    return currentBlock - 1;
+  }
+
   public void setRequestedSchema(List<ColumnDescriptor> columns) {
     paths.clear();
     for (ColumnDescriptor col : columns) {
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetReader.java
index 4514a829c5..01ac69b330 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetReader.java
@@ -144,6 +144,17 @@ public T read() throws IOException {
     }
   }
 
+  /**
+   * @return the 0-based index of the row group currently being read. If no row group has been
+   *     read yet, returns -1.
+   */
+  public int getCurrentRowGroupIndex() {
+    if (reader == null) {
+      return -1;
+    }
+    return reader.getCurrentRowGroupIndex();
+  }
+
   /**
    * @return the row index of the last read row. If no row has been processed, returns -1.
    */
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetRecordReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetRecordReader.java
index b217116aac..c0e52fc5c6 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetRecordReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetRecordReader.java
@@ -207,6 +207,14 @@ public boolean nextKeyValue() throws IOException, InterruptedException {
     return internalReader.nextKeyValue();
   }
 
+  /**
+   * @return the 0-based index of the row group currently being read. If no row group has been
+   *     read yet, returns -1.
+   */
+  public int getCurrentRowGroupIndex() {
+    return internalReader.getCurrentRowGroupIndex();
+  }
+
   /**
    * @return the row index of the current row. If no row has been processed, returns -1.
    */
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/PrintFooter.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/PrintFooter.java
index 64153893d7..d50bccd03b 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/PrintFooter.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/PrintFooter.java
@@ -23,7 +23,6 @@
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.LinkedHashMap;
@@ -77,7 +76,7 @@ public static void main(String[] args) throws Exception {
       List<FileStatus> statuses;
       if (fileStatus.isDir()) {
         System.out.println("listing files in " + fileStatus.getPath());
-        statuses = Arrays.asList(fs.listStatus(fileStatus.getPath(), HiddenFileFilter.INSTANCE));
+        statuses = List.of(fs.listStatus(fileStatus.getPath(), HiddenFileFilter.INSTANCE));
       } else {
         statuses = new ArrayList<FileStatus>();
         statuses.add(fileStatus);
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/mapred/DeprecatedParquetInputFormat.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/mapred/DeprecatedParquetInputFormat.java
index f10c574c41..f3e822528c 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/mapred/DeprecatedParquetInputFormat.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/mapred/DeprecatedParquetInputFormat.java
@@ -19,7 +19,6 @@
 package org.apache.parquet.hadoop.mapred;
 
 import static java.lang.Boolean.TRUE;
-import static java.util.Arrays.asList;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -65,7 +64,7 @@ public InputSplit[] getSplits(JobConf job, int numSplits) throws IOException {
   }
 
   public List<Footer> getFooters(JobConf job) throws IOException {
-    return realInputFormat.getFooters(job, asList(super.listStatus(job)));
+    return realInputFormat.getFooters(job, List.of(super.listStatus(job)));
   }
 
   private static class RecordReaderWrapper<V> implements RecordReader<Void, Container<V>> {
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
index 1c8b2e1f90..fcaac1176d 100755
--- a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/keytools/samples/VaultClient.java
@@ -20,9 +20,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import okhttp3.ConnectionSpec;
 import okhttp3.MediaType;
@@ -56,7 +56,7 @@ public class VaultClient implements KmsClient {
 
   private String endPointPrefix;
   private OkHttpClient httpClient = new OkHttpClient.Builder()
-      .connectionSpecs(Arrays.asList(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS))
+      .connectionSpecs(List.of(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS))
       .build();
 
   @Override
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/encodings/FileEncodingsIT.java b/parquet-hadoop/src/test/java/org/apache/parquet/encodings/FileEncodingsIT.java
index f2e6e16fcc..c35b13f8fc 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/encodings/FileEncodingsIT.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/encodings/FileEncodingsIT.java
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -105,7 +104,7 @@ public class FileEncodingsIT {
 
   @Parameterized.Parameters
   public static Collection<Object[]> getParameters() {
-    List<PrimitiveTypeName> types = Arrays.asList(
+    List<PrimitiveTypeName> types = List.of(
         PrimitiveTypeName.BOOLEAN,
         PrimitiveTypeName.INT32,
         PrimitiveTypeName.INT64,
@@ -124,7 +123,7 @@ public static Collection<Object[]> getParameters() {
       }
     } else {
       // otherwise test just UNCOMPRESSED
-      codecs = Arrays.asList(CompressionCodecName.UNCOMPRESSED);
+      codecs = List.of(CompressionCodecName.UNCOMPRESSED);
     }
 
     System.err.println("Testing codecs: " + codecs);
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/compat/TestRowGroupFilter.java b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/compat/TestRowGroupFilter.java
index 18c8ca0ae7..80bdda4170 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/compat/TestRowGroupFilter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/compat/TestRowGroupFilter.java
@@ -27,7 +27,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -88,36 +87,36 @@ public void testApplyRowGroupFilters() {
     set1.add(10);
     set1.add(50);
     List<BlockMetaData> filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(in(foo, set1)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b5), filtered);
+    assertEquals(List.of(b1, b2, b5), filtered);
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(notIn(foo, set1)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b4, b5, b6), filtered);
 
     Set<Integer> set2 = new HashSet<>();
     set2.add(null);
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(in(foo, set2)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b3, b4, b5, b6), filtered);
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(notIn(foo, set2)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b4, b5, b6), filtered);
 
     set2.add(8);
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(in(foo, set2)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b4, b5, b6), filtered);
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(notIn(foo, set2)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b4, b5, b6), filtered);
 
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(eq(foo, 50)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b5), filtered);
+    assertEquals(List.of(b1, b2, b5), filtered);
 
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(notEq(foo, 50)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b4, b5, b6), filtered);
 
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(eq(foo, null)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b3, b4, b5, b6), filtered);
+    assertEquals(List.of(b1, b3, b4, b5, b6), filtered);
 
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(notEq(foo, null)), blocks, schema);
-    assertEquals(Arrays.asList(b1, b2, b3, b5, b6), filtered);
+    assertEquals(List.of(b1, b2, b3, b5, b6), filtered);
 
     filtered = RowGroupFilter.filterRowGroups(FilterCompat.get(eq(foo, 0)), blocks, schema);
-    assertEquals(Arrays.asList(b6), filtered);
+    assertEquals(List.of(b6), filtered);
   }
 }
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilterTest.java b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilterTest.java
index f5f414c864..981a3820b7 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilterTest.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/dictionarylevel/DictionaryFilterTest.java
@@ -45,7 +45,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -53,7 +53,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -288,7 +287,7 @@ public void testDictionaryEncodedColumns() throws Exception {
 
   @SuppressWarnings("deprecation")
   private void testDictionaryEncodedColumnsV1() throws Exception {
-    Set<String> dictionaryEncodedColumns = new HashSet<String>(Arrays.asList(
+    Set<String> dictionaryEncodedColumns = new HashSet<String>(List.of(
         "binary_field",
         "single_value_field",
         "optional_single_value_field",
@@ -326,7 +325,7 @@ private void testDictionaryEncodedColumnsV1() throws Exception {
   }
 
   private void testDictionaryEncodedColumnsV2() throws Exception {
-    Set<String> dictionaryEncodedColumns = new HashSet<String>(Arrays.asList(
+    Set<String> dictionaryEncodedColumns = new HashSet<String>(List.of(
         "binary_field",
         "single_value_field",
         "optional_single_value_field",
@@ -732,7 +731,7 @@ public void testColumnWithoutDictionary() throws Exception {
         "Should never drop block using plain encoding",
         canDrop(notEq(plain, nElements + 10), ccmd, dictionaryStore));
 
-    verifyZeroInteractions(dictionaryStore);
+    verifyNoInteractions(dictionaryStore);
   }
 
   @Test
@@ -758,7 +757,7 @@ public void testColumnWithDictionaryAndPlainEncodings() throws Exception {
         "Should never drop block using plain encoding",
         canDrop(notEq(plain, nElements + 10), ccmd, dictionaryStore));
 
-    verifyZeroInteractions(dictionaryStore);
+    verifyNoInteractions(dictionaryStore);
   }
 
   @Test
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/recordlevel/TestRecordLevelFilters.java b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/recordlevel/TestRecordLevelFilters.java
index 1a1a31e73c..0c03f548b2 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/recordlevel/TestRecordLevelFilters.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/recordlevel/TestRecordLevelFilters.java
@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -87,27 +86,27 @@ public static List<User> makeUsers() {
             "business", 2000.0D,
             "retirement", 1000.0D)));
 
-    users.add(new User(20, "thing1", Arrays.asList(new PhoneNumber(5555555555L, null)), null));
+    users.add(new User(20, "thing1", List.of(new PhoneNumber(5555555555L, null)), null));
 
     users.add(new User(
         27,
         "thing2",
-        Arrays.asList(new PhoneNumber(1111111111L, "home"), new PhoneNumber(2222222222L, "cell")),
+        List.of(new PhoneNumber(1111111111L, "home"), new PhoneNumber(2222222222L, "cell")),
         null));
 
     users.add(new User(
         28,
         "popular",
-        Arrays.asList(
+        List.of(
             new PhoneNumber(1111111111L, "home"),
             new PhoneNumber(1111111111L, "apartment"),
             new PhoneNumber(2222222222L, null),
             new PhoneNumber(3333333333L, "mobile")),
         null));
 
-    users.add(new User(30, null, Arrays.asList(new PhoneNumber(1111111111L, "home")), null));
+    users.add(new User(30, null, List.of(new PhoneNumber(1111111111L, "home")), null));
 
-    users.add(new User(31, null, Arrays.asList(new PhoneNumber(2222222222L, "business")), null));
+    users.add(new User(31, null, List.of(new PhoneNumber(2222222222L, "business")), null));
 
     for (int i = 100; i < 200; i++) {
       Location location = null;
@@ -117,7 +116,7 @@ public static List<User> makeUsers() {
       if (i % 3 == 2) {
         location = new Location((double) i, null);
       }
-      users.add(new User(i, "p" + i, Arrays.asList(new PhoneNumber(i, "cell")), location));
+      users.add(new User(i, "p" + i, List.of(new PhoneNumber(i, "cell")), location));
     }
 
     return users;
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/statisticslevel/TestStatisticsFilter.java b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/statisticslevel/TestStatisticsFilter.java
index 15d0a8ab13..6e1f267e8c 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/filter2/statisticslevel/TestStatisticsFilter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/filter2/statisticslevel/TestStatisticsFilter.java
@@ -41,7 +41,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -72,7 +71,7 @@ private static ColumnChunkMetaData getIntColumnMeta(
         ColumnPath.get("int", "column"),
         PrimitiveTypeName.INT32,
         CompressionCodecName.GZIP,
-        new HashSet<Encoding>(Arrays.asList(Encoding.PLAIN)),
+        new HashSet<Encoding>(List.of(Encoding.PLAIN)),
         stats,
         0L,
         0L,
@@ -87,7 +86,7 @@ private static ColumnChunkMetaData getDoubleColumnMeta(
         ColumnPath.get("double", "column"),
         PrimitiveTypeName.DOUBLE,
         CompressionCodecName.GZIP,
-        new HashSet<Encoding>(Arrays.asList(Encoding.PLAIN)),
+        new HashSet<Encoding>(List.of(Encoding.PLAIN)),
         stats,
         0L,
         0L,
@@ -122,13 +121,13 @@ private static ColumnChunkMetaData getDoubleColumnMeta(
   }
 
   private static final List<ColumnChunkMetaData> columnMetas =
-      Arrays.asList(getIntColumnMeta(intStats, 177L), getDoubleColumnMeta(doubleStats, 177L));
+      List.of(getIntColumnMeta(intStats, 177L), getDoubleColumnMeta(doubleStats, 177L));
 
-  private static final List<ColumnChunkMetaData> nullColumnMetas = Arrays.asList(
+  private static final List<ColumnChunkMetaData> nullColumnMetas = List.of(
       getIntColumnMeta(nullIntStats, 177L), // column of all nulls
       getDoubleColumnMeta(doubleStats, 177L));
 
-  private static final List<ColumnChunkMetaData> missingMinMaxColumnMetas = Arrays.asList(
+  private static final List<ColumnChunkMetaData> missingMinMaxColumnMetas = List.of(
       getIntColumnMeta(emptyIntStats, 177L), // missing min/max values and numNulls => stats is empty
       getDoubleColumnMeta(missingMinMaxDoubleStats, 177L)); // missing min/max, some null values
 
@@ -159,11 +158,11 @@ public void testEqNull() {
 
     assertTrue(canDrop(
         eq(intColumn, null),
-        Arrays.asList(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         eq(intColumn, null),
-        Arrays.asList(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(eq(missingColumn, null), columnMetas));
 
@@ -182,17 +181,17 @@ public void testNotEqNonNull() {
     allSevens.setMinMax(7, 7);
     assertTrue(canDrop(
         notEq(intColumn, 7),
-        Arrays.asList(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     allSevens.setNumNulls(100L);
     assertFalse(canDrop(
         notEq(intColumn, 7),
-        Arrays.asList(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     allSevens.setNumNulls(177L);
     assertFalse(canDrop(
         notEq(intColumn, 7),
-        Arrays.asList(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(allSevens, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(notEq(missingColumn, fromString("any")), columnMetas));
 
@@ -216,15 +215,15 @@ public void testNotEqNull() {
 
     assertFalse(canDrop(
         notEq(intColumn, null),
-        Arrays.asList(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         notEq(intColumn, null),
-        Arrays.asList(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(
         notEq(intColumn, null),
-        Arrays.asList(getIntColumnMeta(statsAllNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsAllNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(notEq(missingColumn, null), columnMetas));
 
@@ -368,19 +367,19 @@ public void testInNotIn() {
     values9.add(null);
     assertTrue(canDrop(
         in(intColumn, values9),
-        Arrays.asList(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         notIn(intColumn, values9),
-        Arrays.asList(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsNoNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         in(intColumn, values9),
-        Arrays.asList(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         notIn(intColumn, values9),
-        Arrays.asList(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(statsSomeNulls, 177L), getDoubleColumnMeta(doubleStats, 177L))));
   }
 
   @Test
@@ -510,82 +509,73 @@ public void testUdp() {
     IntStatistics neither = new IntStatistics();
     neither.setMinMax(1, 2);
 
-    assertTrue(canDrop(pred, Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertTrue(canDrop(pred, List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
-    assertFalse(
-        canDrop(pred, Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertFalse(canDrop(pred, List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
-    assertFalse(
-        canDrop(pred, Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertFalse(canDrop(pred, List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
-    assertFalse(
-        canDrop(invPred, Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertFalse(canDrop(invPred, List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
-    assertTrue(
-        canDrop(invPred, Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertTrue(canDrop(invPred, List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
-    assertFalse(canDrop(
-        invPred, Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+    assertFalse(canDrop(invPred, List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     // udpDropMissingColumn drops null column.
     assertTrue(canDrop(
-        udpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        udpDropMissingColumn, List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(
-        udpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        udpDropMissingColumn, List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(
         udpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     // invUdpDropMissingColumn (i.e., not(udpDropMissingColumn)) keeps null column.
     assertFalse(canDrop(
         invUdpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         invUdpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         invUdpDropMissingColumn,
-        Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     // udpKeepMissingColumn keeps null column.
     assertFalse(canDrop(
-        udpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        udpKeepMissingColumn, List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
-        udpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        udpKeepMissingColumn, List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(
         udpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     // invUdpKeepMissingColumn (i.e., not(udpKeepMissingColumn)) drops null column.
     assertTrue(canDrop(
         invUdpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(seven, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(
         invUdpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(eight, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertTrue(canDrop(
         invUdpKeepMissingColumn,
-        Arrays.asList(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
+        List.of(getIntColumnMeta(neither, 177L), getDoubleColumnMeta(doubleStats, 177L))));
 
     assertFalse(canDrop(allPositivePred, missingMinMaxColumnMetas));
   }
 
   @Test
   public void testClearExceptionForNots() {
-    List<ColumnChunkMetaData> columnMetas = Arrays.asList(
-        getDoubleColumnMeta(new DoubleStatistics(), 0L), getIntColumnMeta(new IntStatistics(), 0L));
+    List<ColumnChunkMetaData> columnMetas =
+        List.of(getDoubleColumnMeta(new DoubleStatistics(), 0L), getIntColumnMeta(new IntStatistics(), 0L));
 
     FilterPredicate pred = and(not(eq(doubleColumn, 12.0)), eq(intColumn, 17));
 
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
index 2529f06ada..e4851d8ec4 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
@@ -531,7 +531,7 @@ private FileMetaData metadata(long... sizes) {
           size * 2,
           size,
           offset));
-      rowGroups.add(new RowGroup(Arrays.asList(columnChunk), size, 1));
+      rowGroups.add(new RowGroup(List.of(columnChunk), size, 1));
       offset += size;
     }
     return new FileMetaData(1, schema, sizes.length, rowGroups);
@@ -722,12 +722,12 @@ private ColumnChunkMetaData createColumnChunkMetaData() {
   public void testEncodingsCache() {
     ParquetMetadataConverter parquetMetadataConverter = new ParquetMetadataConverter();
 
-    List<org.apache.parquet.format.Encoding> formatEncodingsCopy1 = Arrays.asList(
+    List<org.apache.parquet.format.Encoding> formatEncodingsCopy1 = List.of(
         org.apache.parquet.format.Encoding.BIT_PACKED,
         org.apache.parquet.format.Encoding.RLE_DICTIONARY,
         org.apache.parquet.format.Encoding.DELTA_LENGTH_BYTE_ARRAY);
 
-    List<org.apache.parquet.format.Encoding> formatEncodingsCopy2 = Arrays.asList(
+    List<org.apache.parquet.format.Encoding> formatEncodingsCopy2 = List.of(
         org.apache.parquet.format.Encoding.BIT_PACKED,
         org.apache.parquet.format.Encoding.RLE_DICTIONARY,
         org.apache.parquet.format.Encoding.DELTA_LENGTH_BYTE_ARRAY);
@@ -759,6 +759,22 @@ public void testEncodingsCache() {
     assertEquals("java.util.Collections$UnmodifiableSet", res3.getClass().getName());
   }
 
+  @Test
+  public void testEncodingsOrder() {
+    ParquetMetadataConverter parquetMetadataConverter = new ParquetMetadataConverter();
+
+    Set<org.apache.parquet.column.Encoding> columnEncodings =
+        new HashSet<>(Arrays.asList(org.apache.parquet.column.Encoding.values()));
+
+    // Assert that the encodings are returned in ascending ordinal order
+    List<org.apache.parquet.format.Encoding> formatEncodings =
+        parquetMetadataConverter.toFormatEncodings(columnEncodings);
+    for (int i = 1; i < formatEncodings.size(); i++) {
+      assertTrue(formatEncodings.get(i - 1).ordinal()
+          < formatEncodings.get(i).ordinal());
+    }
+  }
+
   @Test
   public void testBinaryStatsV1() {
     testBinaryStats(StatsHelper.V1);
@@ -1451,14 +1467,14 @@ public void testColumnIndexConversion() {
           ParquetMetadataConverter.toParquetColumnIndex(type, builder.build());
       ColumnIndex columnIndex = ParquetMetadataConverter.fromParquetColumnIndex(type, parquetColumnIndex);
       assertEquals(BoundaryOrder.ASCENDING, columnIndex.getBoundaryOrder());
-      assertTrue(Arrays.asList(false, true, false).equals(columnIndex.getNullPages()));
-      assertTrue(Arrays.asList(16l, 111l, 0l).equals(columnIndex.getNullCounts()));
-      assertTrue(Arrays.asList(
+      assertTrue(List.of(false, true, false).equals(columnIndex.getNullPages()));
+      assertTrue(List.of(16l, 111l, 0l).equals(columnIndex.getNullCounts()));
+      assertTrue(List.of(
               ByteBuffer.wrap(BytesUtils.longToBytes(-100l)),
               ByteBuffer.allocate(0),
               ByteBuffer.wrap(BytesUtils.longToBytes(200l)))
           .equals(columnIndex.getMinValues()));
-      assertTrue(Arrays.asList(
+      assertTrue(List.of(
               ByteBuffer.wrap(BytesUtils.longToBytes(100l)),
               ByteBuffer.allocate(0),
               ByteBuffer.wrap(BytesUtils.longToBytes(500l)))
@@ -1656,8 +1672,8 @@ private void verifyMapMessageType(final MessageType messageType, final String ke
   @Test
   public void testSizeStatisticsConversion() {
     PrimitiveType type = Types.required(PrimitiveTypeName.BINARY).named("test");
-    List<Long> repLevelHistogram = Arrays.asList(1L, 2L, 3L, 4L, 5L);
-    List<Long> defLevelHistogram = Arrays.asList(6L, 7L, 8L, 9L, 10L);
+    List<Long> repLevelHistogram = List.of(1L, 2L, 3L, 4L, 5L);
+    List<Long> defLevelHistogram = List.of(6L, 7L, 8L, 9L, 10L);
     SizeStatistics sizeStatistics = ParquetMetadataConverter.fromParquetSizeStatistics(
         ParquetMetadataConverter.toParquetSizeStatistics(
             new SizeStatistics(type, 1024, repLevelHistogram, defLevelHistogram)),
@@ -1820,7 +1836,7 @@ public void testGeospatialStatisticsConversion() {
             );
 
     // Create GeospatialTypes with some example type values
-    Set<Integer> types = new HashSet<>(Arrays.asList(1, 2, 3));
+    Set<Integer> types = new HashSet<>(List.of(1, 2, 3));
     GeospatialTypes geospatialTypes = new GeospatialTypes(types);
 
     // Create GeospatialStatistics with the bbox and types
@@ -1891,7 +1907,7 @@ public void testGeospatialStatisticsWithNullBoundingBox() {
     ParquetMetadataConverter converter = new ParquetMetadataConverter();
 
     // Create GeospatialStatistics with null bbox but valid types
-    Set<Integer> types = new HashSet<>(Arrays.asList(1, 2, 3));
+    Set<Integer> types = new HashSet<>(List.of(1, 2, 3));
     GeospatialTypes geospatialTypes = new GeospatialTypes(types);
     org.apache.parquet.column.statistics.geospatial.GeospatialStatistics origStats =
         new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(null, geospatialTypes);
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestBloomFiltering.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestBloomFiltering.java
index 651184a0d5..4ca75c347a 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestBloomFiltering.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestBloomFiltering.java
@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -113,7 +112,7 @@ private static Path createTempFile(boolean encrypted) {
 
   @Parameterized.Parameters(name = "Run {index}: isEncrypted={1}")
   public static Collection<Object[]> params() {
-    return Arrays.asList(
+    return List.of(
         new Object[] {FILE_V1, false /*isEncrypted*/},
         new Object[] {FILE_V2, false /*isEncrypted*/},
         new Object[] {FILE_V1_E, true /*isEncrypted*/},
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnChunkPageWriteStore.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnChunkPageWriteStore.java
index 2b037b5261..a17cf678f5 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnChunkPageWriteStore.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnChunkPageWriteStore.java
@@ -32,10 +32,10 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.inOrder;
 
 import java.io.ByteArrayInputStream;
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnIndexFiltering.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnIndexFiltering.java
index 154dd6f5c5..81883fb45e 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnIndexFiltering.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestColumnIndexFiltering.java
@@ -49,7 +49,6 @@
 import java.io.Serializable;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -137,7 +136,7 @@ public class TestColumnIndexFiltering {
 
   @Parameters(name = "Run {index}: isEncrypted={1}")
   public static Collection<Object[]> params() {
-    return Arrays.asList(
+    return List.of(
         new Object[] {FILE_V1, false /*isEncrypted*/},
         new Object[] {FILE_V2, false /*isEncrypted*/},
         new Object[] {FILE_V1_E, true /*isEncrypted*/},
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestDataPageChecksums.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestDataPageChecksums.java
index 013498c2b4..5ee2379050 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestDataPageChecksums.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestDataPageChecksums.java
@@ -320,7 +320,7 @@ private void testWriteOnVerifyOff(ParquetProperties.WriterVersion version) throw
 
     Path path = writeSimpleParquetFile(conf, CompressionCodecName.UNCOMPRESSED, version);
 
-    try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+    try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
       PageReadStore pageReadStore = reader.readNextRowGroup();
 
       DataPage colAPage1 = readNextPage(colADesc, pageReadStore);
@@ -361,7 +361,7 @@ private void testWriteOffVerifyOff(ParquetProperties.WriterVersion version) thro
 
     Path path = writeSimpleParquetFile(conf, CompressionCodecName.UNCOMPRESSED, version);
 
-    try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+    try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
       PageReadStore pageReadStore = reader.readNextRowGroup();
 
       assertCrcNotSet(readNextPage(colADesc, pageReadStore));
@@ -392,7 +392,7 @@ private void testWriteOffVerifyOn(ParquetProperties.WriterVersion version) throw
 
     Path path = writeSimpleParquetFile(conf, CompressionCodecName.UNCOMPRESSED, version);
 
-    try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+    try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
       PageReadStore pageReadStore = reader.readNextRowGroup();
 
       assertCorrectContent(getPageBytes(readNextPage(colADesc, pageReadStore)), colAPage1Bytes);
@@ -423,7 +423,7 @@ private void testWriteOnVerifyOn(ParquetProperties.WriterVersion version) throws
 
     Path path = writeSimpleParquetFile(conf, CompressionCodecName.UNCOMPRESSED, version);
 
-    try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+    try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
       PageReadStore pageReadStore = reader.readNextRowGroup();
 
       DataPage colAPage1 = readNextPage(colADesc, pageReadStore);
@@ -484,7 +484,7 @@ private void testCorruptedPage(ParquetProperties.WriterVersion version) throws I
         // First we disable checksum verification, the corruption will go undetected as it is in the
         // data section of the page
         conf.setBoolean(ParquetInputFormat.PAGE_VERIFY_CHECKSUM_ENABLED, false);
-        try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+        try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
           PageReadStore pageReadStore = reader.readNextRowGroup();
 
           DataPage colAPage1 = readNextPage(colADesc, pageReadStore);
@@ -499,7 +499,7 @@ private void testCorruptedPage(ParquetProperties.WriterVersion version) throws I
 
         // Now we enable checksum verification, the corruption should be detected
         conf.setBoolean(ParquetInputFormat.PAGE_VERIFY_CHECKSUM_ENABLED, true);
-        try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+        try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
           // We expect an exception on the first encountered corrupt page (in readAllPages)
           assertVerificationFailed(reader);
         }
@@ -528,7 +528,7 @@ private void testCompression(ParquetProperties.WriterVersion version) throws IOE
 
     Path path = writeSimpleParquetFile(conf, CompressionCodecName.SNAPPY, version);
 
-    try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colADesc, colBDesc))) {
+    try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colADesc, colBDesc))) {
       PageReadStore pageReadStore = reader.readNextRowGroup();
 
       DataPage colAPage1 = readNextPage(colADesc, pageReadStore);
@@ -574,8 +574,7 @@ private void testNestedWithNulls(ParquetProperties.WriterVersion version) throws
     conf.setBoolean(ParquetInputFormat.PAGE_VERIFY_CHECKSUM_ENABLED, false);
     Path refPath = writeNestedWithNullsSampleParquetFile(conf, false, CompressionCodecName.SNAPPY, version);
 
-    try (ParquetFileReader refReader =
-        getParquetFileReader(refPath, conf, Arrays.asList(colCIdDesc, colDValDesc))) {
+    try (ParquetFileReader refReader = getParquetFileReader(refPath, conf, List.of(colCIdDesc, colDValDesc))) {
       PageReadStore refPageReadStore = refReader.readNextRowGroup();
       byte[] colCIdPageBytes = getPageBytes(readNextPage(colCIdDesc, refPageReadStore));
       byte[] colDValPageBytes = getPageBytes(readNextPage(colDValDesc, refPageReadStore));
@@ -585,7 +584,7 @@ private void testNestedWithNulls(ParquetProperties.WriterVersion version) throws
       conf.setBoolean(ParquetInputFormat.PAGE_VERIFY_CHECKSUM_ENABLED, true);
       Path path = writeNestedWithNullsSampleParquetFile(conf, false, CompressionCodecName.SNAPPY, version);
 
-      try (ParquetFileReader reader = getParquetFileReader(path, conf, Arrays.asList(colCIdDesc, colDValDesc))) {
+      try (ParquetFileReader reader = getParquetFileReader(path, conf, List.of(colCIdDesc, colDValDesc))) {
         PageReadStore pageReadStore = reader.readNextRowGroup();
 
         DataPage colCIdPage = readNextPage(colCIdDesc, pageReadStore);
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormat.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormat.java
index 0de2d1d40f..40bd9b0ee3 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormat.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormat.java
@@ -344,7 +344,7 @@ public static BlockMetaData makeBlockFromStats(IntStatistics stats, long valueCo
         ColumnPath.get("foo"),
         PrimitiveTypeName.INT32,
         CompressionCodecName.GZIP,
-        new HashSet<Encoding>(Arrays.asList(Encoding.PLAIN)),
+        new HashSet<Encoding>(List.of(Encoding.PLAIN)),
         stats,
         100l,
         100l,
@@ -566,7 +566,7 @@ private BlockMetaData newBlock(long start, long compressedBlockSize) {
         ColumnPath.get("foo"),
         PrimitiveTypeName.BINARY,
         CompressionCodecName.GZIP,
-        new HashSet<Encoding>(Arrays.asList(Encoding.PLAIN)),
+        new HashSet<Encoding>(List.of(Encoding.PLAIN)),
         new BinaryStatistics(),
         start,
         0l,
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormatColumnProjection.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormatColumnProjection.java
index 7fe206b87a..4fbf9d2df4 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormatColumnProjection.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestInputFormatColumnProjection.java
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import org.apache.hadoop.conf.Configuration;
@@ -110,7 +109,7 @@ protected void map(Void key, Group value, Context context) throws IOException, I
 
   @Parameterized.Parameters(name = "vectored : {0}")
   public static List<Boolean> params() {
-    return Arrays.asList(true, false);
+    return List.of(true, false);
   }
 
   /**
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestMergeMetadataFiles.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestMergeMetadataFiles.java
index 2caf07b151..847074c147 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestMergeMetadataFiles.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestMergeMetadataFiles.java
@@ -26,7 +26,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -184,9 +183,9 @@ public void testMergeMetadataFiles() throws Exception {
     // test file serialization
     Path mergedOut = new Path(new File(temp.getRoot(), "merged_meta").getAbsolutePath());
     Path mergedCommonOut = new Path(new File(temp.getRoot(), "merged_common_meta").getAbsolutePath());
-    ParquetFileWriter.writeMergedMetadataFile(Arrays.asList(info.metaPath1, info.metaPath2), mergedOut, info.conf);
+    ParquetFileWriter.writeMergedMetadataFile(List.of(info.metaPath1, info.metaPath2), mergedOut, info.conf);
     ParquetFileWriter.writeMergedMetadataFile(
-        Arrays.asList(info.commonMetaPath1, info.commonMetaPath2), mergedCommonOut, info.conf);
+        List.of(info.commonMetaPath1, info.commonMetaPath2), mergedCommonOut, info.conf);
 
     ParquetMetadata mergedMeta =
         ParquetFileReader.readFooter(info.conf, mergedOut, ParquetMetadataConverter.NO_FILTER);
@@ -222,8 +221,7 @@ public void testThrowsWhenIncompatible() throws Exception {
     Path mergedCommonOut = new Path(new File(temp.getRoot(), "merged_common_meta").getAbsolutePath());
 
     try {
-      ParquetFileWriter.writeMergedMetadataFile(
-          Arrays.asList(info.metaPath1, info.metaPath2), mergedOut, info.conf);
+      ParquetFileWriter.writeMergedMetadataFile(List.of(info.metaPath1, info.metaPath2), mergedOut, info.conf);
       fail("this should throw");
     } catch (RuntimeException e) {
       boolean eq1 =
@@ -236,7 +234,7 @@ public void testThrowsWhenIncompatible() throws Exception {
 
     try {
       ParquetFileWriter.writeMergedMetadataFile(
-          Arrays.asList(info.commonMetaPath1, info.commonMetaPath2), mergedCommonOut, info.conf);
+          List.of(info.commonMetaPath1, info.commonMetaPath2), mergedCommonOut, info.conf);
       fail("this should throw");
     } catch (RuntimeException e) {
       boolean eq1 =
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetFileWriter.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetFileWriter.java
index 4269cf5160..ca03ef4db8 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetFileWriter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetFileWriter.java
@@ -46,7 +46,6 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -161,7 +160,7 @@ public class TestParquetFileWriter {
 
   @Parameterized.Parameters(name = "vectored : {0}")
   public static List<Boolean> params() {
-    return Arrays.asList(true, false);
+    return List.of(true, false);
   }
 
   /**
@@ -312,8 +311,8 @@ public void testWriteRead() throws Exception {
           configuration,
           readFooter.getFileMetaData(),
           path,
-          Arrays.asList(rowGroup),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1)))) {
+          List.of(rowGroup),
+          List.of(SCHEMA.getColumnDescription(PATH1)))) {
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
         validateContains(SCHEMA, pages, PATH1, 2, BytesInput.from(BYTES1));
@@ -328,7 +327,7 @@ public void testWriteRead() throws Exception {
           readFooter.getFileMetaData(),
           path,
           readFooter.getBlocks(),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
+          List.of(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
 
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
@@ -478,8 +477,8 @@ public void testBloomFilterWriteRead() throws Exception {
         configuration,
         readFooter.getFileMetaData(),
         path,
-        Arrays.asList(readFooter.getBlocks().get(0)),
-        Arrays.asList(schema.getColumnDescription(colPath)))) {
+        List.of(readFooter.getBlocks().get(0)),
+        List.of(schema.getColumnDescription(colPath)))) {
       BloomFilterReader bloomFilterReader =
           r.getBloomFilterDataReader(readFooter.getBlocks().get(0));
       BloomFilter bloomFilter = bloomFilterReader.readBloomFilter(
@@ -552,7 +551,7 @@ public void testWriteReadDataPageV2() throws Exception {
         readFooter.getFileMetaData(),
         path,
         readFooter.getBlocks(),
-        Arrays.asList(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
+        List.of(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
       PageReadStore pages = reader.readNextRowGroup();
       assertEquals(14, pages.getRowCount());
       validateV2Page(
@@ -691,8 +690,8 @@ public void testAlignmentWithPadding() throws Exception {
           conf,
           readFooter.getFileMetaData(),
           path,
-          Arrays.asList(readFooter.getBlocks().get(0)),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1)))) {
+          List.of(readFooter.getBlocks().get(0)),
+          List.of(SCHEMA.getColumnDescription(PATH1)))) {
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
         validateContains(SCHEMA, pages, PATH1, 2, BytesInput.from(BYTES1));
@@ -707,7 +706,7 @@ public void testAlignmentWithPadding() throws Exception {
           readFooter.getFileMetaData(),
           path,
           readFooter.getBlocks(),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
+          List.of(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
 
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
@@ -819,8 +818,8 @@ public void testAlignmentWithNoPaddingNeeded() throws Exception {
           conf,
           readFooter.getFileMetaData(),
           path,
-          Arrays.asList(readFooter.getBlocks().get(0)),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1)))) {
+          List.of(readFooter.getBlocks().get(0)),
+          List.of(SCHEMA.getColumnDescription(PATH1)))) {
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
         validateContains(SCHEMA, pages, PATH1, 2, BytesInput.from(BYTES1));
@@ -835,7 +834,7 @@ public void testAlignmentWithNoPaddingNeeded() throws Exception {
           readFooter.getFileMetaData(),
           path,
           readFooter.getBlocks(),
-          Arrays.asList(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
+          List.of(SCHEMA.getColumnDescription(PATH1), SCHEMA.getColumnDescription(PATH2)))) {
         PageReadStore pages = r.readNextRowGroup();
         assertEquals(3, pages.getRowCount());
         validateContains(SCHEMA, pages, PATH1, 2, BytesInput.from(BYTES1));
@@ -1011,14 +1010,14 @@ public void testMetaDataFile() throws Exception {
     validateFooters(metadata);
 
     footers = ParquetFileReader.readAllFootersInParallelUsingSummaryFiles(
-        configuration, Arrays.asList(fs.listStatus(testDirPath, HiddenFileFilter.INSTANCE)), false);
+        configuration, List.of(fs.listStatus(testDirPath, HiddenFileFilter.INSTANCE)), false);
     validateFooters(footers);
 
     fs.delete(metadataFile.getPath(), false);
     fs.delete(metadataFileLight.getPath(), false);
 
     footers = ParquetFileReader.readAllFootersInParallelUsingSummaryFiles(
-        configuration, Arrays.asList(fs.listStatus(testDirPath)), false);
+        configuration, List.of(fs.listStatus(testDirPath)), false);
     validateFooters(footers);
   }
 
@@ -1351,8 +1350,8 @@ private void testColumnIndexWriteRead(int columnIndexTruncateLen) throws Excepti
       ColumnIndex columnIndex =
           reader.readColumnIndex(blockMeta.getColumns().get(0));
       assertEquals(BoundaryOrder.ASCENDING, columnIndex.getBoundaryOrder());
-      assertTrue(Arrays.asList(1l, 0l).equals(columnIndex.getNullCounts()));
-      assertTrue(Arrays.asList(false, false).equals(columnIndex.getNullPages()));
+      assertTrue(List.of(1l, 0l).equals(columnIndex.getNullCounts()));
+      assertTrue(List.of(false, false).equals(columnIndex.getNullPages()));
       List<ByteBuffer> minValues = columnIndex.getMinValues();
       assertEquals(2, minValues.size());
       List<ByteBuffer> maxValues = columnIndex.getMaxValues();
@@ -1364,8 +1363,8 @@ private void testColumnIndexWriteRead(int columnIndexTruncateLen) throws Excepti
 
       columnIndex = reader.readColumnIndex(blockMeta.getColumns().get(1));
       assertEquals(BoundaryOrder.DESCENDING, columnIndex.getBoundaryOrder());
-      assertTrue(Arrays.asList(0l, 3l, 0l).equals(columnIndex.getNullCounts()));
-      assertTrue(Arrays.asList(false, true, false).equals(columnIndex.getNullPages()));
+      assertTrue(List.of(0l, 3l, 0l).equals(columnIndex.getNullCounts()));
+      assertTrue(List.of(false, true, false).equals(columnIndex.getNullPages()));
       minValues = columnIndex.getMinValues();
       assertEquals(3, minValues.size());
       maxValues = columnIndex.getMaxValues();
@@ -1407,8 +1406,8 @@ private void testColumnIndexWriteRead(int columnIndexTruncateLen) throws Excepti
         assertNotNull(reader.readColumnIndex(blockMeta.getColumns().get(0)));
         columnIndex = reader.readColumnIndex(blockMeta.getColumns().get(0));
         assertEquals(BoundaryOrder.ASCENDING, columnIndex.getBoundaryOrder());
-        assertTrue(Arrays.asList(0l).equals(columnIndex.getNullCounts()));
-        assertTrue(Arrays.asList(false).equals(columnIndex.getNullPages()));
+        assertTrue(List.of(0l).equals(columnIndex.getNullCounts()));
+        assertTrue(List.of(false).equals(columnIndex.getNullPages()));
         minValues = columnIndex.getMinValues();
         assertEquals(1, minValues.size());
         maxValues = columnIndex.getMaxValues();
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReader.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReader.java
index 36a8707c90..807e61899a 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReader.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReader.java
@@ -22,12 +22,12 @@
 import static org.apache.parquet.filter2.predicate.FilterApi.longColumn;
 import static org.apache.parquet.hadoop.ParquetFileWriter.Mode.OVERWRITE;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -86,7 +86,7 @@ public TestParquetReader(Path file) throws IOException {
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
     Object[][] data = new Object[][] {{FILE_V1}, {FILE_V2}, {STATIC_FILE_WITHOUT_COL_INDEXES}};
-    return Arrays.asList(data);
+    return List.of(data);
   }
 
   @BeforeClass
@@ -117,7 +117,7 @@ public static List<PhoneBookWriter.User> makeUsers(int rowCount) {
       }
       // row index of each row in the file is same as the user id.
       users.add(new PhoneBookWriter.User(
-          i, "p" + i, Arrays.asList(new PhoneBookWriter.PhoneNumber(i, "cell")), location));
+          i, "p" + i, List.of(new PhoneBookWriter.PhoneNumber(i, "cell")), location));
     }
     return users;
   }
@@ -202,6 +202,38 @@ public void testCurrentRowIndex() throws Exception {
     assertEquals(reader.getCurrentRowIndex(), -1);
   }
 
+  @Test
+  public void testCurrentRowGroupIndex() throws Exception {
+    int expectedRowGroups;
+    try (ParquetFileReader fileReader =
+        ParquetFileReader.open(HadoopInputFile.fromPath(file, new Configuration()))) {
+      expectedRowGroups = fileReader.getRowGroups().size();
+    }
+    assertTrue("expected multiple row groups for this test", expectedRowGroups > 1);
+
+    try (ParquetReader<Group> reader = PhoneBookWriter.createReader(file, FilterCompat.NOOP, allocator)) {
+      // before reading anything, returns -1
+      assertEquals(-1, reader.getCurrentRowGroupIndex());
+
+      reader.read();
+      assertEquals(0, reader.getCurrentRowGroupIndex());
+      // idempotent
+      assertEquals(0, reader.getCurrentRowGroupIndex());
+
+      int prevIdx = 0;
+      while (reader.read() != null) {
+        int idx = reader.getCurrentRowGroupIndex();
+        assertTrue(idx >= prevIdx);
+        assertTrue(idx <= prevIdx + 1);
+        prevIdx = idx;
+      }
+      // last row group seen should be the final one
+      assertEquals(expectedRowGroups - 1, prevIdx);
+      // after exhaustion, returns -1
+      assertEquals(-1, reader.getCurrentRowGroupIndex());
+    }
+  }
+
   @Test
   public void testRangeFiltering() throws Exception {
     // The readUsers also validates the rowIndex for each returned row.
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReaderRandomAccess.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReaderRandomAccess.java
index 17e6181fcd..fb99fa1b35 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReaderRandomAccess.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetReaderRandomAccess.java
@@ -30,7 +30,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
@@ -152,7 +151,7 @@ public DataContext(
       super(path, buildSchema(), blockSize, pageSize, enableDictionary, true, version);
 
       this.random = new Random(seed);
-      this.randomGenerators = Arrays.asList(new SequentialLongGenerator(), new SequentialFlippingLongGenerator());
+      this.randomGenerators = List.of(new SequentialLongGenerator(), new SequentialFlippingLongGenerator());
 
       this.filter = FilterCompat.get(eq(longColumn("i64_flip"), 1L));
     }
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriter.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriter.java
index 03cd98ac6e..a7888b58d8 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriter.java
@@ -18,7 +18,6 @@
  */
 package org.apache.parquet.hadoop;
 
-import static java.util.Arrays.asList;
 import static org.apache.parquet.column.Encoding.DELTA_BYTE_ARRAY;
 import static org.apache.parquet.column.Encoding.PLAIN;
 import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY;
@@ -47,6 +46,7 @@
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -166,7 +166,7 @@ public void test() throws Exception {
     expected.put("1000-" + PARQUET_1_0, PLAIN);
     expected.put("10-" + PARQUET_2_0, RLE_DICTIONARY);
     expected.put("1000-" + PARQUET_2_0, DELTA_BYTE_ARRAY);
-    for (int modulo : asList(10, 1000)) {
+    for (int modulo : List.of(10, 1000)) {
       for (WriterVersion version : WriterVersion.values()) {
         Path file = new Path(root, version.name() + "_" + modulo);
         ParquetWriter<Group> writer = ExampleParquetWriter.builder(new TestOutputFile(file, conf))
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterError.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterError.java
index 51f8a7dd67..c747f99339 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterError.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterError.java
@@ -29,14 +29,18 @@
 import java.util.Random;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.parquet.bytes.DirectByteBufferAllocator;
+import org.apache.parquet.bytes.HeapByteBufferAllocator;
 import org.apache.parquet.bytes.TrackingByteBufferAllocator;
 import org.apache.parquet.column.ParquetProperties;
 import org.apache.parquet.example.data.Group;
+import org.apache.parquet.example.data.simple.SimpleGroupFactory;
 import org.apache.parquet.filter2.recordlevel.PhoneBookWriter;
 import org.apache.parquet.hadoop.codec.CleanUtil;
 import org.apache.parquet.hadoop.example.ExampleParquetWriter;
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
 import org.apache.parquet.io.LocalOutputFile;
+import org.apache.parquet.schema.MessageType;
+import org.apache.parquet.schema.MessageTypeParser;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -58,6 +62,48 @@ public class TestParquetWriterError {
   @Rule
   public TemporaryFolder tmpFolder = new TemporaryFolder();
 
+  @Test
+  public void testWriteAfterAbortShouldThrow() throws Exception {
+    java.nio.file.Path outputFile = tmpFolder.newFile("abort_test.parquet").toPath();
+    MessageType schema =
+        MessageTypeParser.parseMessageType("message test { required binary name; required int32 age; }");
+    SimpleGroupFactory groupFactory = new SimpleGroupFactory(schema);
+
+    try (TrackingByteBufferAllocator allocator = TrackingByteBufferAllocator.wrap(new HeapByteBufferAllocator())) {
+      ParquetWriter<Group> writer = ExampleParquetWriter.builder(new LocalOutputFile(outputFile))
+          .withType(schema)
+          .withAllocator(allocator)
+          .withWriteMode(ParquetFileWriter.Mode.OVERWRITE)
+          .build();
+
+      // Write one valid record
+      writer.write(groupFactory.newGroup().append("name", "Alice").append("age", 30));
+
+      // Simulate an aborted state by reflectively setting the aborted flag
+      // on the internal writer. This mirrors what happens when a write fails
+      // with an exception (e.g. OOM during page flush).
+      Field internalWriterField = ParquetWriter.class.getDeclaredField("writer");
+      internalWriterField.setAccessible(true);
+      InternalParquetRecordWriter<?> internalWriter =
+          (InternalParquetRecordWriter<?>) internalWriterField.get(writer);
+      Field abortedField = InternalParquetRecordWriter.class.getDeclaredField("aborted");
+      abortedField.setAccessible(true);
+      abortedField.setBoolean(internalWriter, true);
+
+      // Now try to write again - this should throw IOException
+      IOException e = Assert.assertThrows(
+          "Expected IOException when writing to an aborted writer",
+          IOException.class,
+          () -> writer.write(
+              groupFactory.newGroup().append("name", "Charlie").append("age", 25)));
+      Assert.assertTrue(
+          "Error message should mention aborted state", e.getMessage().contains("aborted"));
+
+      // Close should not throw (it should silently skip flushing due to aborted state)
+      writer.close();
+    }
+  }
+
   @Test
   public void testInSeparateProcess() throws IOException, InterruptedException {
     String outputFile = tmpFolder.newFile("out.parquet").toString();
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterNewPage.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterNewPage.java
index 4c63efa198..f05d59f272 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterNewPage.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetWriterNewPage.java
@@ -18,7 +18,6 @@
  */
 package org.apache.parquet.hadoop;
 
-import static java.util.Arrays.asList;
 import static org.apache.parquet.column.Encoding.DELTA_BYTE_ARRAY;
 import static org.apache.parquet.column.Encoding.PLAIN;
 import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY;
@@ -33,6 +32,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
@@ -79,7 +79,7 @@ public void test() throws Exception {
     expected.put("1000-" + PARQUET_1_0, PLAIN);
     expected.put("10-" + PARQUET_2_0, RLE_DICTIONARY);
     expected.put("1000-" + PARQUET_2_0, DELTA_BYTE_ARRAY);
-    for (int modulo : asList(10, 1000)) {
+    for (int modulo : List.of(10, 1000)) {
       for (WriterVersion version : WriterVersion.values()) {
         Path file = new Path(root, version.name() + "_" + modulo);
         ParquetWriter<Group> writer = new ParquetWriter<Group>(
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestStoreBloomFilter.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestStoreBloomFilter.java
index 701dcc4193..e80d9ff3dc 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestStoreBloomFilter.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestStoreBloomFilter.java
@@ -24,7 +24,6 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -62,7 +61,7 @@ public TestStoreBloomFilter(Path file, String version) {
 
   @Parameterized.Parameters(name = "Run {index}: parquet {1}")
   public static Collection<Object[]> params() {
-    return Arrays.asList(new Object[] {FILE_V1, "v1"}, new Object[] {FILE_V2, "v2"});
+    return List.of(new Object[] {FILE_V1, "v1"}, new Object[] {FILE_V2, "v2"});
   }
 
   @BeforeClass
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/example/TestInputOutputFormat.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/example/TestInputOutputFormat.java
index 61f68a9231..f40e224e5b 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/example/TestInputOutputFormat.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/example/TestInputOutputFormat.java
@@ -31,7 +31,6 @@
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -91,7 +90,7 @@ public class TestInputOutputFormat {
 
   @Parameterized.Parameters(name = "vectored : {0}")
   public static List<Boolean> params() {
-    return Arrays.asList(true, false);
+    return List.of(true, false);
   }
 
   /**
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/rewrite/ParquetRewriterTest.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/rewrite/ParquetRewriterTest.java
index a2cb721767..a888ac2f4c 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/rewrite/ParquetRewriterTest.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/rewrite/ParquetRewriterTest.java
@@ -314,7 +314,7 @@ private void testPruneEncryptTranslateCodec(List<Path> inputPaths) throws Except
     String[] encryptColumns = {"DocId"};
     FileEncryptionProperties fileEncryptionProperties =
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false);
-    builder.encrypt(Arrays.asList(encryptColumns)).encryptionProperties(fileEncryptionProperties);
+    builder.encrypt(List.of(encryptColumns)).encryptionProperties(fileEncryptionProperties);
 
     builder.indexCacheStrategy(indexCacheStrategy);
 
@@ -345,7 +345,7 @@ private void testPruneEncryptTranslateCodec(List<Path> inputPaths) throws Except
     ParquetMetadata metaData = getFileMetaData(outputFile, fileDecryptionProperties);
     assertFalse(metaData.getBlocks().isEmpty());
     List<ColumnChunkMetaData> columns = metaData.getBlocks().get(0).getColumns();
-    Set<String> set = new HashSet<>(Arrays.asList(encryptColumns));
+    Set<String> set = new HashSet<>(List.of(encryptColumns));
     for (ColumnChunkMetaData column : columns) {
       if (set.contains(column.getPath().toDotString())) {
         assertTrue(column.isEncrypted());
@@ -477,7 +477,7 @@ private void testNullifyAndEncryptColumn(List<Path> inputPaths) throws Exception
 
     RewriteOptions options = builder.mask(maskColumns)
         .transform(CompressionCodecName.ZSTD)
-        .encrypt(Arrays.asList(encryptColumns))
+        .encrypt(List.of(encryptColumns))
         .encryptionProperties(fileEncryptionProperties)
         .indexCacheStrategy(indexCacheStrategy)
         .build();
@@ -508,7 +508,7 @@ private void testNullifyAndEncryptColumn(List<Path> inputPaths) throws Exception
     // Verify the column is encrypted
     ParquetMetadata metaData = getFileMetaData(outputFile, fileDecryptionProperties);
     assertFalse(metaData.getBlocks().isEmpty());
-    Set<String> encryptedColumns = new HashSet<>(Arrays.asList(encryptColumns));
+    Set<String> encryptedColumns = new HashSet<>(List.of(encryptColumns));
     for (BlockMetaData blockMetaData : metaData.getBlocks()) {
       List<ColumnChunkMetaData> columns = blockMetaData.getColumns();
       for (ColumnChunkMetaData column : columns) {
@@ -610,7 +610,7 @@ public void testMergeTwoFilesOnlyRenameColumn() throws Exception {
         .renameColumns(ImmutableMap.of("Name", "NameRenamed"))
         .prune(pruneColumns)
         .transform(CompressionCodecName.SNAPPY)
-        .encrypt(Arrays.asList(encryptColumns))
+        .encrypt(List.of(encryptColumns))
         .encryptionProperties(fileEncryptionProperties)
         .build();
 
@@ -637,7 +637,7 @@ public void testMergeTwoFilesOnlyRenameColumn() throws Exception {
 
     ParquetMetadata metaData = getFileMetaData(outputFile, fileDecryptionProperties);
     assertFalse(metaData.getBlocks().isEmpty());
-    Set<String> encryptedColumns = new HashSet<>(Arrays.asList(encryptColumns));
+    Set<String> encryptedColumns = new HashSet<>(List.of(encryptColumns));
     for (BlockMetaData blockMetaData : metaData.getBlocks()) {
       List<ColumnChunkMetaData> columns = blockMetaData.getColumns();
       for (ColumnChunkMetaData column : columns) {
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnEncryptorTest.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnEncryptorTest.java
index ac3e89054e..0f43ff5991 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnEncryptorTest.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnEncryptorTest.java
@@ -30,7 +30,6 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -86,7 +85,7 @@ public void testFlatColumn() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
     verifyResultDecryptionWithValidKey();
   }
@@ -98,7 +97,7 @@ public void testNestedColumn() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
     verifyResultDecryptionWithValidKey();
   }
@@ -110,7 +109,7 @@ public void testNoEncryption() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
     verifyResultDecryptionWithValidKey();
   }
@@ -122,7 +121,7 @@ public void testEncryptAllColumns() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
     verifyResultDecryptionWithValidKey();
   }
@@ -134,13 +133,13 @@ public void testEncryptSomeColumns() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
 
     ParquetMetadata metaData = getParquetMetadata(EncDecProperties.getFileDecryptionProperties());
     assertFalse(metaData.getBlocks().isEmpty());
     List<ColumnChunkMetaData> columns = metaData.getBlocks().get(0).getColumns();
-    Set<String> set = new HashSet<>(Arrays.asList(encryptColumns));
+    Set<String> set = new HashSet<>(List.of(encryptColumns));
     for (ColumnChunkMetaData column : columns) {
       if (set.contains(column.getPath().toDotString())) {
         assertTrue(column.isEncrypted());
@@ -157,7 +156,7 @@ public void testFooterEncryption() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, true));
 
     verifyResultDecryptionWithValidKey();
@@ -170,7 +169,7 @@ public void testAesGcm() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_V1, true));
 
     verifyResultDecryptionWithValidKey();
@@ -183,7 +182,7 @@ public void testColumnIndex() throws IOException {
     columnEncryptor.encryptColumns(
         inputFile.getFileName(),
         outputFile,
-        Arrays.asList(encryptColumns),
+        List.of(encryptColumns),
         EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_V1, false));
 
     verifyResultDecryptionWithValidKey();
@@ -199,7 +198,7 @@ public void testDifferentCompression() throws IOException {
       columnEncryptor.encryptColumns(
           inputFile.getFileName(),
           outputFile,
-          Arrays.asList(encryptColumns),
+          List.of(encryptColumns),
           EncDecProperties.getFileEncryptionProperties(encryptColumns, ParquetCipher.AES_GCM_CTR_V1, false));
       verifyResultDecryptionWithValidKey();
     }
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnPrunerTest.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnPrunerTest.java
index c6be468ade..0582cabbb3 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnPrunerTest.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/util/ColumnPrunerTest.java
@@ -28,7 +28,6 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.Arrays;
 import java.util.List;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -61,7 +60,7 @@ public void testPruneOneColumn() throws Exception {
     String outputFile = createTempFile("output");
 
     // Remove column Gender
-    List<String> cols = Arrays.asList("Gender");
+    List<String> cols = List.of("Gender");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
 
     // Verify the schema are not changed for the columns not pruned
@@ -79,7 +78,7 @@ public void testPruneOneColumn() throws Exception {
     assertEquals(subFields.get(1).getName(), "Forward");
 
     // Verify the data are not changed for the columns not pruned
-    List<String> prunePaths = Arrays.asList("Gender");
+    List<String> prunePaths = List.of("Gender");
     validateColumns(inputFile, prunePaths);
   }
 
@@ -91,7 +90,7 @@ public void testPruneMultiColumns() throws Exception {
 
     // Remove columns
     String cargs[] = {inputFile, outputFile, "Name", "Gender"};
-    List<String> cols = Arrays.asList("Name", "Gender");
+    List<String> cols = List.of("Name", "Gender");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
 
     // Verify the schema are not changed for the columns not pruned
@@ -108,7 +107,7 @@ public void testPruneMultiColumns() throws Exception {
     assertEquals(subFields.get(1).getName(), "Forward");
 
     // Verify the data are not changed for the columns not pruned
-    List<String> prunePaths = Arrays.asList("Name", "Gender");
+    List<String> prunePaths = List.of("Name", "Gender");
     validateColumns(inputFile, prunePaths);
   }
 
@@ -117,7 +116,7 @@ public void testNotExistsColumn() throws Exception {
     // Create Parquet file
     String inputFile = createParquetFile("input");
     String outputFile = createTempFile("output");
-    List<String> cols = Arrays.asList("no_exist");
+    List<String> cols = List.of("no_exist");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
   }
 
@@ -128,7 +127,7 @@ public void testPruneNestedColumn() throws Exception {
     String outputFile = createTempFile("output");
 
     // Remove nested column
-    List<String> cols = Arrays.asList("Links.Backward");
+    List<String> cols = List.of("Links.Backward");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
 
     // Verify the schema are not changed for the columns not pruned
@@ -146,7 +145,7 @@ public void testPruneNestedColumn() throws Exception {
     assertEquals(subFields.get(0).getName(), "Forward");
 
     // Verify the data are not changed for the columns not pruned
-    List<String> prunePaths = Arrays.asList("Links.Backward");
+    List<String> prunePaths = List.of("Links.Backward");
     validateColumns(inputFile, prunePaths);
   }
 
@@ -157,7 +156,7 @@ public void testPruneNestedParentColumn() throws Exception {
     String outputFile = createTempFile("output");
 
     // Remove parent column. All of it's children will be removed.
-    List<String> cols = Arrays.asList("Links");
+    List<String> cols = List.of("Links");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
 
     // Verify the schema are not changed for the columns not pruned
@@ -171,7 +170,7 @@ public void testPruneNestedParentColumn() throws Exception {
     assertEquals(fields.get(2).getName(), "Gender");
 
     // Verify the data are not changed for the columns not pruned
-    List<String> prunePaths = Arrays.asList("Links");
+    List<String> prunePaths = List.of("Links");
     validateColumns(inputFile, prunePaths);
   }
 
@@ -180,7 +179,7 @@ public void testNotExistsNestedColumn() throws Exception {
     // Create Parquet file
     String inputFile = createParquetFile("input");
     String outputFile = createTempFile("output");
-    List<String> cols = Arrays.asList("Links.Not_exists");
+    List<String> cols = List.of("Links.Not_exists");
     columnPruner.pruneColumns(conf, new Path(inputFile), new Path(outputFile), cols);
   }
 
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestColumnIndexes.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestColumnIndexes.java
index 6573c409e2..8af975e3ed 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestColumnIndexes.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestColumnIndexes.java
@@ -323,7 +323,7 @@ public String toString() {
 
   @Parameters
   public static Collection<WriteContext> getContexts() {
-    return Arrays.asList(
+    return List.of(
         new WriteContext(System.nanoTime(), 1000, 8),
         new WriteContext(System.nanoTime(), 20000, 64),
         new WriteContext(System.nanoTime(), 50000, 10));
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16ReadWriteRoundTrip.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16ReadWriteRoundTrip.java
index 9bbc6d1c64..b391823d41 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16ReadWriteRoundTrip.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16ReadWriteRoundTrip.java
@@ -21,11 +21,11 @@
 import static org.apache.parquet.schema.LogicalTypeAnnotation.float16Type;
 import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -123,37 +123,25 @@ public class TestFloat16ReadWriteRoundTrip {
     Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x7c})
   }; // Infinity
 
-  private Binary[] valuesAllPositiveZeroMinMax = {
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x00}), // +0
+  private Binary[] valuesAllZeroMinMax = {
+    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x80}), // -0
     Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x00})
   }; // +0
 
-  private Binary[] valuesAllNegativeZeroMinMax = {
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x80}), // -0
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x80})
-  }; // -0
-
-  private Binary[] valuesWithNaNMinMax = {
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0xc0}), // -2.0
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x7e})
-  }; // NaN
-
   @Test
   public void testFloat16ColumnIndex() throws IOException {
-    List<Binary[]> testValues = Arrays.asList(
+    List<Binary[]> testValues = List.of(
         valuesInAscendingOrder,
         valuesInDescendingOrder,
         valuesUndefinedOrder,
         valuesAllPositiveZero,
-        valuesAllNegativeZero,
-        valuesWithNaN);
-    List<Binary[]> expectedValues = Arrays.asList(
+        valuesAllNegativeZero);
+    List<Binary[]> expectedValues = List.of(
         valuesInAscendingOrderMinMax,
         valuesInDescendingOrderMinMax,
         valuesUndefinedOrderMinMax,
-        valuesAllPositiveZeroMinMax,
-        valuesAllNegativeZeroMinMax,
-        valuesWithNaNMinMax);
+        valuesAllZeroMinMax,
+        valuesAllZeroMinMax);
 
     for (int i = 0; i < testValues.size(); i++) {
       MessageType schema = Types.buildMessage()
@@ -188,6 +176,37 @@ public void testFloat16ColumnIndex() throws IOException {
     }
   }
 
+  @Test
+  public void testFloat16NanColumnIndex() throws IOException {
+    MessageType schema = Types.buildMessage()
+        .required(FIXED_LEN_BYTE_ARRAY)
+        .as(float16Type())
+        .length(2)
+        .named("col_float16")
+        .named("msg");
+
+    Configuration conf = new Configuration();
+    GroupWriteSupport.setSchema(schema, conf);
+    GroupFactory factory = new SimpleGroupFactory(schema);
+    Path path = newTempPath();
+    try (ParquetWriter<Group> writer = ExampleParquetWriter.builder(path)
+        .withConf(conf)
+        .withDictionaryEncoding(false)
+        .build()) {
+
+      for (Binary value : valuesWithNaN) {
+        writer.write(factory.newGroup().append("col_float16", value));
+      }
+    }
+
+    try (ParquetFileReader reader = ParquetFileReader.open(HadoopInputFile.fromPath(path, new Configuration()))) {
+      ColumnChunkMetaData column =
+          reader.getFooter().getBlocks().get(0).getColumns().get(0);
+      ColumnIndex index = reader.readColumnIndex(column);
+      assertNull(index);
+    }
+  }
+
   private Path newTempPath() throws IOException {
     File file = temp.newFile();
     Preconditions.checkArgument(file.delete(), "Could not remove temp file");
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16Statistics.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16Statistics.java
index 5e82740a4a..38d362d5f5 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16Statistics.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestFloat16Statistics.java
@@ -24,7 +24,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -136,19 +135,19 @@ public class TestFloat16Statistics {
   // Float16Builder: Drop min/max values in case of NaN as the sorting order of values is undefined
   private Binary[] valuesWithNaNStatsMinMax = {
     Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x00}), // +0
-    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x80})
-  }; // -0
+    Binary.fromConstantByteArray(new byte[] {(byte) 0x00, (byte) 0x00})
+  }; // +0
 
   @Test
   public void testFloat16StatisticsMultipleCases() throws IOException {
-    List<Binary[]> testValues = Arrays.asList(
+    List<Binary[]> testValues = List.of(
         valuesInAscendingOrder,
         valuesInDescendingOrder,
         valuesUndefinedOrder,
         valuesAllPositiveZero,
         valuesAllNegativeZero,
         valuesWithNaN);
-    List<Binary[]> expectedValues = Arrays.asList(
+    List<Binary[]> expectedValues = List.of(
         valuesInAscendingOrderMinMax,
         valuesInDescendingOrderMinMax,
         valuesUndefinedOrderMinMax,
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestSizeStatisticsRoundTrip.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestSizeStatisticsRoundTrip.java
index 026e13a3b0..0906d7cf23 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestSizeStatisticsRoundTrip.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestSizeStatisticsRoundTrip.java
@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -141,12 +141,12 @@ public void testNestedRepeatedOptionalColumnSizeStatistics() throws IOException
 
       SizeStatistics sizeStatistics = column.getSizeStatistics();
       Assert.assertEquals(Optional.of(3L), sizeStatistics.getUnencodedByteArrayDataBytes());
-      Assert.assertEquals(Arrays.asList(2L, 1L), sizeStatistics.getRepetitionLevelHistogram());
-      Assert.assertEquals(Arrays.asList(0L, 0L, 0L, 3L), sizeStatistics.getDefinitionLevelHistogram());
+      Assert.assertEquals(List.of(2L, 1L), sizeStatistics.getRepetitionLevelHistogram());
+      Assert.assertEquals(List.of(0L, 0L, 0L, 3L), sizeStatistics.getDefinitionLevelHistogram());
 
       ColumnIndex columnIndex = reader.readColumnIndex(column);
-      Assert.assertEquals(Arrays.asList(2L, 1L), sizeStatistics.getRepetitionLevelHistogram());
-      Assert.assertEquals(Arrays.asList(0L, 0L, 0L, 3L), sizeStatistics.getDefinitionLevelHistogram());
+      Assert.assertEquals(List.of(2L, 1L), sizeStatistics.getRepetitionLevelHistogram());
+      Assert.assertEquals(List.of(0L, 0L, 0L, 3L), sizeStatistics.getDefinitionLevelHistogram());
 
       OffsetIndex offsetIndex = reader.readOffsetIndex(column);
       Assert.assertEquals(1, offsetIndex.getPageCount());
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestStatistics.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestStatistics.java
index abca17edea..16e93d6e07 100644
--- a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestStatistics.java
+++ b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestStatistics.java
@@ -35,7 +35,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
@@ -346,7 +345,7 @@ public DataContext(
 
       int fixedLength = schema.getType("fixed-binary").asPrimitiveType().getTypeLength();
 
-      randomGenerators = Arrays.<RandomValueGenerator<?>>asList(
+      randomGenerators = List.<RandomValueGenerator<?>>of(
           new RandomValues.IntGenerator(random.nextLong()),
           new RandomValues.LongGenerator(random.nextLong()),
           new RandomValues.Int96Generator(random.nextLong()),
@@ -545,7 +544,7 @@ public void testStatistics() throws IOException {
     int blockSize = (random.nextInt(54) + 10) * MEGABYTE;
     int pageSize = (random.nextInt(10) + 1) * MEGABYTE;
 
-    List<DataContext> contexts = Arrays.asList(
+    List<DataContext> contexts = List.of(
         new DataContext(
             random.nextLong(),
             file,
@@ -592,7 +591,7 @@ public void testDisableStatistics() throws IOException {
     int blockSize = (random.nextInt(54) + 10) * MEGABYTE;
     int pageSize = (random.nextInt(10) + 1) * MEGABYTE;
 
-    List<DataContext> contexts = Arrays.asList(
+    List<DataContext> contexts = List.of(
         new DataContext(
             random.nextLong(),
             file,
diff --git a/parquet-jackson/pom.xml b/parquet-jackson/pom.xml
index cd1463ac04..89ae96991f 100644
--- a/parquet-jackson/pom.xml
+++ b/parquet-jackson/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>${jackson.groupId}</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${jackson-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/parquet-plugins/parquet-encoding-vector/pom.xml b/parquet-plugins/parquet-encoding-vector/pom.xml
index 822838d860..bf621eb10d 100644
--- a/parquet-plugins/parquet-encoding-vector/pom.xml
+++ b/parquet-plugins/parquet-encoding-vector/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -105,7 +105,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.2</version>
       </plugin>
 
       <plugin>
diff --git a/parquet-plugins/parquet-encoding-vector/src/test/java/org/apache/parquet/column/values/bitpacking/TestByteBitPacking512VectorLE.java b/parquet-plugins/parquet-encoding-vector/src/test/java/org/apache/parquet/column/values/bitpacking/TestByteBitPacking512VectorLE.java
index 8664b8f81b..3a510d2696 100644
--- a/parquet-plugins/parquet-encoding-vector/src/test/java/org/apache/parquet/column/values/bitpacking/TestByteBitPacking512VectorLE.java
+++ b/parquet-plugins/parquet-encoding-vector/src/test/java/org/apache/parquet/column/values/bitpacking/TestByteBitPacking512VectorLE.java
@@ -22,8 +22,9 @@
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import org.junit.Assume;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -41,30 +42,31 @@ public void unpackValuesUsingVector() {
   }
 
   private void unpackValuesUsingVectorBitWidth(int bitWidth) {
-    List<int[]> intInputs = getRangeData(bitWidth);
-
-    for (int[] intInput : intInputs) {
-      int pack8Count = intInput.length / 8;
-      int byteOutputSize = pack8Count * bitWidth;
-      byte[] byteOutput = new byte[byteOutputSize];
-      int[] output1 = new int[intInput.length];
-      int[] output2 = new int[intInput.length];
-      int[] output3 = new int[intInput.length];
-
-      BytePacker bytePacker = Packer.LITTLE_ENDIAN.newBytePacker(bitWidth);
-      for (int i = 0; i < pack8Count; i++) {
-        bytePacker.pack8Values(intInput, 8 * i, byteOutput, bitWidth * i);
-      }
+    try (Stream<int[]> intInputs = getRangeData(bitWidth)) {
+      intInputs.forEach(intInput -> {
+        int pack8Count = intInput.length / 8;
+        int byteOutputSize = pack8Count * bitWidth;
+        byte[] byteOutput = new byte[byteOutputSize];
+        int[] output = new int[intInput.length];
+
+        BytePacker bytePacker = Packer.LITTLE_ENDIAN.newBytePacker(bitWidth);
+        for (int i = 0; i < pack8Count; i++) {
+          bytePacker.pack8Values(intInput, 8 * i, byteOutput, bitWidth * i);
+        }
 
-      unpack8Values(bitWidth, byteOutput, output1);
-      unpackValuesUsingVectorArray(bitWidth, byteOutput, output2);
+        unpack8Values(bitWidth, byteOutput, output);
+        assertArrayEquals(intInput, output);
+        Arrays.fill(output, 0);
 
-      ByteBuffer byteBuffer = ByteBuffer.wrap(byteOutput);
-      unpackValuesUsingVectorByteBuffer(bitWidth, byteBuffer, output3);
+        unpackValuesUsingVectorArray(bitWidth, byteOutput, output);
+        assertArrayEquals(intInput, output);
+        Arrays.fill(output, 0);
 
-      assertArrayEquals(intInput, output1);
-      assertArrayEquals(intInput, output2);
-      assertArrayEquals(intInput, output3);
+        ByteBuffer byteBuffer = ByteBuffer.wrap(byteOutput);
+        unpackValuesUsingVectorByteBuffer(bitWidth, byteBuffer, output);
+        assertArrayEquals(intInput, output);
+        Arrays.fill(output, 0);
+      });
     }
   }
 
@@ -119,8 +121,7 @@ public void unpackValuesUsingVectorByteBuffer(int bitWidth, ByteBuffer input, in
     }
   }
 
-  private List<int[]> getRangeData(int bitWidth) {
-    List<int[]> result = new ArrayList<>();
+  private Stream<int[]> getRangeData(int bitWidth) {
     int itemMax = 268435456;
 
     long maxValue = getMaxValue(bitWidth);
@@ -131,9 +132,11 @@ private List<int[]> getRangeData(int bitWidth) {
       ++itemCount;
     }
 
-    for (int i = 0; i < itemCount; i++) {
+    final int finalItemCount = itemCount;
+
+    return IntStream.range(0, finalItemCount).mapToObj(i -> {
       int len;
-      if ((i == itemCount - 1) && mode != 0) {
+      if ((i == finalItemCount - 1) && mode != 0) {
         len = mode;
       } else {
         len = itemMax;
@@ -162,9 +165,8 @@ private List<int[]> getRangeData(int bitWidth) {
         array[j] = value;
         j++;
       }
-      result.add(array);
-    }
-    return result;
+      return array;
+    });
   }
 
   private long getMaxValue(int bitWidth) {
diff --git a/parquet-plugins/parquet-plugins-benchmarks/pom.xml b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
index a8360a8c73..64ed81a3c9 100644
--- a/parquet-plugins/parquet-plugins-benchmarks/pom.xml
+++ b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index cddd2dc166..4d2f678423 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <properties>
     <elephant-bird.version>4.4</elephant-bird.version>
-    <protobuf.version>4.33.2</protobuf.version>
+    <protobuf.version>4.34.1</protobuf.version>
     <common-protos.version>2.59.2</common-protos.version>  <!-- make sure it's compatible with protobuf.version -->
     <truth-proto-extension.version>1.4.4</truth-proto-extension.version>
   </properties>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index ade1ec3cdc..9a273769ab 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -77,6 +77,12 @@
       <version>${guava.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.twitter.elephantbird</groupId>
       <artifactId>elephant-bird-core</artifactId>
@@ -115,7 +121,7 @@
     <dependency>
       <groupId>${jackson.groupId}</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${jackson-annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
@@ -127,7 +133,7 @@
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-pig</artifactId>
-      <version>1.15.0</version>
+      <version>1.15.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.pig</groupId>
@@ -159,7 +165,7 @@
            If that deprecated class is removed, so can this dependency -->
       <groupId>com.google.re2j</groupId>
       <artifactId>re2j</artifactId>
-      <version>1.7</version>
+      <version>1.8</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -206,6 +212,25 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.6.0</version>
+        <executions>
+          <execution>
+            <id>add-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/thrift</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
index 8f9faf160f..fd89ddc1cf 100644
--- a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
+++ b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
@@ -145,7 +145,7 @@ public void testToProjectedThriftType() {
   message TestStructInMap {
   optional binary name(UTF8);
   optional group names(MAP) {
-  repeated group map(MAP_KEY_VALUE) {
+  repeated group map {
   required binary key(UTF8);
   optional group value {
   optional group name {
@@ -153,7 +153,7 @@ repeated group map(MAP_KEY_VALUE) {
   optional binary last_name(UTF8);
   }
   optional group phones(MAP) {
-  repeated group map(MAP_KEY_VALUE) {
+  repeated group map {
   required binary key(ENUM);
   optional binary value(UTF8);
   }
@@ -171,7 +171,7 @@ public void testProjectMapThriftType() {
         "name;names.key*;names.value",
         "message ParquetSchema {\n" + "  optional binary name (UTF8) = 1;\n"
             + "  optional group names (MAP) = 2 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      optional group value {\n"
             + "        optional group name = 1 {\n"
@@ -179,7 +179,7 @@ public void testProjectMapThriftType() {
             + "          optional binary last_name (UTF8) = 2;\n"
             + "        }\n"
             + "        optional group phones (MAP) = 2 {\n"
-            + "          repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "          repeated group key_value {\n"
             + "            required binary key (ENUM);\n"
             + "            optional binary value (UTF8);\n"
             + "          }\n"
@@ -196,7 +196,7 @@ public void testProjectMapThriftType() {
         "name;names.key;names.value.name",
         "message ParquetSchema {\n" + "  optional binary name (UTF8) = 1;\n"
             + "  optional group names (MAP) = 2 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      optional group value {\n"
             + "        optional group name = 1 {\n"
@@ -217,7 +217,7 @@ public void testProjectOnlyKeyInMap() {
         "name;names.key",
         "message ParquetSchema {\n" + "  optional binary name (UTF8) = 1;\n"
             + "  optional group names (MAP) = 2 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required binary key (UTF8);\n"
             + "      optional group value {\n"
             + "        optional group name = 1 {\n"
diff --git a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
index 4a2edd7d7f..151e51cc30 100644
--- a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
+++ b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
@@ -315,7 +315,7 @@ public void testMapWithUnionKey() {
         "optMapWithUnionKey/key/**",
         "optMapWithUnionKey.key",
         "message ParquetSchema {\n" + "  optional group optMapWithUnionKey (MAP) = 1 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required group key {\n"
             + "        optional group structV3 = 1 {\n"
             + "          required binary name (UTF8) = 1;\n"
@@ -348,7 +348,7 @@ public void testMapWithUnionKey() {
         "optMapWithUnionKey/key/**;optMapWithUnionKey/value/gender",
         "optMapWithUnionKey.{key,value.gender}",
         "message ParquetSchema {\n" + "  optional group optMapWithUnionKey (MAP) = 1 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required group key {\n"
             + "        optional group structV3 = 1 {\n"
             + "          required binary name (UTF8) = 1;\n"
@@ -384,7 +384,7 @@ public void testMapWithUnionValue() {
         "optMapWithUnionValue/key/**;optMapWithUnionValue/value/structV4/addedStruct/gender",
         "optMapWithUnionValue.{key,value.structV4.addedStruct.gender}",
         "message ParquetSchema {\n" + "  optional group optMapWithUnionValue (MAP) = 1 {\n"
-            + "    repeated group key_value (MAP_KEY_VALUE) {\n"
+            + "    repeated group key_value {\n"
             + "      required group key {\n"
             + "        required binary name (UTF8) = 1;\n"
             + "        optional binary age (UTF8) = 2;\n"
diff --git a/parquet-thrift/src/test/java/org/apache/parquet/thrift/projection/TestStrictFieldProjectionFilter.java b/parquet-thrift/src/test/java/org/apache/parquet/thrift/projection/TestStrictFieldProjectionFilter.java
index cee9e9bbd7..f0a8ba53da 100644
--- a/parquet-thrift/src/test/java/org/apache/parquet/thrift/projection/TestStrictFieldProjectionFilter.java
+++ b/parquet-thrift/src/test/java/org/apache/parquet/thrift/projection/TestStrictFieldProjectionFilter.java
@@ -18,11 +18,12 @@
  */
 package org.apache.parquet.thrift.projection;
 
-import static org.easymock.EasyMock.createMockBuilder;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import java.util.Arrays;
 import java.util.List;
@@ -112,23 +113,20 @@ public void testIsStrict() {
 
   @Test
   public void testWarnWhenMultiplePatternsMatch() {
-    StrictFieldProjectionFilter filter = createMockBuilder(StrictFieldProjectionFilter.class)
-        .withConstructor(Arrays.asList("a.b.c.{x_average,z_average}", "a.*_average"))
-        .addMockedMethod("warn")
-        .createMock();
-
-    // set expectations
-    filter.warn("Field path: 'a.b.c.x_average' matched more than one glob path pattern. "
-        + "First match: 'a.b.c.{x_average,z_average}' (when expanded to 'a.b.c.x_average') "
-        + "second match:'a.*_average' (when expanded to 'a.*_average')");
-    filter.warn("Field path: 'a.b.c.z_average' matched more than one glob path pattern. "
-        + "First match: 'a.b.c.{x_average,z_average}' (when expanded to 'a.b.c.z_average') "
-        + "second match:'a.*_average' (when expanded to 'a.*_average')");
-
-    replay(filter);
+    StrictFieldProjectionFilter filter =
+        spy(new StrictFieldProjectionFilter(Arrays.asList("a.b.c.{x_average,z_average}", "a.*_average")));
+    doNothing().when(filter).warn(anyString());
 
     assertMatches(filter, "a.b.c.x_average", "a.b.c.z_average", "a.other.w_average");
     assertDoesNotMatch(filter, "hello");
-    verify(filter);
+
+    verify(filter)
+        .warn("Field path: 'a.b.c.x_average' matched more than one glob path pattern. "
+            + "First match: 'a.b.c.{x_average,z_average}' (when expanded to 'a.b.c.x_average') "
+            + "second match:'a.*_average' (when expanded to 'a.*_average')");
+    verify(filter)
+        .warn("Field path: 'a.b.c.z_average' matched more than one glob path pattern. "
+            + "First match: 'a.b.c.{x_average,z_average}' (when expanded to 'a.b.c.z_average') "
+            + "second match:'a.*_average' (when expanded to 'a.*_average')");
   }
 }
diff --git a/parquet-variant/pom.xml b/parquet-variant/pom.xml
index 8f0bed6d6a..31f29d096a 100644
--- a/parquet-variant/pom.xml
+++ b/parquet-variant/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.parquet</groupId>
     <artifactId>parquet</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.17.0-SNAPSHOT</version>
+    <version>1.18.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index a4c3701df9..445d34168b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,12 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>33</version>
+    <version>37</version>
   </parent>
 
   <groupId>org.apache.parquet</groupId>
   <artifactId>parquet</artifactId>
-  <version>1.17.0-SNAPSHOT</version>
+  <version>1.18.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Parquet Java</name>
@@ -75,16 +75,17 @@
     <jackson.datatype.groupId>com.fasterxml.jackson.datatype</jackson.datatype.groupId>
     <jackson.package>com.fasterxml.jackson</jackson.package>
     <!-- To upgrade jackson, check the jdk versions inside the jar and include any new versions in the shading in parquet-jackson. -->
-    <jackson.version>2.19.2</jackson.version>
-    <jackson-databind.version>2.19.2</jackson-databind.version>
-    <japicmp.version>0.23.1</japicmp.version>
+    <jackson.version>2.21.2</jackson.version>
+    <jackson-databind.version>2.21.2</jackson-databind.version>
+    <jackson-annotations.version>2.21</jackson-annotations.version>
+    <japicmp.version>0.25.6</japicmp.version>
     <javax.annotation.version>1.3.2</javax.annotation.version>
-    <spotless.version>2.30.0</spotless.version>
+    <spotless.version>2.46.1</spotless.version>
     <shade.prefix>shaded.parquet</shade.prefix>
     <!-- Guarantees no newer classes/methods/constants are used by parquet. -->
     <hadoop.version>3.3.0</hadoop.version>
     <parquet.format.version>2.12.0</parquet.format.version>
-    <previous.version>1.16.0</previous.version>
+    <previous.version>1.17.0</previous.version>
     <thrift.executable>thrift</thrift.executable>
     <format.thrift.executable>${thrift.executable}</format.thrift.executable>
     <pig.version>0.16.0</pig.version>
@@ -92,26 +93,25 @@
     <thrift-maven-plugin.version>0.10.0</thrift-maven-plugin.version>
     <thrift.version>0.22.0</thrift.version>
     <format.thrift.version>${thrift.version}</format.thrift.version>
-    <fastutil.version>8.5.15</fastutil.version>
+    <fastutil.version>8.5.18</fastutil.version>
     <semver.api.version>0.9.33</semver.api.version>
     <slf4j.version>1.7.33</slf4j.version>
     <avro.version>1.11.5</avro.version>
-    <guava.version>33.5.0-jre</guava.version>
+    <guava.version>33.6.0-jre</guava.version>
     <brotli-codec.version>0.1.1</brotli-codec.version>
-    <mockito.version>1.10.19</mockito.version>
-    <powermock.version>2.0.9</powermock.version>
-    <net.openhft.version>0.27ea0</net.openhft.version>
-    <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
+    <mockito.version>5.23.0</mockito.version>
+    <net.openhft.version>0.27ea1</net.openhft.version>
+    <exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
     <jts.version>1.20.0</jts.version>
 
     <!-- parquet-cli dependencies -->
     <opencsv.version>2.3</opencsv.version>
     <jcommander.version>1.82</jcommander.version>
-    <tukaani.version>1.10</tukaani.version>
-    <zstd-jni.version>1.5.7-3</zstd-jni.version>
-    <commons-text.version>1.13.1</commons-text.version>
+    <tukaani.version>1.12</tukaani.version>
+    <zstd-jni.version>1.5.7-7</zstd-jni.version>
+    <commons-text.version>1.15.0</commons-text.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <commons-lang3.version>3.17.0</commons-lang3.version>
+    <commons-lang3.version>3.20.0</commons-lang3.version>
 
     <!-- properties for the profiles -->
     <surefire.argLine>-XX:MaxJavaStackTraceDepth=8</surefire.argLine>
@@ -163,12 +163,6 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>5.6.0</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <dependencyManagement>
@@ -400,14 +394,6 @@
           <header>src/license.txt</header>
           <strictCheck>true</strictCheck>
         </configuration>
-        <!--executions>
-          <execution>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions-->
       </plugin>
 
       <plugin>
@@ -579,6 +565,8 @@
             </excludeModules>
             <excludes>
               <exclude>${shade.prefix}</exclude>
+              <!-- JDK 11 adds interface methods/bridges on PrimitiveIterator.OfInt; ignore japicmp source incompatibility -->
+              <exclude>org.apache.parquet.internal.column.columnindex.IndexIterator</exclude>
               <!-- Removal of a protected method in a class that's not supposed to be subclassed by third-party code -->
               <exclude>org.apache.parquet.column.values.bytestreamsplit.ByteStreamSplitValuesReader#gatherElementDataFromStreams(byte[])</exclude>
               <!-- Due to the removal of deprecated methods -->