You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/12/29 20:02:24 UTC
hbase git commit: HBASE-12695 JDK 1.8 compilation broken
Repository: hbase
Updated Branches:
refs/heads/master e5ca773f7 -> b2eea8cac
HBASE-12695 JDK 1.8 compilation broken
Signed-off-by: stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b2eea8ca
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b2eea8ca
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b2eea8ca
Branch: refs/heads/master
Commit: b2eea8cac6cceab323bf79b77e321d24dd5c90c2
Parents: e5ca773
Author: Esteban Gutierrez <es...@cloudera.com>
Authored: Mon Dec 15 21:23:47 2014 -0800
Committer: stack <st...@apache.org>
Committed: Mon Dec 29 11:02:04 2014 -0800
----------------------------------------------------------------------
hbase-client/pom.xml | 4 ++--
hbase-common/pom.xml | 4 ++--
hbase-examples/pom.xml | 4 ++--
hbase-hadoop-compat/pom.xml | 4 ++--
hbase-hadoop2-compat/pom.xml | 4 ++--
hbase-it/pom.xml | 4 ++--
hbase-prefix-tree/pom.xml | 4 ++--
hbase-server/pom.xml | 2 +-
hbase-shell/pom.xml | 4 ++--
hbase-thrift/pom.xml | 4 ++--
pom.xml | 10 ++++++++++
11 files changed, 29 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index bb20aa9..216a6ee 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -40,14 +40,14 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 49dd638..3ae4565 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -47,14 +47,14 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index a0bf8f9..a149f52 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -37,7 +37,7 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
@@ -45,7 +45,7 @@
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-hadoop-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index 5186d66..0c3c2bf 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -42,7 +42,7 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
@@ -50,7 +50,7 @@
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-hadoop2-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index ddaeef5..73a32f3 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -40,7 +40,7 @@ limitations under the License.
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
@@ -48,7 +48,7 @@ limitations under the License.
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 96aedc9..95b47ce 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -123,14 +123,14 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-prefix-tree/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 6654806..a97de92 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -39,14 +39,14 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 72aadb1..f9c887f 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -59,7 +59,7 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-shell/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index ecc1cfd..5343a26 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -56,7 +56,7 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
@@ -64,7 +64,7 @@
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 22192f3..c3c9ab8 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -52,7 +52,7 @@
<execution>
<id>default-compile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
@@ -60,7 +60,7 @@
<execution>
<id>default-testCompile</id>
<configuration>
- <compilerId>javac-with-errorprone</compilerId>
+ <compilerId>${java.default.compiler}</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b2eea8ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01cbdd0..5c9d834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1021,6 +1021,7 @@
<!-- 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>
@@ -2398,6 +2399,15 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>javac</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <java.default.compiler>javac</java.default.compiler>
+ </properties>
+ </profile>
</profiles>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting>