DRILL-954: Exclude servlet-api from classpath, and exclude duplicate servlet-api dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/6801a5dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/6801a5dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/6801a5dc Branch: refs/heads/master Commit: 6801a5dc8b48c24b8fabab63945af70787a4a3be Parents: 989d336 Author: Steven Phillips <[email protected]> Authored: Thu Jun 12 13:33:11 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Mon Jun 16 08:02:36 2014 -0700 ---------------------------------------------------------------------- contrib/storage-hbase/pom.xml | 8 ++++++ contrib/storage-hive/pom.xml | 4 +++ distribution/src/resources/hadoop-excludes.txt | 1 + pom.xml | 32 +++++++++++++++++++++ 4 files changed, 45 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6801a5dc/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 09b4f0f..0c39b7d 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -100,6 +100,10 @@ <version>0.94.11</version> <exclusions> <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> </exclusion> @@ -155,6 +159,10 @@ <scope>test</scope> <exclusions> <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> </exclusion> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6801a5dc/contrib/storage-hive/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hive/pom.xml b/contrib/storage-hive/pom.xml index 314e016..6e416e4 100644 --- a/contrib/storage-hive/pom.xml +++ b/contrib/storage-hive/pom.xml @@ -80,6 +80,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6801a5dc/distribution/src/resources/hadoop-excludes.txt ---------------------------------------------------------------------- diff --git a/distribution/src/resources/hadoop-excludes.txt b/distribution/src/resources/hadoop-excludes.txt index d72efeb..36b5703 100644 --- a/distribution/src/resources/hadoop-excludes.txt +++ b/distribution/src/resources/hadoop-excludes.txt @@ -11,3 +11,4 @@ jersey eclipse common guava +servlet http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6801a5dc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2844a10..e1617df 100644 --- a/pom.xml +++ b/pom.xml @@ -582,6 +582,14 @@ <version>1.2.1</version> <exclusions> <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> <artifactId>jets3t</artifactId> <groupId>net.java.dev.jets3t</groupId> </exclusion> @@ -694,6 +702,14 @@ <version>1.0.3-mapr-3.0.2</version> <exclusions> <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> <artifactId>asm</artifactId> <groupId>asm</groupId> </exclusion> @@ -804,6 +820,14 @@ <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> @@ -831,6 +855,14 @@ <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> </exclusions> </dependency> </dependencies>
