fix: addressing reviews

apache · Jun 4, 2024 · 1084b45 · 1084b45
1 parent 4316d3b
commit 1084b45
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,4 +102,4 @@ __debug_bin
 .envrc
 
 # Develocity
-.mvn/.develocity/
+java/.mvn/.develocity/
diff --git a/.mvn/develocity.xml → java/.mvn/develocity.xml b/.mvn/develocity.xml → java/.mvn/develocity.xml
diff --git a/.mvn/extensions.xml → java/.mvn/extensions.xml b/.mvn/extensions.xml → java/.mvn/extensions.xml
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
@@ -21,7 +21,8 @@
   <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>
+    <checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
+    <spotless.java.excludes>none</spotless.java.excludes>
   </properties>
 
   <dependencies>
@@ -51,40 +52,4 @@
       <artifactId>value-annotations</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>${checkstyle.config.location}</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <configuration>
-          <formats>
-            <format>
-              <!-- configure license for xml files -->
-              <includes>
-                <include>pom.xml</include>
-              </includes>
-            </format>
-          </formats>
-          <java>
-            <googleJavaFormat>
-              <version>1.7</version>
-              <style>GOOGLE</style>
-            </googleJavaFormat>
-            <licenseHeader>
-              <file>${maven.multiModuleProjectDirectory}/java/dev/license/asf-java.license</file>
-              <delimiter>package</delimiter>
-            </licenseHeader>
-          </java>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/java/pom.xml b/java/pom.xml
@@ -92,14 +92,16 @@
     <dep.avro.version>1.11.3</dep.avro.version>
     <arrow.vector.classifier></arrow.vector.classifier>
     <forkCount>2</forkCount>
+    <checkstyle.config.location>dev/checkstyle/checkstyle.xml</checkstyle.config.location>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
     <errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
     <error_prone_core.version>2.24.0</error_prone_core.version>
     <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
     <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>
+    <!-- replace with placeholder value 'none' string to enable java formatting in submodules -->
+    <spotless.java.excludes>**/*.java</spotless.java.excludes>
   </properties>
 
   <dependencyManagement>
@@ -835,10 +837,24 @@
           <pom>
             <sortPom></sortPom>
           </pom>
+          <java>
+            <excludes>
+              <exclude>${spotless.java.excludes}</exclude>
+            </excludes>
+            <googleJavaFormat>
+              <version>1.7</version>
+              <style>GOOGLE</style>
+            </googleJavaFormat>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
+              <delimiter>package</delimiter>
+            </licenseHeader>
+          </java>
         </configuration>
         <executions>
           <execution>
             <id>spotless-check</id>
+            <phase>validate</phase>
             <goals>
               <goal>check</goal>
             </goals>