fix: addressing reviews

apache · May 29, 2024 · 6d43ea7 · 6d43ea7
1 parent 875e16a
commit 6d43ea7
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 24 deletions.
diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst
@@ -123,8 +123,8 @@ that changes adhere to the style guide.
 Automatically fixing code style issues
 --------------------------------------
 
-- You can also just check the style without building the project with `mvn spotless:check`.
-- The Java code style can be corrected from the command line by using the following commands: `mvn spotless:apply`.
+- You can also just check the style without building the project with ``mvn spotless:check``.
+- The Java code style can be corrected from the command line by using the following commands: ``mvn spotless:apply``.
 
 .. code-block:: bash
 
@@ -164,4 +164,4 @@ Checkstyle will be removed once Spotless is fully integrated.
 .. _Spotless: https://github.com/diffplug/spotless
 .. _Google Java Style: https://google.github.io/styleguide/javaguide.html
 .. _Eclipse: https://github.com/google/google-java-format?tab=readme-ov-file#eclipse
-.. _IntelliJ: https://github.com/google/google-java-format?tab=readme-ov-file#intellij-android-studio-and-other-jetbrains-ides
+.. _IntelliJ: https://github.com/google/google-java-format?tab=readme-ov-file#intellij-android-studio-and-other-jetbrains-ides
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
@@ -68,7 +68,7 @@
                 <include>pom.xml</include>
               </includes>
               <licenseHeader>
-                <file>../spotless/asf-xml.license</file>
+                <file>../dev/license/asf-xml.license</file>
                 <delimiter>(&lt;configuration|&lt;project)</delimiter>
               </licenseHeader>
             </format>
@@ -78,14 +78,14 @@
                 <include>**/*.java</include>
               </includes>
               <licenseHeader>
-                <file>../spotless/asf-java.license</file>
+                <file>../dev/license/asf-java.license</file>
                 <delimiter>package</delimiter>
               </licenseHeader>
             </format>
           </formats>
           <java>
             <googleJavaFormat>
-              <version>1.17.0</version>
+              <version>1.7</version>
               <style>GOOGLE</style>
             </googleJavaFormat>
           </java>

diff --git a/java/dev/checkstyle/checkstyle.license b/java/dev/checkstyle/checkstyle.license
diff --git a/java/spotless/asf-java.license → java/dev/license/asf-java.license b/java/spotless/asf-java.license → java/dev/license/asf-java.license
diff --git a/java/spotless/asf-xml.license → java/dev/license/asf-xml.license b/java/spotless/asf-xml.license → java/dev/license/asf-xml.license
diff --git a/java/maven/pom.xml b/java/maven/pom.xml
@@ -251,7 +251,7 @@
         <version>3.1.0</version>
         <configuration>
           <configLocation>../dev/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>../dev/checkstyle/checkstyle.license</headerLocation>
+          <headerLocation>../dev/license/asf-java.license</headerLocation>
           <suppressionsLocation>../dev/checkstyle/suppressions.xml</suppressionsLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <inputEncoding>UTF-8</inputEncoding>

diff --git a/java/pom.xml b/java/pom.xml
@@ -730,7 +730,7 @@
         <configuration>
           <excludes>**/module-info.java</excludes>
           <configLocation>dev/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>dev/checkstyle/checkstyle.license</headerLocation>
+          <headerLocation>dev/license/asf-java.license</headerLocation>
           <suppressionsLocation>dev/checkstyle/suppressions.xml</suppressionsLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <inputEncoding>UTF-8</inputEncoding>