This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e1441474f1 Do not execute spotless in Java 21 (#11670)
e1441474f1 is described below
commit e1441474f18b2de4d9b66ae3b1bb768830b92776
Author: Gonzalo Ortiz Jaureguizar <[email protected]>
AuthorDate: Mon Sep 25 20:36:28 2023 +0200
Do not execute spotless in Java 21 (#11670)
---
pinot-common/pom.xml | 53 ++++++++++++++++++++-----------------------
pom.xml | 64 ++++++++++++++++++++++++++++++++--------------------
2 files changed, 63 insertions(+), 54 deletions(-)
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 7dfbf8104b..339d8f55d2 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -61,35 +61,6 @@
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.28.0</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <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>
<plugin>
<!-- Extract parser grammar template from calcite-core.jar and put
it under ${project.build.directory} where all freemarker
templates are. -->
@@ -178,6 +149,30 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <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>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9220d562bd..2e3a9a0314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,6 +180,20 @@
</properties>
<profiles>
+ <profile>
+ <id>not-java-21</id>
+ <activation>
+ <jdk>!21</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>github-actions</id>
<activation>
@@ -1306,6 +1320,31 @@
</extensions>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>2.28.0</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <java>
+ <includes>
+ <include>src/main/java/**/*.java</include>
+ <include>src/test/java/**/*.java</include>
+ </includes>
+ <importOrder>
+ <order>,\#</order>
+ </importOrder>
+ <removeUnusedImports/>
+ </java>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
@@ -1641,31 +1680,6 @@
<artifactId>sonar-maven-plugin</artifactId>
<version>2.7.1</version>
</plugin>
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.28.0</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <java>
- <includes>
- <include>src/main/java/**/*.java</include>
- <include>src/test/java/**/*.java</include>
- </includes>
- <importOrder>
- <order>,\#</order>
- </importOrder>
- <removeUnusedImports/>
- </java>
- </configuration>
- </plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
