knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject [1/2] knox git commit: [KNOX-675] - Upgrade Knox's Jetty dependency to latest 9.x
Date Thu, 03 Mar 2016 22:30:12 GMT
Repository: knox
Updated Branches:
  refs/heads/master ea7efe7ad -> 96e396223


http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/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 7102897..f55e75b 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
@@ -17,11 +17,12 @@
  */
 package org.apache.hadoop.test.mock;
 
-import javax.servlet.ServletInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class MockServletInputStream extends ServletInputStream {
+import org.apache.hadoop.gateway.servlet.SynchronousServletInputStreamAdapter;
+
+public class MockServletInputStream extends SynchronousServletInputStreamAdapter {
 
   private InputStream stream;
 

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/gateway-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index 6f298e9..0efcd75 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>test-jetty-servlet</artifactId>
+            <artifactId>jetty-servlet</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/gateway-util-common/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-common/pom.xml b/gateway-util-common/pom.xml
index 1cbe38d..db4df31 100644
--- a/gateway-util-common/pom.xml
+++ b/gateway-util-common/pom.xml
@@ -56,6 +56,10 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
 
         <!-- ********** ********** ********** ********** ********** ********** -->
         <!-- ********** Test Dependencies                           ********** -->

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletInputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletInputStreamAdapter.java
b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletInputStreamAdapter.java
new file mode 100644
index 0000000..dbf508b
--- /dev/null
+++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletInputStreamAdapter.java
@@ -0,0 +1,39 @@
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.gateway.servlet;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+
+public abstract class SynchronousServletInputStreamAdapter extends ServletInputStream {
+
+  @Override
+  public boolean isFinished() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isReady() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void setReadListener(ReadListener readListener) {
+    throw new UnsupportedOperationException();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletOutputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletOutputStreamAdapter.java
b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletOutputStreamAdapter.java
new file mode 100644
index 0000000..3c94595
--- /dev/null
+++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/servlet/SynchronousServletOutputStreamAdapter.java
@@ -0,0 +1,34 @@
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.gateway.servlet;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+
+public abstract class SynchronousServletOutputStreamAdapter extends ServletOutputStream {
+
+  @Override
+  public boolean isReady() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void setWriteListener( WriteListener writeListener ) {
+    throw new UnsupportedOperationException();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/gateway-util-urltemplate/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/pom.xml b/gateway-util-urltemplate/pom.xml
index 2f5c309..2ae4192 100644
--- a/gateway-util-urltemplate/pom.xml
+++ b/gateway-util-urltemplate/pom.xml
@@ -69,14 +69,6 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.eclipse.jetty.orbit</groupId>
-            <artifactId>javax.servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
-        -->
-
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>

http://git-wip-us.apache.org/repos/asf/knox/blob/96e39622/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 508c2d7..f185dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <gateway-group>org.apache.knox</gateway-group>
         <groovy-version>2.4.6</groovy-version>
         <hadoop-version>2.2.0</hadoop-version>
-        <jetty-version>8.1.18.v20150929</jetty-version>
+        <jetty-version>9.2.15.v20160210</jetty-version>
         <surefire-version>2.16</surefire-version>
         <failsafe-version>2.19.1</failsafe-version>
     </properties>
@@ -668,6 +668,11 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
                 <version>${jetty-version}</version>
             </dependency>
@@ -679,30 +684,17 @@
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
             </dependency>
 
             <!--
             <dependency>
-                <groupId>org.eclipse.jetty.orbit</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>3.0.0.v201112011016</version>
-            </dependency>
-            -->
-            <!--
-            <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jaspi</artifactId>
                 <version>${jetty-version}</version>
             </dependency>
             -->
             <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>test-jetty-servlet</artifactId>
-                <version>${jetty-version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.eclipse.persistence</groupId>
                 <artifactId>eclipselink</artifactId>
                 <version>2.5.2</version>


Mime
View raw message