Skip to content

Commit

Permalink
apacheGH-42121: [Java] Cleanup spotless plugin configuration (apache#…
Browse files Browse the repository at this point in the history
…43019)

### What changes are included in this PR?

As all modules have been migrated over to spotless, remove per-module configuration and enable java formatting at the root level.

Exclude format module from java formatting but still enable license formatting for this module as well.

### Are these changes tested?

Through CI/CD

### Are there any user-facing changes?

No

Fixes apache#42121 apache#40826
* GitHub Issue: apache#42121

Authored-by: Laurent Goujon <[email protected]>
Signed-off-by: David Li <[email protected]>
  • Loading branch information
laurentgo authored Jun 25, 2024
1 parent fecd207 commit 3e7ae53
Show file tree
Hide file tree
Showing 78 changed files with 960 additions and 1,459 deletions.
5 changes: 1 addition & 4 deletions java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ rm -rf java/format/src
flatc --java -o java/format/src/main/java format/*.fbs

# prepend license header
find java/format/src -type f | while read file; do
(cat header | while read line; do echo "// $line"; done; cat $file) > $file.tmp
mv $file.tmp $file
done
mvn spotless:apply -pl :arrow-format
```

## Performance Tuning
Expand Down
5 changes: 0 additions & 5 deletions java/adapter/avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ under the License.
<description>(Contrib/Experimental) A library for converting Avro data to Arrow data.</description>
<url>http://maven.apache.org</url>

<properties>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
5 changes: 0 additions & 5 deletions java/adapter/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ under the License.
<description>(Contrib/Experimental)A library for converting JDBC data to Arrow data.</description>
<url>http://maven.apache.org</url>

<properties>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>

<dependency>
Expand Down
2 changes: 0 additions & 2 deletions java/adapter/orc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ under the License.

<properties>
<arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
Expand Down
5 changes: 0 additions & 5 deletions java/algorithm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ under the License.
<name>Arrow Algorithms</name>
<description>(Experimental/Contrib) A collection of algorithms for working with ValueVectors.</description>

<properties>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
2 changes: 0 additions & 2 deletions java/c/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ under the License.

<properties>
<arrow.c.jni.dist.dir>./build</arrow.c.jni.dist.dir>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
Expand Down
5 changes: 0 additions & 5 deletions java/compression/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ under the License.
<name>Arrow Compression</name>
<description>(Experimental/Contrib) A library for working with the compression/decompression of Arrow data.</description>

<properties>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
2 changes: 0 additions & 2 deletions java/dataset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ under the License.
<arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
<parquet.version>1.14.1</parquet.version>
<avro.version>1.11.3</avro.version>
<checkstyle.config.location>dev/checkstyle/checkstyle-spotless.xml</checkstyle.config.location>
<spotless.java.excludes>none</spotless.java.excludes>
</properties>

<dependencies>
Expand Down
289 changes: 0 additions & 289 deletions java/dev/checkstyle/checkstyle-spotless.xml

This file was deleted.

Loading

0 comments on commit 3e7ae53

Please sign in to comment.