Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 27E9818DB8 for ; Fri, 12 Feb 2016 11:29:28 +0000 (UTC) Received: (qmail 58080 invoked by uid 500); 12 Feb 2016 11:29:27 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 57982 invoked by uid 500); 12 Feb 2016 11:29:27 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 56624 invoked by uid 99); 12 Feb 2016 11:29:26 -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; Fri, 12 Feb 2016 11:29:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1D56E0E4C; Fri, 12 Feb 2016 11:29:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fhueske@apache.org To: commits@flink.apache.org Date: Fri, 12 Feb 2016 11:29:55 -0000 Message-Id: <9099586e98bf4f71b9bec68f0908f749@git.apache.org> In-Reply-To: <523b4fefc1d94b1abd03b184e6f14228@git.apache.org> References: <523b4fefc1d94b1abd03b184e6f14228@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] flink git commit: [FLINK-3271] [build] Don't exclude jetty-util dependency from the Hadoop dependencies [FLINK-3271] [build] Don't exclude jetty-util dependency from the Hadoop dependencies This closes #1543 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/82c7383a Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/82c7383a Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/82c7383a Branch: refs/heads/tableOnCalcite Commit: 82c7383a67a8349d05dc98780667b3a47ab3cc54 Parents: dcea46e Author: Abhishek Agarwal Authored: Sun Jan 24 20:22:45 2016 +0530 Committer: Stephan Ewen Committed: Thu Feb 11 21:34:03 2016 +0100 ---------------------------------------------------------------------- .../flink-shaded-hadoop1/pom.xml | 12 ------ .../flink-shaded-hadoop2/pom.xml | 41 +------------------- 2 files changed, 1 insertion(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/82c7383a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml index 15082aa..e8634f5 100644 --- a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml +++ b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml @@ -69,10 +69,6 @@ under the License. jsp-2.1 - org.mortbay.jetty - jetty-util - - org.eclipse.jdt core @@ -81,14 +77,6 @@ under the License. servlet-api - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-core http://git-wip-us.apache.org/repos/asf/flink/blob/82c7383a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml index 5eb8043..c642653 100644 --- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml +++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml @@ -68,10 +68,7 @@ under the License. org.mortbay.jetty jsp-2.1 - - org.mortbay.jetty - jetty-util - + org.eclipse.jdt core @@ -81,10 +78,6 @@ under the License. jetty - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-json @@ -185,10 +178,6 @@ under the License. jsp-2.1 - org.mortbay.jetty - jetty-util - - org.eclipse.jdt core @@ -197,10 +186,6 @@ under the License. jetty - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-json @@ -301,10 +286,6 @@ under the License. jsp-2.1 - org.mortbay.jetty - jetty-util - - org.eclipse.jdt core @@ -325,10 +306,6 @@ under the License. jetty - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-json @@ -429,10 +406,6 @@ under the License. jsp-2.1 - org.mortbay.jetty - jetty-util - - org.eclipse.jdt core @@ -453,10 +426,6 @@ under the License. jetty - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-json @@ -557,10 +526,6 @@ under the License. jsp-2.1 - org.mortbay.jetty - jetty-util - - org.eclipse.jdt core @@ -581,10 +546,6 @@ under the License. jetty - org.mortbay.jetty - jetty-util - - com.sun.jersey jersey-json