Skip to content

Commit

Permalink
HBASE-13364 Make error prone off by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@elliottneilclark
elliottneilclark committed Mar 30, 2015
1 parent 3815a33 commit 55a5a3b
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 217 deletions.
19 changes: 0 additions & 19 deletions hbase-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
19 changes: 0 additions & 19 deletions hbase-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,6 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions hbase-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,6 @@
<description>Examples of HBase usage</description>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions hbase-hadoop-compat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions hbase-hadoop2-compat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,6 @@ limitations under the License.

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
19 changes: 0 additions & 19 deletions hbase-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,25 +158,6 @@
</pluginManagement>

<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
</executions>
</plugin>
<!-- Run integration tests with mvn verify -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
19 changes: 0 additions & 19 deletions hbase-prefix-tree/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions hbase-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,6 @@
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<!-- We can't check tests with default-testCompile because of generated
protobuf code (IncrementCounterProcessorTestProtos) -->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions hbase-shell/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,6 @@
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions hbase-thrift/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,6 @@
</resources>

<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
44 changes: 22 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,23 +490,6 @@
<useIncrementalCompilation>false</useIncrementalCompilation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
<dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
</plugin>
<!-- Test oriented plugins -->
<plugin>
Expand Down Expand Up @@ -1131,7 +1114,6 @@
<!-- Build dependencies -->
<maven.min.version>3.0.3</maven.min.version>
<java.min.version>${compileSource}</java.min.version>
<java.default.compiler>javac-with-errorprone</java.default.compiler>
<!-- Dependencies -->
<hadoop-two.version>2.5.1</hadoop-two.version>
<hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version>
Expand Down Expand Up @@ -2607,13 +2589,31 @@
</build>
</profile>
<profile>
<id>javac</id>
<id>errorProne</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<java.default.compiler>javac</java.default.compiler>
</properties>
<build>
<plugins>
<!-- Turn on error-prone -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
Expand Down

0 comments on commit 55a5a3b

Please sign in to comment.