diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f76430f9d77e8..3fc4a14bbdfb3 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Install HawkEye
         uses: taiki-e/install-action@288e746965032cfcc232e09af2daf5f23c14d780  # v2.86.1
         with:
-          tool: hawkeye@6.2.0
+          tool: hawkeye@7.0.0
       - name: Run license header check
         run: ci/scripts/license_header.sh
 
diff --git a/benchmarks/compile_profile.py b/benchmarks/compile_profile.py
index a85e15ddacc04..d79e08305e4da 100644
--- a/benchmarks/compile_profile.py
+++ b/benchmarks/compile_profile.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-
 # 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
diff --git a/benchmarks/lineprotocol.py b/benchmarks/lineprotocol.py
index 40f643499f489..c5e2e3de570df 100644
--- a/benchmarks/lineprotocol.py
+++ b/benchmarks/lineprotocol.py
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 """ 
 Converts a given json to LineProtocol format that can be 
 visualised by grafana/other systems that support LineProtocol. 
diff --git a/ci/scripts/license_header.sh b/ci/scripts/license_header.sh
index 7ab8c9637598b..4894e4727a366 100755
--- a/ci/scripts/license_header.sh
+++ b/ci/scripts/license_header.sh
@@ -63,15 +63,7 @@ fi
 
 if [[ "$MODE" == "write" ]]; then
   echo "[${SCRIPT_NAME}] \`hawkeye format --config ${HAWKEYE_CONFIG}\`"
-  if ! hawkeye format --config "${HAWKEYE_CONFIG}"; then
-    status=$?
-    # hawkeye returns exit code 1 when it applies fixes; treat that as success.
-    if [[ $status -eq 1 ]]; then
-      echo "[${SCRIPT_NAME}] hawkeye format applied fixes (exit 1 treated as success)"
-    else
-      exit $status
-    fi
-  fi
+  hawkeye format --config "${HAWKEYE_CONFIG}"
 else
   echo "[${SCRIPT_NAME}] \`hawkeye check --config ${HAWKEYE_CONFIG}\`"
   hawkeye check --config "${HAWKEYE_CONFIG}"
diff --git a/docs/scripts/update_committer_list.py b/docs/scripts/update_committer_list.py
index c66eb52468523..8d6b9e6cb6fad 100755
--- a/docs/scripts/update_committer_list.py
+++ b/docs/scripts/update_committer_list.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-
 # 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
@@ -17,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 """
 Utility for updating the committer list in the governance documentation
 by reading from the Apache DataFusion phonebook and combining with existing data.
diff --git a/licenserc.toml b/licenserc.toml
index a1e01a5fd0ace..b2572a8546332 100644
--- a/licenserc.toml
+++ b/licenserc.toml
@@ -15,8 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-headerPath = "Apache-2.0-ASF.txt"
+[header]
+builtin = "Apache-2.0-ASF"
 
+[files]
 includes = [
     "*.rs",
     "*.py",
@@ -25,7 +27,7 @@ includes = [
 
 excludes = [
     # generated code
-    "datafusion/proto/src/generated/",
-    "datafusion/proto-common/src/generated/",
-    "datafusion/proto-models/src/generated/",
+    "datafusion/proto/src/generated/**",
+    "datafusion/proto-common/src/generated/**",
+    "datafusion/proto-models/src/generated/**",
 ]
diff --git a/test-utils/src/string_gen.rs b/test-utils/src/string_gen.rs
index 21eecc05b8ce9..0922cd67f0500 100644
--- a/test-utils/src/string_gen.rs
+++ b/test-utils/src/string_gen.rs
@@ -1,4 +1,3 @@
-use crate::array_gen::StringArrayGenerator;
 // 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
@@ -16,6 +15,7 @@ use crate::array_gen::StringArrayGenerator;
 // specific language governing permissions and limitations
 // under the License.
 
+use crate::array_gen::StringArrayGenerator;
 use crate::stagger_batch;
 use arrow::record_batch::RecordBatch;
 use rand::rngs::StdRng;