[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 <abhishek.agar...@inmobi.com>
Authored: Sun Jan 24 20:22:45 2016 +0530
Committer: Stephan Ewen <se...@apache.org>
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.
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
                                </exclusion>
@@ -81,14 +77,6 @@ under the License.
                                        <artifactId>servlet-api</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-core</artifactId>
                                </exclusion>

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.
                                        <groupId>org.mortbay.jetty</groupId>
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
-                               <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
+
                                <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
@@ -81,10 +78,6 @@ under the License.
                                        <artifactId>jetty</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-json</artifactId>
                                </exclusion>
@@ -185,10 +178,6 @@ under the License.
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
                                </exclusion>
@@ -197,10 +186,6 @@ under the License.
                                        <artifactId>jetty</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-json</artifactId>
                                </exclusion>
@@ -301,10 +286,6 @@ under the License.
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
                                </exclusion>
@@ -325,10 +306,6 @@ under the License.
                                        <artifactId>jetty</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-json</artifactId>
                                </exclusion>
@@ -429,10 +406,6 @@ under the License.
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
                                </exclusion>
@@ -453,10 +426,6 @@ under the License.
                                        <artifactId>jetty</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-json</artifactId>
                                </exclusion>
@@ -557,10 +526,6 @@ under the License.
                                        <artifactId>jsp-2.1</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>org.eclipse.jdt</groupId>
                                        <artifactId>core</artifactId>
                                </exclusion>
@@ -581,10 +546,6 @@ under the License.
                                        <artifactId>jetty</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>jetty-util</artifactId>
-                               </exclusion>
-                               <exclusion>
                                        <groupId>com.sun.jersey</groupId>
                                        <artifactId>jersey-json</artifactId>
                                </exclusion>

Reply via email to