This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new ab1b43e Revert "IGNITE-15393 Add errorprone plugin (#304)" (#320)
ab1b43e is described below
commit ab1b43ebe5ab0883d1d33cdca2edf37e9b6898fb
Author: Andrew V. Mashenkov <amashen...@users.noreply.github.com>
AuthorDate: Mon Sep 6 10:52:17 2021 +0300
Revert "IGNITE-15393 Add errorprone plugin (#304)" (#320)
This reverts commit 0d12630f
---
modules/api/pom.xml | 5 ----
modules/calcite/pom.xml | 6 -----
modules/cli/pom.xml | 10 --------
modules/configuration/pom.xml | 5 ----
modules/network/pom.xml | 12 ++++++----
modules/raft-client/pom.xml | 5 ----
modules/raft/pom.xml | 5 ----
modules/rest/pom.xml | 5 ----
parent/pom.xml | 54 +++++--------------------------------------
9 files changed, 13 insertions(+), 94 deletions(-)
diff --git a/modules/api/pom.xml b/modules/api/pom.xml
index 65217f4..f9f07e7 100644
--- a/modules/api/pom.xml
+++ b/modules/api/pom.xml
@@ -60,11 +60,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-configuration-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index 8f04652..6e84990 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -248,7 +248,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -262,11 +261,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
index 9274711..300466c 100644
--- a/modules/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -170,11 +170,6 @@
<!--
<useIncrementalCompilation>false</useIncrementalCompilation> -->
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject-java</artifactId>
<version>${micronaut.version}</version>
@@ -195,11 +190,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject-java</artifactId>
<version>${micronaut.version}</version>
diff --git a/modules/configuration/pom.xml b/modules/configuration/pom.xml
index 0293471..2381420 100644
--- a/modules/configuration/pom.xml
+++ b/modules/configuration/pom.xml
@@ -96,11 +96,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-configuration-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/network/pom.xml b/modules/network/pom.xml
index fde08c2..6f875f7 100644
--- a/modules/network/pom.xml
+++ b/modules/network/pom.xml
@@ -107,6 +107,13 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -121,11 +128,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/raft-client/pom.xml b/modules/raft-client/pom.xml
index 17e4c04..a671121 100644
--- a/modules/raft-client/pom.xml
+++ b/modules/raft-client/pom.xml
@@ -91,11 +91,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/raft/pom.xml b/modules/raft/pom.xml
index 6e5104e..397b84c 100644
--- a/modules/raft/pom.xml
+++ b/modules/raft/pom.xml
@@ -151,11 +151,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-network-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/modules/rest/pom.xml b/modules/rest/pom.xml
index 1a1c6ab..cb665f2 100644
--- a/modules/rest/pom.xml
+++ b/modules/rest/pom.xml
@@ -124,11 +124,6 @@
<configuration>
<annotationProcessorPaths>
<path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- <path>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-configuration-annotation-processor</artifactId>
<version>${project.version}</version>
diff --git a/parent/pom.xml b/parent/pom.xml
index dd770fd..6787898 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,6 @@
<!-- Plugins versions -->
<apache.rat.plugin.version>0.13</apache.rat.plugin.version>
<checkstyle.puppycrawl.version>8.41.1</checkstyle.puppycrawl.version>
-
<errorprone-annotation-processor.version>2.9.0</errorprone-annotation-processor.version>
<launch.maven.plugin.version>1.7.25</launch.maven.plugin.version>
<maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.2.0</maven.assembly.plugin.version>
@@ -820,53 +819,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>error-prone</id>
- <activation>
- <property>
- <name>!maven.all-checks.skip</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <compilerArgs>
- <arg>-XDcompilePolicy=simple</arg>
- <arg>
- -Xplugin:ErrorProne
- -XepDisableWarningsInGeneratedCode
-
-XepExcludedPaths:(.*/src/integrationTest/.*|.*/src/test/.*|.*/modules/(raft|metastorage-server|schema|table)/.*)
- </arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
- </compilerArgs>
- <annotationProcessorPaths>
- <path>
-
<groupId>com.google.errorprone</groupId>
-
<artifactId>error_prone_core</artifactId>
-
<version>${errorprone-annotation-processor.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
<build>
@@ -874,6 +826,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
</plugin>
