diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 6b983ce160..e3b1767078 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -152,7 +152,7 @@ tasks.withType(Jar::class).configureEach {
 
 spotless {
   java {
-    target("src/main/java/**/*.java", "src/testFixtures/java/**/*.java", "src/test/java/**/*.java")
+    target("src/*/java/**/*.java")
     googleJavaFormat()
     licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"))
     endWithNewline()
diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java
index d7f4779e44..3161452047 100644
--- a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java
+++ b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java
@@ -22,5 +22,4 @@
 import org.apache.polaris.service.it.test.PolarisManagementServiceIntegrationTest;
 
 @QuarkusIntegrationTest
-public class QuarkusManagementServiceIT
-    extends PolarisManagementServiceIntegrationTest {}
+public class QuarkusManagementServiceIT extends PolarisManagementServiceIntegrationTest {}
diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java
index 1a46d9713b..0171e33044 100644
--- a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java
+++ b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java
@@ -27,8 +27,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 @QuarkusIntegrationTest
-public class QuarkusRestCatalogViewAwsIT
-    extends PolarisRestCatalogViewAwsIntegrationTest {
+public class QuarkusRestCatalogViewAwsIT extends PolarisRestCatalogViewAwsIntegrationTest {
 
   @BeforeEach
   public void setUpTempDir(@TempDir Path tempDir) throws Exception {
diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java
index 45178230b7..317721ef49 100644
--- a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java
+++ b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java
@@ -27,8 +27,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 @QuarkusIntegrationTest
-public class QuarkusRestCatalogViewAzureIT
-    extends PolarisRestCatalogViewAzureIntegrationTest {
+public class QuarkusRestCatalogViewAzureIT extends PolarisRestCatalogViewAzureIntegrationTest {
 
   @BeforeEach
   public void setUpTempDir(@TempDir Path tempDir) throws Exception {
diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java
index 735973d8ef..9b68ece256 100644
--- a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java
+++ b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java
@@ -27,8 +27,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 @QuarkusIntegrationTest
-public class QuarkusRestCatalogViewFileIT
-    extends PolarisRestCatalogViewFileIntegrationTest {
+public class QuarkusRestCatalogViewFileIT extends PolarisRestCatalogViewFileIntegrationTest {
 
   @BeforeEach
   public void setUpTempDir(@TempDir Path tempDir) throws Exception {
diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java
index 9fdc694218..24ee8d8567 100644
--- a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java
+++ b/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java
@@ -27,8 +27,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 @QuarkusIntegrationTest
-public class QuarkusRestCatalogViewGcpIT
-    extends PolarisRestCatalogViewGcpIntegrationTest {
+public class QuarkusRestCatalogViewGcpIT extends PolarisRestCatalogViewGcpIntegrationTest {
 
   @BeforeEach
   public void setUpTempDir(@TempDir Path tempDir) throws Exception {
diff --git a/tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java b/tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java
index c1b60236b9..63982e31f0 100644
--- a/tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java
+++ b/tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java
@@ -19,8 +19,8 @@
 package org.apache.polaris.version;
 
 import static java.lang.String.format;
-import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
 import static org.apache.polaris.version.PolarisVersion.getBuildGitHead;
+import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
 import static org.apache.polaris.version.PolarisVersion.getBuildJavaVersion;
 import static org.apache.polaris.version.PolarisVersion.getBuildReleasedVersion;
 import static org.apache.polaris.version.PolarisVersion.getBuildSystem;
@@ -108,6 +108,7 @@ static Stream<Arguments> noticeLicense() {
     return Stream.of(
         Arguments.arguments("NOTICE", (Supplier<String>) PolarisVersion::readNoticeFile),
         Arguments.arguments("LICENSE", (Supplier<String>) PolarisVersion::readSourceLicenseFile));
-        //Arguments.arguments(//   "LICENSE-BINARY-DIST", (Supplier<String>) PolarisVersion::readBinaryLicenseFile));
+    // Arguments.arguments(//   "LICENSE-BINARY-DIST", (Supplier<String>)
+    // PolarisVersion::readBinaryLicenseFile));
   }
 }