Repository: hbase Updated Branches: refs/heads/branch-1.4 cfa4cbe76 -> 5f58e618c
HBASE-19421 branch-1 does not compile against Hadoop 3.0.0 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f58e618 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f58e618 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f58e618 Branch: refs/heads/branch-1.4 Commit: 5f58e618c368ccd89fefc5aa4fa96c2b1a43649e Parents: cfa4cbe Author: Andrew Purtell <apurt...@apache.org> Authored: Mon Dec 4 13:59:12 2017 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Mon Dec 4 15:48:36 2017 -0800 ---------------------------------------------------------------------- hbase-client/pom.xml | 8 +- hbase-common/pom.xml | 58 +++- hbase-examples/pom.xml | 107 ++++---- hbase-external-blockcache/pom.xml | 12 +- hbase-it/pom.xml | 14 +- hbase-prefix-tree/pom.xml | 8 +- hbase-procedure/pom.xml | 8 +- .../src/main/resources/supplemental-models.xml | 262 ++++++++++++++++++- hbase-rest/pom.xml | 20 ++ hbase-rsgroup/pom.xml | 12 +- hbase-server/pom.xml | 18 +- .../apache/hadoop/hbase/http/HttpServer.java | 9 +- .../hbase/regionserver/HRegionServer.java | 2 +- .../org/apache/hadoop/hbase/util/MBeanUtil.java | 83 ++++++ .../hadoop/hbase/master/MockRegionServer.java | 2 - .../hadoop/hbase/regionserver/TestBulkLoad.java | 2 +- hbase-shell/pom.xml | 18 +- hbase-testing-util/pom.xml | 20 +- hbase-thrift/pom.xml | 17 +- .../hadoop/hbase/thrift/IncrementCoalescer.java | 2 +- pom.xml | 71 ++++- 21 files changed, 667 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index e48fbbc..c5d0430 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -358,7 +358,7 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> @@ -368,6 +368,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index e605383..7cf16b9 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -484,12 +484,68 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-guice</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index bcbeb0b..2bd86e5 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -221,61 +221,64 @@ if we can combine these profiles somehow --> profile for building against Hadoop 3.0.x. Activate using: mvn -Dhadoop.profile=3.0 --> - <profile> - <id>hadoop-3.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>3.0</value> - </property> - </activation> - <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>create-mrapp-generated-classpath</id> - <phase>generate-test-resources</phase> - <goals> - <goal>build-classpath</goal> - </goals> - <configuration> - <!-- needed to run the unit test for DS to generate + <profile> + <id>hadoop-3.0</id> + <activation> + <property> + <name>hadoop.profile</name> + <value>3.0</value> + </property> + </activation> + <properties> + <hadoop.version>${hadoop-three.version}</hadoop.version> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>create-mrapp-generated-classpath</id> + <phase>generate-test-resources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <!-- needed to run the unit test for DS to generate the required classpath that is required in the env of the launch container in the mini mr/yarn cluster --> - <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>compile-protobuf</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-external-blockcache/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 05f5a2d..39d1b1e 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -280,12 +280,22 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 9ef8c65..2114409 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -387,16 +387,28 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-prefix-tree/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index b60937a..c5a0df7 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -223,12 +223,18 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-procedure/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index eaa8243..09230ca 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -182,12 +182,18 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-resource-bundle/src/main/resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 002d82d..bb24b0c 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -61,15 +61,152 @@ under the License. </licenses> </project> </supplement> + <!-- Artifacts with ambiguously named licenses in POM --> <supplement> <project> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> <licenses> <license> <name>Apache License, Version 2.0</name> @@ -79,7 +216,62 @@ under the License. </licenses> </project> </supplement> -<!-- Artifacts with ambiguously named licenses in POM --> + <supplement> + <project> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> + + <licenses> + <license> + <name>Eclipse Public License 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-schemas</artifactId> + <licenses> + <license> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> <project> <groupId>com.github.stephenc.findbugs</groupId> @@ -575,6 +767,32 @@ under the License. </supplement> <supplement> <project> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <licenses> + <license> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <licenses> + <license> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -1413,6 +1631,23 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </project> </supplement> <supplement> + <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha4 --> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <version>3.1.4</version> + <licenses> + <license> + <name>BSD license</name> + <url>https://opensource.org/licenses/bsd-license.php</url> + <distribution>repo</distribution> + <comments> +Copyright 2010 FasterXML.com +</comments> + </license> + </licenses> + </project> + </supplement> + <supplement> <project> <groupId>org.jruby.jcodings</groupId> <artifactId>jcodings</artifactId> @@ -1833,6 +2068,19 @@ Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software Fou </supplement> <supplement> <project> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <licenses> + <license> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>http://www.opensource.org/licenses/cddl1.php</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> <groupId>org.jamon</groupId> <artifactId>jamon-runtime</artifactId> <name>Jamon runtime support classes</name> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 564a260..c532be5 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -425,15 +425,35 @@ <value>3.0</value> </property> </activation> + <properties> + <hadoop.version>${hadoop-three.version}</hadoop.version> + </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop-three.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-rsgroup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index f2d9aa0..901e589 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -261,16 +261,18 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 3998d54..9b9cc2e 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -786,17 +786,33 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-distcp</artifactId> + <version>${hadoop-three.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop-three.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Hadoop needs Netty 3.x at test scope for the minicluster --> <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>3.6.2.Final</version> + <version>${netty.hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index c630dc0..a8ed8a4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -59,7 +59,6 @@ import org.apache.hadoop.hbase.http.jmx.JMXJsonServlet; import org.apache.hadoop.hbase.http.log.LogLevel; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.ReflectionUtils; -import org.apache.hadoop.metrics.MetricsServlet; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.server.AuthenticationFilter; @@ -710,9 +709,15 @@ public class HttpServer implements FilterContainer { // set up default servlets addServlet("stacks", "/stacks", StackServlet.class); addServlet("logLevel", "/logLevel", LogLevel.Servlet.class); - addServlet("metrics", "/metrics", MetricsServlet.class); addServlet("jmx", "/jmx", JMXJsonServlet.class); addServlet("conf", "/conf", ConfServlet.class); + try { + Class<? extends HttpServlet> clazz = (Class<? extends HttpServlet>) + Class.forName("org.apache.hadoop.metrics.MetricsServlet"); + addServlet("metrics", "/metrics", clazz); + } catch (Exception e) { + LOG.warn("MetricsServlet class not found, metrics servlet will not start", e); + } } public void addContext(Context ctxt, boolean isFiltered) http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index e4e440f..c1377fe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -166,6 +166,7 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.JSONBean; import org.apache.hadoop.hbase.util.JvmPauseMonitor; +import org.apache.hadoop.hbase.util.MBeanUtil; import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; import org.apache.hadoop.hbase.util.Sleeper; import org.apache.hadoop.hbase.util.Threads; @@ -183,7 +184,6 @@ import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperNodeTracker; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.ipc.RemoteException; -import org.apache.hadoop.metrics.util.MBeanUtil; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; import org.apache.zookeeper.KeeperException; http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MBeanUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MBeanUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MBeanUtil.java new file mode 100644 index 0000000..710ff26 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MBeanUtil.java @@ -0,0 +1,83 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.util; + +import java.lang.management.ManagementFactory; + +import javax.management.InstanceNotFoundException; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import javax.management.InstanceAlreadyExistsException; + +import org.apache.hadoop.hbase.classification.InterfaceAudience; + +@InterfaceAudience.Private +public class MBeanUtil { + + /** + * Register the MBean using our standard MBeanName format + * "hadoop:service=<serviceName>,name=<nameName>" + * Where the <serviceName> and <nameName> are the supplied parameters + * + * @param serviceName + * @param nameName + * @param theMbean - the MBean to register + * @return the named used to register the MBean + */ + static public ObjectName registerMBean(final String serviceName, + final String nameName, + final Object theMbean) { + final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + ObjectName name = getMBeanName(serviceName, nameName); + try { + mbs.registerMBean(theMbean, name); + return name; + } catch (InstanceAlreadyExistsException ie) { + // Ignore if instance already exists + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + static public void unregisterMBean(ObjectName mbeanName) { + final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + if (mbeanName == null) + return; + try { + mbs.unregisterMBean(mbeanName); + } catch (InstanceNotFoundException e ) { + // ignore + } catch (Exception e) { + e.printStackTrace(); + } + } + + static private ObjectName getMBeanName(final String serviceName, + final String nameName) { + ObjectName name = null; + try { + name = new ObjectName("hadoop:" + + "service=" + serviceName + ",name=" + nameName); + } catch (MalformedObjectNameException e) { + e.printStackTrace(); + } + return name; + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java index 14bd2fd..42c04e4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java @@ -115,8 +115,6 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; -import net.sf.ehcache.search.Results; - /** * A mock RegionServer implementation. * Use this when you can't bend Mockito to your liking (e.g. return null result http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java index 735fec8..5649d8a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java @@ -272,7 +272,7 @@ public class TestBulkLoad { HFile.WriterFactory hFileFactory = HFile.getWriterFactoryNoCache(conf); // TODO We need a way to do this without creating files File hFileLocation = testFolder.newFile(); - FSDataOutputStream out = new FSDataOutputStream(new FileOutputStream(hFileLocation)); + FSDataOutputStream out = new FSDataOutputStream(new FileOutputStream(hFileLocation), null); try { hFileFactory.withOutputStream(out); hFileFactory.withFileContext(new HFileContext()); http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-shell/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index af0ad0f..65bbcf7 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -395,16 +395,32 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-testing-util/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 333fb57..8231a91 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -195,25 +195,37 @@ <value>3.0</value> </property> </activation> - <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> - </properties> + <properties> + <hadoop.version>${hadoop-three.version}</hadoop.version> + </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> </dependency> </dependencies> - </profile> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 3b8a3da..3283b2e 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -565,16 +565,28 @@ </property> </activation> <properties> - <hadoop.version>3.0-SNAPSHOT</hadoop.version> + <hadoop.version>${hadoop-three.version}</hadoop.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> @@ -593,7 +605,8 @@ the required classpath that is required in the env of the launch container in the mini mr/yarn cluster --> - <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile> + <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath + </outputFile> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java index 205e3ad..c8ef247 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java @@ -39,8 +39,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler; import org.apache.hadoop.hbase.thrift.generated.TIncrement; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.MBeanUtil; import org.apache.hadoop.hbase.util.Threads; -import org.apache.hadoop.metrics.util.MBeanUtil; import org.apache.thrift.TException; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/5f58e618/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1381a41..b47cdbf 100644 --- a/pom.xml +++ b/pom.xml @@ -2360,6 +2360,18 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -2391,6 +2403,10 @@ <artifactId>hadoop-hdfs</artifactId> <exclusions> <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2406,6 +2422,14 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> </exclusions> <version>${hadoop-three.version}</version> </dependency> @@ -2417,6 +2441,10 @@ <scope>test</scope> <exclusions> <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2432,12 +2460,26 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -2445,6 +2487,14 @@ <version>${hadoop-three.version}</version> <exclusions> <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2464,6 +2514,18 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehause.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehause.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -2484,6 +2546,14 @@ <version>${hadoop-three.version}</version> <exclusions> <exclusion> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2514,7 +2584,6 @@ </dependencies> </dependencyManagement> </profile> - <!-- profiles for the tests See as well the properties of the project for the values when no profile is active. -->
