You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2014/06/02 20:07:22 UTC
git commit: SLIDER-110 removed unused dependencies and added
undeclared direct dependencies,
altered some tests to avoid unnecessary single-use dependencies
Repository: incubator-slider
Updated Branches:
refs/heads/develop 5f3b8a6d7 -> 3954ce3b6
SLIDER-110 removed unused dependencies and added undeclared direct dependencies, altered some tests to avoid unnecessary single-use dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/3954ce3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3954ce3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3954ce3b
Branch: refs/heads/develop
Commit: 3954ce3b6755525c0b2e16e36b88452a321bea58
Parents: 5f3b8a6
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Mon Jun 2 11:06:51 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Mon Jun 2 11:06:51 2014 -0700
----------------------------------------------------------------------
pom.xml | 307 +++++++------------
slider-assembly/pom.xml | 1 -
slider-core/pom.xml | 122 +++-----
.../server/appmaster/web/SliderAMWebApp.java | 3 +-
.../agent/AgentMiniClusterTestBase.groovy | 2 -
.../providers/agent/AgentTestUtils.groovy | 13 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 8 +-
.../appmaster/web/TestSliderAmFilter.java | 14 +-
.../web/rest/agent/TestAMAgentWebServices.java | 20 +-
.../management/TestAMManagementWebServices.java | 65 ++--
slider-funtest/pom.xml | 27 +-
.../accumulo/accumulo-funtests/pom.xml | 15 +-
.../accumulo/slider-accumulo-provider/pom.xml | 44 +--
slider-providers/hbase/hbase-funtests/pom.xml | 32 +-
.../hbase/slider-hbase-provider/pom.xml | 22 +-
.../failures/TestKilledHBaseAM.groovy | 6 +-
16 files changed, 290 insertions(+), 411 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 771ac8a..54fca26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,22 +261,24 @@
<commons-digester.version>1.8</commons-digester.version>
<commons-configuration.version>1.6</commons-configuration.version>
<commons-lang.version>2.6</commons-lang.version>
+ <commons-compress.version>1.4.1</commons-compress.version>
+ <commons-logging.version>1.1.3</commons-logging.version>
+ <commons-io.version>2.4</commons-io.version>
<curator.version>2.4.1</curator.version>
<easymock.version>3.1</easymock.version>
<guava.version>11.0.2</guava.version>
<gson.version>2.2.2</gson.version>
<guice.version>3.0</guice.version>
- <httpclient.version>4.2.5</httpclient.version>
+ <httpclient.version>3.1</httpclient.version>
-
-<!-- <jackson.version>1.8.8</jackson.version>-->
<jackson.version>1.9.13</jackson.version>
<jcommander.version>1.30</jcommander.version>
<jersey.version>1.9</jersey.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <jsr311-api.version>1.1.1</jsr311-api.version>
<junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
<mockito.version>1.8.5</mockito.version>
- <powermock.version>1.5</powermock.version>
<!-- ProtocolBuffer version, used to verify the protoc version and -->
<!-- define the protobuf JAR version -->
@@ -482,6 +484,54 @@
<dependencyManagement>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-agent</artifactId>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-funtest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-assembly</artifactId>
+ <classifier>all</classifier>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-hbase-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.slider</groupId>
+ <artifactId>slider-hbase-provider</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
@@ -500,9 +550,15 @@
</exclusions>
</dependency>
+ <!-- hadoop-client includes the following jars, so they do not need to be
+ included separately:
+ hadoop-common, hadoop-hdfs, hadoop-mapreduce-client-app,
+ hadoop-yarn-api, hadoop-mapreduce-client-core,
+ hadoop-mapreduce-client-jobclient, and hadoop-annotations
+ -->
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
@@ -510,30 +566,10 @@
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
@@ -544,20 +580,11 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <type>pom</type>
- </dependency>
-
+ <!-- hadoop-minicluster includes the following test-jars, so they do not
+ need to be included separately:
+ hadoop-common, hadoop-hdfs, hadoop-yarn-server-tests,
+ hadoop-mapreduce-client-jobclient
+ -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
@@ -572,37 +599,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-common</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
<version>${hadoop.version}</version>
<exclusions>
@@ -615,30 +611,14 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client</artifactId>
- <version>${hadoop.version}</version>
- <type>pom</type>
- <exclusions>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
-
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -678,16 +658,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
@@ -697,19 +674,17 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
- <exclusions>
- </exclusions>
</dependency>
+
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
<version>${httpclient.version}</version>
- <exclusions>
- </exclusions>
</dependency>
<!-- ======================================================== -->
@@ -1045,32 +1020,6 @@
<!-- Accumulo -->
<!-- ======================================================== -->
- <!--
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
- <version>${accumulo.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server</artifactId>
- <version>${accumulo.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
@@ -1117,12 +1066,6 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- <version>${accumulo.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
<version>${accumulo.version}</version>
</dependency>
@@ -1140,18 +1083,30 @@
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
@@ -1217,18 +1172,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- <version>${stringtemplate.version}</version>
- </dependency>
- -->
<!-- Used for unit testing -->
<dependency>
<groupId>junit</groupId>
@@ -1241,51 +1184,30 @@
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.12</version>
-
- <exclusions>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
-
- </dependency>
-
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
-
- </dependency>
- -->
-
<!-- ======================================================== -->
<!-- Jersey and webapp support -->
<!-- ======================================================== -->
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311-api.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
+
<dependency>
-
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey.version}</version>
@@ -1296,8 +1218,8 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
-
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
@@ -1355,27 +1277,6 @@
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-easymock</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 255b851..d5fc777 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -227,7 +227,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <type>pom</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index bafb91e..d1b4149 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -322,11 +322,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
@@ -369,55 +364,26 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-common</artifactId>
- <scope>test</scope>
+ <artifactId>hadoop-client</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop.version}</version>
+ <artifactId>hadoop-yarn-client</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
- <version>${hadoop.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hadoop-minicluster</artifactId>
+ <scope>test</scope>
</dependency>
<!--
@@ -474,8 +440,13 @@
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
</dependency>
<dependency>
@@ -483,6 +454,26 @@
<artifactId>commons-digester</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
<!-- ======================================================== -->
<!-- service registry -->
<!-- ======================================================== -->
@@ -490,25 +481,21 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery-server</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
@@ -521,10 +508,20 @@
<!-- ======================================================== -->
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <artifactId>jersey-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
@@ -560,10 +557,11 @@
<artifactId>jersey-test-framework-core</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
+ <groupId>com.sun.jersey.jersey-test-framework</groupId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -577,26 +575,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
index fc9929a..0e51f88 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
@@ -19,7 +19,6 @@ package org.apache.slider.server.appmaster.web;
import com.google.common.base.Preconditions;
import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
import com.sun.jersey.api.core.ResourceConfig;
-import com.sun.jersey.core.util.FeaturesAndProperties;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import com.sun.jersey.spi.container.servlet.ServletContainer;
import org.apache.curator.x.discovery.ServiceDiscovery;
@@ -100,7 +99,7 @@ public class SliderAMWebApp extends WebApp {
Map<String, String> params = new HashMap<>();
params.put(ResourceConfig.FEATURE_IMPLICIT_VIEWABLES, "true");
params.put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, "true");
- params.put(FeaturesAndProperties.FEATURE_XMLROOTELEMENT_PROCESSING, "true");
+ params.put(ResourceConfig.FEATURE_XMLROOTELEMENT_PROCESSING, "true");
params.put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS, GZIPContentEncodingFilter.class.getName());
params.put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, GZIPContentEncodingFilter.class.getName());
//params.put("com.sun.jersey.spi.container.ContainerRequestFilters", "com.sun.jersey.api.container.filter.LoggingFilter");
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index 445d0a4..cea3d74 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -28,8 +28,6 @@ import org.apache.slider.providers.agent.AgentKeys
import org.apache.slider.test.YarnZKMiniClusterTestBase
import org.junit.BeforeClass
-import javax.swing.ListModel
-
/**
* test base for agent clusters
*/
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestUtils.groovy
index 5888557..989919f 100644
--- a/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestUtils.groovy
@@ -23,8 +23,6 @@ import com.sun.jersey.api.client.config.ClientConfig
import com.sun.jersey.api.client.config.DefaultClientConfig
import com.sun.jersey.api.json.JSONConfiguration
import org.apache.slider.server.appmaster.web.rest.agent.Register
-import org.codehaus.jettison.json.JSONException
-import org.codehaus.jettison.json.JSONObject
class AgentTestUtils {
@@ -36,20 +34,11 @@ class AgentTestUtils {
return Client.create(clientConfig);
}
-
- public static Register createDummyJSONRegister() throws JSONException {
+ public static Register createDummyJSONRegister() {
Register register = new Register();
register.setResponseId(-1);
register.setTimestamp(System.currentTimeMillis());
register.setHostname("dummyHost");
return register;
}
-
- public static JSONObject createDummyHeartBeat() throws JSONException {
- JSONObject json = new JSONObject();
- json.put("responseId", -1);
- json.put("timestamp", System.currentTimeMillis());
- json.put("hostname", "dummyHost");
- return json;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index d1cc5ca..6a92047 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -32,8 +32,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.hadoop.yarn.conf.YarnConfiguration
import org.apache.hadoop.yarn.server.MiniYARNCluster
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler
import org.apache.slider.api.ClusterNode
import org.apache.slider.client.SliderClient
import org.apache.slider.common.SliderExitCodes
@@ -79,6 +77,9 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
*/
public static final String YRAM = "256"
+ public static final String FIFO_SCHEDULER = "org.apache.hadoop.yarn.server" +
+ ".resourcemanager.scheduler.fifo.FifoScheduler";
+
public static final YarnConfiguration SLIDER_CONFIG = SliderUtils.createConfiguration();
static {
@@ -214,8 +215,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
int numLogDirs,
boolean startHDFS) {
conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 64);
- conf.setClass(YarnConfiguration.RM_SCHEDULER,
- FifoScheduler.class, ResourceScheduler.class);
+ conf.set(YarnConfiguration.RM_SCHEDULER, FIFO_SCHEDULER);
SliderUtils.patchConfiguration(conf)
miniCluster = new MiniYARNCluster(name, noOfNodeManagers, numLocalDirs, numLogDirs)
miniCluster.init(conf)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java
index bdc11df..00e193d 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java
@@ -21,7 +21,6 @@ package org.apache.slider.server.appmaster.web;
import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServlet;
import org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpFilter;
import org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpServletRequestWrapper;
-import org.glassfish.grizzly.servlet.HttpServletResponseImpl;
import org.junit.Test;
import org.mockito.Mockito;
@@ -31,8 +30,11 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.ServletResponseWrapper;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
@@ -126,7 +128,9 @@ public class TestSliderAmFilter {
SliderAmIpFilter testFilter = new SliderAmIpFilter();
testFilter.init(config);
- HttpServletResponseForTest response = new HttpServletResponseForTest();
+ HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class);
+ HttpServletResponseForTest response =
+ new HttpServletResponseForTest(mockResponse);
// Test request should implements HttpServletRequest
ServletRequest failRequest = Mockito.mock(ServletRequest.class);
@@ -170,9 +174,13 @@ public class TestSliderAmFilter {
}
- private class HttpServletResponseForTest extends HttpServletResponseImpl {
+ private class HttpServletResponseForTest extends HttpServletResponseWrapper {
String redirectLocation = "";
+ public HttpServletResponseForTest(HttpServletResponse response) {
+ super(response);
+ }
+
public String getRedirect() {
return redirectLocation;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
index 75ee7db..ab953b8 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
@@ -48,8 +48,6 @@ import org.apache.slider.server.appmaster.web.WebAppApi;
import org.apache.slider.server.appmaster.web.WebAppApiImpl;
import org.apache.slider.server.appmaster.web.rest.AMWebServices;
import org.apache.slider.server.appmaster.web.rest.SliderJacksonJaxbJsonProvider;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -173,7 +171,7 @@ public class TestAMAgentWebServices extends JerseyTest {
}
@Test
- public void testRegistration() throws JSONException, Exception {
+ public void testRegistration() throws Exception {
RegistrationResponse response;
Client client = createTestClient();
WebResource webResource = client.resource(AGENT_URL + "test/register");
@@ -189,7 +187,7 @@ public class TestAMAgentWebServices extends JerseyTest {
}
@Test
- public void testHeartbeat() throws JSONException, Exception {
+ public void testHeartbeat() throws Exception {
HeartBeatResponse response;
Client client = createTestClient();
WebResource webResource = client.resource(AGENT_URL + "test/heartbeat");
@@ -199,7 +197,7 @@ public class TestAMAgentWebServices extends JerseyTest {
}
@Test
- public void testHeadURL() throws JSONException, Exception {
+ public void testHeadURL() throws Exception {
Client client = createTestClient();
WebResource webResource = client.resource(AGENT_URL);
ClientResponse response = webResource.type(MediaType.APPLICATION_JSON)
@@ -213,7 +211,7 @@ public class TestAMAgentWebServices extends JerseyTest {
Thread.sleep(60 * 1000);
}
- private Register createDummyJSONRegister() throws JSONException {
+ private Register createDummyJSONRegister() {
Register register = new Register();
register.setResponseId(-1);
register.setTimestamp(System.currentTimeMillis());
@@ -221,11 +219,11 @@ public class TestAMAgentWebServices extends JerseyTest {
return register;
}
- private JSONObject createDummyHeartBeat() throws JSONException {
- JSONObject json = new JSONObject();
- json.put("responseId", -1);
- json.put("timestamp", System.currentTimeMillis());
- json.put("hostname", "dummyHost");
+ private HeartBeat createDummyHeartBeat() {
+ HeartBeat json = new HeartBeat();
+ json.setResponseId(-1);
+ json.setTimestamp(System.currentTimeMillis());
+ json.setHostname("dummyHost");
return json;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
index c958081..5cb31a9 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
@@ -25,6 +25,7 @@ import com.google.inject.servlet.GuiceServletContextListener;
import com.google.inject.servlet.ServletModule;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import com.sun.jersey.test.framework.JerseyTest;
import com.sun.jersey.test.framework.WebAppDescriptor;
@@ -48,8 +49,8 @@ import org.apache.slider.server.appmaster.web.WebAppApi;
import org.apache.slider.server.appmaster.web.WebAppApiImpl;
import org.apache.slider.server.appmaster.web.rest.AMWebServices;
import org.apache.slider.server.appmaster.web.rest.SliderJacksonJaxbJsonProvider;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
+import org.apache.slider.server.appmaster.web.rest.management.resources.AggregateConfResource;
+import org.apache.slider.server.appmaster.web.rest.management.resources.ConfTreeResource;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -61,6 +62,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -198,28 +200,30 @@ public class TestAMManagementWebServices extends JerseyTest {
"org.apache.hadoop.yarn.appmaster.web")
.contextListenerClass(GuiceServletConfig.class)
.filterClass(com.google.inject.servlet.GuiceFilter.class)
- .contextPath("slideram").servletPath("/").build());
+ .contextPath("slideram").servletPath("/")
+ .clientConfig(
+ new DefaultClientConfig(SliderJacksonJaxbJsonProvider.class))
+ .build());
}
@Test
- public void testAppResource() throws JSONException, Exception {
+ public void testAppResource() throws Exception {
WebResource r = resource();
ClientResponse response = r.path("ws").path("v1").path("slider").path("mgmt").path("app")
.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
assertEquals(200, response.getStatus());
assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 4, json.length());
+ AggregateConfResource json = response.getEntity(AggregateConfResource.class);
assertEquals("wrong href",
"http://localhost:9998/slideram/ws/v1/slider/mgmt/app",
- json.getString("href"));
- assertNotNull("no resources", json.getJSONObject("resources"));
- assertNotNull("no internal", json.getJSONObject("internal"));
- assertNotNull("no appConf", json.getJSONObject("appConf"));
+ json.getHref());
+ assertNotNull("no resources", json.getResources());
+ assertNotNull("no internal", json.getInternal());
+ assertNotNull("no appConf", json.getAppConf());
}
@Test
- public void testAppInternal() throws JSONException, Exception {
+ public void testAppInternal() throws Exception {
WebResource r = resource();
ClientResponse
response =
@@ -228,18 +232,17 @@ public class TestAMManagementWebServices extends JerseyTest {
.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
assertEquals(200, response.getStatus());
assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 4, json.length());
+ ConfTreeResource json = response.getEntity(ConfTreeResource.class);
assertEquals("wrong href",
"http://localhost:9998/slideram/ws/v1/slider/mgmt/app/configurations/internal",
- json.getString("href"));
+ json.getHref());
assertEquals("wrong description",
- "Internal configuration DO NOT EDIT",
- json.getJSONObject("metadata").getString("description"));
+ "Internal configuration DO NOT EDIT",
+ json.getMetadata().get("description"));
}
@Test
- public void testAppResources() throws JSONException, Exception {
+ public void testAppResources() throws Exception {
WebResource r = resource();
ClientResponse
response =
@@ -249,19 +252,18 @@ public class TestAMManagementWebServices extends JerseyTest {
assertEquals(200, response.getStatus());
assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 4, json.length());
+ ConfTreeResource json = response.getEntity(ConfTreeResource.class);
assertEquals("wrong href",
"http://localhost:9998/slideram/ws/v1/slider/mgmt/app/configurations/resources",
- json.getString("href"));
- json = json.getJSONObject("components");
- assertNotNull("no components", json);
- assertEquals("incorrect number of components", 2, json.length());
- assertNotNull("wrong component", json.getJSONObject("worker"));
+ json.getHref());
+ Map<String,Map<String, String>> components = json.getComponents();
+ assertNotNull("no components", components);
+ assertEquals("incorrect number of components", 2, components.size());
+ assertNotNull("wrong component", components.get("worker"));
}
@Test
- public void testAppAppConf() throws JSONException, Exception {
+ public void testAppAppConf() throws Exception {
WebResource r = resource();
ClientResponse
response =
@@ -270,14 +272,13 @@ public class TestAMManagementWebServices extends JerseyTest {
.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
assertEquals(200, response.getStatus());
assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 4, json.length());
+ ConfTreeResource json = response.getEntity(ConfTreeResource.class);
assertEquals("wrong href",
"http://localhost:9998/slideram/ws/v1/slider/mgmt/app/configurations/appConf",
- json.getString("href"));
- json = json.getJSONObject("components");
- assertNotNull("no components", json);
- assertEquals("incorrect number of components", 2, json.length());
- assertNotNull("wrong component", json.getJSONObject("worker"));
+ json.getHref());
+ Map<String,Map<String, String>> components = json.getComponents();
+ assertNotNull("no components", components);
+ assertEquals("incorrect number of components", 2, components.size());
+ assertNotNull("wrong component", components.get("worker"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 72012a2..79e90cf 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -161,7 +161,6 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-core</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -173,14 +172,12 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-assembly</artifactId>
- <version>${project.version}</version>
<classifier>all</classifier>
<type>tar.gz</type>
<scope>test</scope>
@@ -188,13 +185,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
@@ -253,11 +244,25 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-agent</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>tar.gz</type>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index 3b58581..c2d7ca9 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -184,14 +184,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
@@ -214,12 +207,6 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index a462668..330f318 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -165,14 +165,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
@@ -182,12 +175,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<scope>test</scope>
@@ -201,22 +188,43 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
+ <artifactId>accumulo-trace</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <artifactId>accumulo-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-test</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 40ff437..30013a4 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -134,13 +134,11 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-hbase-provider</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-hbase-provider</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -148,7 +146,6 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -162,7 +159,6 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-assembly</artifactId>
- <version>${project.version}</version>
<classifier>all</classifier>
<type>tar.gz</type>
<scope>test</scope>
@@ -171,20 +167,12 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-funtest</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
@@ -241,6 +229,24 @@
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index d7ed14a..f1b27f0 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -151,13 +151,11 @@
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.slider</groupId>
<artifactId>slider-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -170,13 +168,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
@@ -235,6 +227,18 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3954ce3b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
index c585dc1..2237c5d 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
@@ -27,8 +27,6 @@ import org.apache.hadoop.hbase.client.HConnection
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.hadoop.yarn.conf.YarnConfiguration
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.api.ClusterDescription
@@ -38,6 +36,7 @@ import org.apache.slider.client.SliderClient
import org.apache.slider.common.params.ActionAMSuicideArgs
import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
+import static org.apache.slider.test.SliderTestUtils.log
/**
* test create a live region service
@@ -58,8 +57,7 @@ class TestKilledHBaseAM extends HBaseMiniClusterTestBase {
// patch the configuration for AM restart
conf.setInt(SliderXmlConfKeys.KEY_AM_RESTART_LIMIT, 3)
- conf.setClass(YarnConfiguration.RM_SCHEDULER,
- FifoScheduler, ResourceScheduler);
+ conf.set(YarnConfiguration.RM_SCHEDULER, FIFO_SCHEDULER);
createMiniCluster(clustername, conf, 1, 1, 1, true, false)
describe(" Kill the AM, expect cluster to die");