Skip to content

Commit

Permalink
SDC-4710. Multiple conflicting dependencies
Browse files Browse the repository at this point in the history 
Change-Id: Ia0ac4ccc5e8813611a6535683fbea643ffa81218
Reviewed-on: https://review.streamsets.net/5597
Tested-by: StreamSets CI <streamsets-ci-spam@streamsets.com>
Reviewed-by: Jarcec Cecho <jarcec@streamsets.com>
  • Loading branch information
Hari Shreedharan committed Dec 12, 2016
1 parent 50c6618 commit 9f04e67
Show file tree
Hide file tree
Showing 28 changed files with 530 additions and 7 deletions.
17 changes: 17 additions & 0 deletions cdh_5_2-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -389,6 +395,17 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
17 changes: 17 additions & 0 deletions cdh_5_3-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -388,6 +394,17 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
17 changes: 17 additions & 0 deletions cdh_5_4-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -471,6 +477,17 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
17 changes: 17 additions & 0 deletions cdh_5_5-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -465,6 +471,17 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
47 changes: 47 additions & 0 deletions cdh_5_7-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -215,6 +221,12 @@
<artifactId>hive-jdbc</artifactId>
<version>${hive.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -238,6 +250,10 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -263,14 +279,29 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -295,6 +326,12 @@
<artifactId>hbase-testing-util</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Solr related -->
Expand Down Expand Up @@ -461,8 +498,18 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
Expand Down
43 changes: 43 additions & 0 deletions cdh_5_8-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,12 @@
<version>${avro.version}</version>
<scope>compile</scope>
<classifier>hadoop2</classifier>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -226,6 +232,12 @@
<artifactId>hive-jdbc</artifactId>
<version>${hive.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -249,6 +261,10 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -274,6 +290,10 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -282,6 +302,12 @@
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -306,6 +332,12 @@
<artifactId>hbase-testing-util</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Solr related -->
Expand Down Expand Up @@ -472,6 +504,17 @@
<artifactId>flume-ng-core</artifactId>
<version>${flume.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
Loading

0 comments on commit 9f04e67

Please sign in to comment.