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