You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/25 20:22:01 UTC
[4/5] incubator-slider git commit: SLIDER-670 NPE in
RMAuthenticationFilter chain, missing httpclient method
SLIDER-670 NPE in RMAuthenticationFilter chain, missing httpclient method
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/00eca8fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/00eca8fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/00eca8fc
Branch: refs/heads/develop
Commit: 00eca8fc98bd151cb551354c518376f552806a36
Parents: 867b67d
Author: Steve Loughran <st...@apache.org>
Authored: Sat Nov 22 18:46:53 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 25 19:20:47 2014 +0000
----------------------------------------------------------------------
pom.xml | 18 +++++++++++++++++-
slider-core/pom.xml | 11 ++++++++++-
.../standalone/TestStandaloneAgentWeb.groovy | 2 +-
3 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00eca8fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03a1907..7f73bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -509,6 +509,10 @@
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -613,7 +617,19 @@
</exclusion>
</exclusions>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+
<!-- ======================================================== -->
<!-- HBASE -->
<!-- ======================================================== -->
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00eca8fc/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 6bb7c09..a36e915 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -282,7 +282,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -320,6 +319,16 @@
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/00eca8fc/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy
index 717d98f..458c921 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy
@@ -69,7 +69,7 @@ class TestStandaloneAgentWeb extends AgentMiniClusterTestBase {
def appmaster = report.trackingUrl
-// GET(appmaster)
+ GET(appmaster)
// GET(appmaster, RestPaths.SYSTEM_HEALTHCHECK)
// GET(appmaster, RestPaths.SYSTEM_PING)