fix: addressing reviews

apache · May 30, 2024 · 0ab443b · 0ab443b
1 parent 69a541e
commit 0ab443b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
@@ -20,6 +20,10 @@
   <name>Arrow Algorithms</name>
   <description>(Experimental/Contrib) A collection of algorithms for working with ValueVectors.</description>
 
+  <properties>
+    <checkstyle.config.location>${project.basedir}/../dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
@@ -54,7 +58,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <configLocation>${checkstyle.config.location}</configLocation>
         </configuration>
       </plugin>
       <plugin>
@@ -67,16 +71,6 @@
               <includes>
                 <include>pom.xml</include>
               </includes>
-              <licenseHeader>
-                <file>${project.basedir}/../dev/license/asf-xml.license</file>
-                <delimiter>(&lt;configuration|&lt;project)</delimiter>
-              </licenseHeader>
-            </format>
-            <format>
-              <!-- configure license for java files -->
-              <includes>
-                <include>**/*.java</include>
-              </includes>
             </format>
           </formats>
           <java>

diff --git a/java/pom.xml b/java/pom.xml
@@ -99,6 +99,7 @@
     <mockito.core.version>5.11.0</mockito.core.version>
     <mockito.inline.version>5.2.0</mockito.inline.version>
     <checker.framework.version>3.43.0</checker.framework.version>
+    <checkstyle.config.location>dev/checkstyle/checkstyle.xml</checkstyle.config.location>
   </properties>
 
   <dependencyManagement>
@@ -729,7 +730,7 @@
         <version>3.1.0</version>
         <configuration>
           <excludes>**/module-info.java</excludes>
-          <configLocation>dev/checkstyle/checkstyle.xml</configLocation>
+          <configLocation>${checkstyle.config.location}</configLocation>
           <headerLocation>dev/license/asf-java.license</headerLocation>
           <suppressionsLocation>dev/checkstyle/suppressions.xml</suppressionsLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>