Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable the Spotless plugin for Java 21 #12992

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Re-enable the Spotless plugin for Java 21 #12992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef86863
Re-enable the Spotless plugin for Java 21
yashmayya Apr 23, 2024
2542ea0
Move excludes to parent POM and remove plugin override in pinot-commo…
yashmayya Apr 25, 2024
7e3b9b1
Revert "Move excludes to parent POM and remove plugin override in pin…
yashmayya Apr 25, 2024
a9627e0
Remove redundant verify phase binding for spotless plugin's check goal
yashmayya Apr 25, 2024
1bd1dee
Remove configurations from spotless-maven-plugin in pinot-common POM …
yashmayya Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions pinot-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,7 +1611,6 @@
<version>2.43.0</version>
<executions>
<execution>
<phase>verify</phase>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't required because spotless:check is already bound to Maven's verify phase by default (see https://github.com/diffplug/spotless/blob/main/plugin-maven/README.md#binding-to-maven-phase).

<goals>
<goal>check</goal>
</goals>
Expand All @@ -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>
yashmayya marked this conversation as resolved.
Show resolved Hide resolved
<importOrder>
<order>,\#</order>
</importOrder>
Expand Down
Loading