Author: mpercy
Date: Wed Jul 11 06:14:08 2012
New Revision: 1360017
URL: http://svn.apache.org/viewvc?rev=1360017&view=rev
Log:
Different versions of servlet-api jar getting pulled in
Modified:
flume/trunk/flume-ng-core/pom.xml
flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml
flume/trunk/flume-ng-sdk/pom.xml
flume/trunk/pom.xml
Modified: flume/trunk/flume-ng-core/pom.xml
URL:
http://svn.apache.org/viewvc/flume/trunk/flume-ng-core/pom.xml?rev=1360017&r1=1360016&r2=1360017&view=diff
==============================================================================
--- flume/trunk/flume-ng-core/pom.xml (original)
+++ flume/trunk/flume-ng-core/pom.xml Wed Jul 11 06:14:08 2012
@@ -159,6 +159,11 @@ limitations under the License.
<artifactId>joda-time</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml
URL:
http://svn.apache.org/viewvc/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml?rev=1360017&r1=1360016&r2=1360017&view=diff
==============================================================================
--- flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml (original)
+++ flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml Wed Jul 11
06:14:08 2012
@@ -99,6 +99,11 @@ limitations under the License.
<artifactId>avro-ipc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml
URL:
http://svn.apache.org/viewvc/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml?rev=1360017&r1=1360016&r2=1360017&view=diff
==============================================================================
--- flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml (original)
+++ flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml Wed Jul 11
06:14:08 2012
@@ -136,7 +136,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
Modified: flume/trunk/flume-ng-sdk/pom.xml
URL:
http://svn.apache.org/viewvc/flume/trunk/flume-ng-sdk/pom.xml?rev=1360017&r1=1360016&r2=1360017&view=diff
==============================================================================
--- flume/trunk/flume-ng-sdk/pom.xml (original)
+++ flume/trunk/flume-ng-sdk/pom.xml Wed Jul 11 06:14:08 2012
@@ -105,5 +105,10 @@ limitations under the License.
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: flume/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/flume/trunk/pom.xml?rev=1360017&r1=1360016&r2=1360017&view=diff
==============================================================================
--- flume/trunk/pom.xml (original)
+++ flume/trunk/pom.xml Wed Jul 11 06:14:08 2012
@@ -651,12 +651,30 @@ limitations under the License.
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
<version>1.6.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.6.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5-20110124</version>
</dependency>
<dependency>
