From ef86863b9e8df633bf65302e1aed1d3c8033b941 Mon Sep 17 00:00:00 2001
From: Yash Mayya <yash.mayya@gmail.com>
Date: Tue, 23 Apr 2024 20:10:34 +0530
Subject: [PATCH 1/5] Re-enable the Spotless plugin for Java 21

---
 pinot-common/pom.xml | 46 ++++++++++++++++++++------------------------
 pom.xml              | 18 ++++-------------
 2 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 2381f024d46b..760384c29d00 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -62,6 +62,27 @@
         <artifactId>protobuf-maven-plugin</artifactId>
       </plugin>
 
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+            </includes>
+            <excludes>
+              <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
+              <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
+            </excludes>
+            <importOrder>
+              <order>,\#</order>
+            </importOrder>
+            <removeUnusedImports/>
+          </java>
+        </configuration>
+      </plugin>
+
       <!-- Following plugins and their configurations are used to generate the custom Calcite's SQL parser -->
       <!-- Copy the templates present in the codegen directory to ${project.build.directory}/codegen -->
       <plugin>
@@ -129,31 +150,6 @@
         </executions>
       </plugin>
     </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>com.diffplug.spotless</groupId>
-          <artifactId>spotless-maven-plugin</artifactId>
-          <configuration>
-            <java>
-              <includes>
-                <include>src/main/java/**/*.java</include>
-                <include>src/test/java/**/*.java</include>
-              </includes>
-              <excludes>
-                <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
-                <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
-              </excludes>
-              <importOrder>
-                <order>,\#</order>
-              </importOrder>
-              <removeUnusedImports/>
-            </java>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index a4a83c8b287a..5596e85270aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,20 +255,6 @@
   </properties>
 
   <profiles>
-    <profile>
-      <id>not-java-21</id>
-      <activation>
-        <jdk>!21</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.diffplug.spotless</groupId>
-            <artifactId>spotless-maven-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>github-actions</id>
       <activation>
@@ -2080,6 +2066,10 @@
         <artifactId>sonar-maven-plugin</artifactId>
         <version>2.7.1</version>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>

From 2542ea03f07078a5a987baaac7e74da0ea33baaa Mon Sep 17 00:00:00 2001
From: Yash Mayya <yash.mayya@gmail.com>
Date: Thu, 25 Apr 2024 08:53:44 +0530
Subject: [PATCH 2/5] Move excludes to parent POM and remove plugin override in
 pinot-common POM

---
 pinot-common/pom.xml | 21 ---------------------
 pom.xml              |  5 ++++-
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 760384c29d00..ffb5cbe36a61 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -62,27 +62,6 @@
         <artifactId>protobuf-maven-plugin</artifactId>
       </plugin>
 
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <configuration>
-          <java>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-            </includes>
-            <excludes>
-              <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
-              <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
-            </excludes>
-            <importOrder>
-              <order>,\#</order>
-            </importOrder>
-            <removeUnusedImports/>
-          </java>
-        </configuration>
-      </plugin>
-
       <!-- Following plugins and their configurations are used to generate the custom Calcite's SQL parser -->
       <!-- Copy the templates present in the codegen directory to ${project.build.directory}/codegen -->
       <plugin>
diff --git a/pom.xml b/pom.xml
index 5596e85270aa..76daff59110b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1611,7 +1611,6 @@
           <version>2.43.0</version>
           <executions>
             <execution>
-              <phase>verify</phase>
               <goals>
                 <goal>check</goal>
               </goals>
@@ -1623,6 +1622,10 @@
                 <include>src/main/java/**/*.java</include>
                 <include>src/test/java/**/*.java</include>
               </includes>
+              <excludes>
+                <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
+                <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
+              </excludes>
               <importOrder>
                 <order>,\#</order>
               </importOrder>

From 7e3b9b1c241574f6782deee107676158c5e4e6da Mon Sep 17 00:00:00 2001
From: Yash Mayya <yash.mayya@gmail.com>
Date: Thu, 25 Apr 2024 15:44:57 +0530
Subject: [PATCH 3/5] Revert "Move excludes to parent POM and remove plugin
 override in pinot-common POM"

This reverts commit 2542ea03f07078a5a987baaac7e74da0ea33baaa.
---
 pinot-common/pom.xml | 21 +++++++++++++++++++++
 pom.xml              |  5 +----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index ffb5cbe36a61..760384c29d00 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -62,6 +62,27 @@
         <artifactId>protobuf-maven-plugin</artifactId>
       </plugin>
 
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+            </includes>
+            <excludes>
+              <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
+              <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
+            </excludes>
+            <importOrder>
+              <order>,\#</order>
+            </importOrder>
+            <removeUnusedImports/>
+          </java>
+        </configuration>
+      </plugin>
+
       <!-- Following plugins and their configurations are used to generate the custom Calcite's SQL parser -->
       <!-- Copy the templates present in the codegen directory to ${project.build.directory}/codegen -->
       <plugin>
diff --git a/pom.xml b/pom.xml
index 76daff59110b..5596e85270aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1611,6 +1611,7 @@
           <version>2.43.0</version>
           <executions>
             <execution>
+              <phase>verify</phase>
               <goals>
                 <goal>check</goal>
               </goals>
@@ -1622,10 +1623,6 @@
                 <include>src/main/java/**/*.java</include>
                 <include>src/test/java/**/*.java</include>
               </includes>
-              <excludes>
-                <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
-                <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
-              </excludes>
               <importOrder>
                 <order>,\#</order>
               </importOrder>

From a9627e061517e1cca68a9837f5e740af2d478cc9 Mon Sep 17 00:00:00 2001
From: Yash Mayya <yash.mayya@gmail.com>
Date: Thu, 25 Apr 2024 15:55:56 +0530
Subject: [PATCH 4/5] Remove redundant verify phase binding for spotless
 plugin's check goal

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5596e85270aa..e2307246b56e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1611,7 +1611,6 @@
           <version>2.43.0</version>
           <executions>
             <execution>
-              <phase>verify</phase>
               <goals>
                 <goal>check</goal>
               </goals>

From 1bd1dee4452a2ad85bd41c1487eaf17a05d5dbc6 Mon Sep 17 00:00:00 2001
From: Yash Mayya <yash.mayya@gmail.com>
Date: Thu, 25 Apr 2024 23:13:46 +0530
Subject: [PATCH 5/5] Remove configurations from spotless-maven-plugin in
 pinot-common POM that are duplicated from parent POM

---
 pinot-common/pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 760384c29d00..32cd2eb9dbce 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -67,18 +67,10 @@
         <artifactId>spotless-maven-plugin</artifactId>
         <configuration>
           <java>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-            </includes>
             <excludes>
               <exclude>src/main/java/org/apache/pinot/common/request/*.java</exclude>
               <exclude>src/main/java/org/apache/pinot/common/response/ProcessingException.java</exclude>
             </excludes>
-            <importOrder>
-              <order>,\#</order>
-            </importOrder>
-            <removeUnusedImports/>
           </java>
         </configuration>
       </plugin>