From commits-return-1519-apmail-knox-commits-archive=knox.apache.org@knox.apache.org Thu Mar 3 22:30:12 2016 Return-Path: X-Original-To: apmail-knox-commits-archive@minotaur.apache.org Delivered-To: apmail-knox-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD0FE18BEA for ; Thu, 3 Mar 2016 22:30:12 +0000 (UTC) Received: (qmail 73383 invoked by uid 500); 3 Mar 2016 22:30:12 -0000 Delivered-To: apmail-knox-commits-archive@knox.apache.org Received: (qmail 73360 invoked by uid 500); 3 Mar 2016 22:30:12 -0000 Mailing-List: contact commits-help@knox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@knox.apache.org Delivered-To: mailing list commits@knox.apache.org Received: (qmail 73351 invoked by uid 99); 3 Mar 2016 22:30:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 22:30:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A7CEDE78F6; Thu, 3 Mar 2016 22:30:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kminder@apache.org To: commits@knox.apache.org Date: Thu, 03 Mar 2016 22:30:12 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] knox git commit: [KNOX-675] - Upgrade Knox's Jetty dependency to latest 9.x 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 @@ org.eclipse.jetty - test-jetty-servlet + jetty-servlet test 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 @@ commons-codec commons-codec + + javax.servlet + javax.servlet-api + 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 + *

+ * 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.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 + *

+ * 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.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 @@ javax.servlet-api test - - org.hamcrest hamcrest-core 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 @@ org.apache.knox 2.4.6 2.2.0 - 8.1.18.v20150929 + 9.2.15.v20160210 2.16 2.19.1 @@ -668,6 +668,11 @@ org.eclipse.jetty + jetty-util + ${jetty-version} + + + org.eclipse.jetty jetty-servlet ${jetty-version} @@ -679,30 +684,17 @@ javax.servlet javax.servlet-api - 3.0.1 + 3.1.0 - - org.eclipse.jetty - test-jetty-servlet - ${jetty-version} - - - org.eclipse.persistence eclipselink 2.5.2