Revert "[hotfix] [build] Drop transitive jersey/jettison/servlet dependencies pulled via Hadoop"
This reverts commit 104ea244e94aa8be7bd5089c13cd8292905eb6fd. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c4c5c77e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c4c5c77e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c4c5c77e Branch: refs/heads/release-1.3 Commit: c4c5c77ed2d0639439b49f1ff61fe1b8add5a637 Parents: 0fe8dfe Author: Stefan Richter <[email protected]> Authored: Sun May 14 15:37:09 2017 +0200 Committer: Stefan Richter <[email protected]> Committed: Sun May 14 15:37:09 2017 +0200 ---------------------------------------------------------------------- .../flink-shaded-hadoop2/pom.xml | 61 ++++---------------- 1 file changed, 11 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c4c5c77e/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 a1159d6..9ac033e 100644 --- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml +++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml @@ -70,23 +70,20 @@ under the License. </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-2.1</artifactId> </exclusion> + <exclusion> <groupId>org.eclipse.jdt</groupId> <artifactId>core</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -109,10 +106,6 @@ under the License. <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -198,10 +191,6 @@ under the License. </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> @@ -213,8 +202,8 @@ under the License. <artifactId>core</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -237,10 +226,6 @@ under the License. <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -314,10 +299,6 @@ under the License. </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> @@ -341,8 +322,8 @@ under the License. <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -365,10 +346,6 @@ under the License. <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -442,10 +419,6 @@ under the License. </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> @@ -469,8 +442,8 @@ under the License. <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -493,10 +466,6 @@ under the License. <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -570,10 +539,6 @@ under the License. </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> @@ -597,8 +562,8 @@ under the License. <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -621,10 +586,6 @@ under the License. <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion>
