knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: [KNOX-675] - Upgrade Knox's Jetty dependency to latest 9.x. Fix circular dependency.
Date Fri, 04 Mar 2016 00:30:47 GMT
Repository: knox
Updated Branches:
  refs/heads/master 96e396223 -> 374f51e02


[KNOX-675] - Upgrade Knox's Jetty dependency to latest 9.x. Fix circular dependency.


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/374f51e0
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/374f51e0
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/374f51e0

Branch: refs/heads/master
Commit: 374f51e0240eb81c3bc60daca8acd24a68bb7c77
Parents: 96e3962
Author: Kevin Minder <kminder@apache.org>
Authored: Thu Mar 3 19:30:44 2016 -0500
Committer: Kevin Minder <kminder@apache.org>
Committed: Thu Mar 3 19:30:44 2016 -0500

----------------------------------------------------------------------
 gateway-test-utils/pom.xml                      |  5 -----
 .../test/mock/MockServletInputStream.java       | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/374f51e0/gateway-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml
index 4283d62..790b603 100644
--- a/gateway-test-utils/pom.xml
+++ b/gateway-test-utils/pom.xml
@@ -50,11 +50,6 @@
     <dependencies>
 
         <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-util-common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
             <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/knox/blob/374f51e0/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockServletInputStream.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockServletInputStream.java
b/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockServletInputStream.java
index f55e75b..227dc1c 100644
--- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockServletInputStream.java
+++ b/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockServletInputStream.java
@@ -20,9 +20,10 @@ package org.apache.hadoop.test.mock;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.hadoop.gateway.servlet.SynchronousServletInputStreamAdapter;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
 
-public class MockServletInputStream extends SynchronousServletInputStreamAdapter {
+public class MockServletInputStream extends ServletInputStream {
 
   private InputStream stream;
 
@@ -35,4 +36,19 @@ public class MockServletInputStream extends SynchronousServletInputStreamAdapter
     return stream.read();
   }
 
+  @Override
+  public boolean isFinished() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isReady() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void setReadListener( ReadListener readListener ) {
+    throw new UnsupportedOperationException();
+  }
+
 }


Mime
View raw message