You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2012/07/11 10:55:01 UTC
svn commit: r1360070 - in /flume/branches/branch-1.2.0: flume-ng-core/pom.xml flume-ng-legacy-sources/flume-avro-source/pom.xml flume-ng-legacy-sources/flume-thrift-source/pom.xml flume-ng-sdk/pom.xml pom.xml

Author: mpercy
Date: Wed Jul 11 08:55:00 2012
New Revision: 1360070

URL: http://svn.apache.org/viewvc?rev=1360070&view=rev
Log:
Different versions of servlet-api jar getting pulled in

Modified:
    flume/branches/branch-1.2.0/flume-ng-core/pom.xml
    flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-avro-source/pom.xml
    flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-thrift-source/pom.xml
    flume/branches/branch-1.2.0/flume-ng-sdk/pom.xml
    flume/branches/branch-1.2.0/pom.xml

Modified: flume/branches/branch-1.2.0/flume-ng-core/pom.xml
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-core/pom.xml?rev=1360070&r1=1360069&r2=1360070&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-core/pom.xml (original)
+++ flume/branches/branch-1.2.0/flume-ng-core/pom.xml Wed Jul 11 08:55:00 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/branches/branch-1.2.0/flume-ng-legacy-sources/flume-avro-source/pom.xml
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-avro-source/pom.xml?rev=1360070&r1=1360069&r2=1360070&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-avro-source/pom.xml (original)
+++ flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-avro-source/pom.xml Wed Jul 11 08:55:00 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/branches/branch-1.2.0/flume-ng-legacy-sources/flume-thrift-source/pom.xml
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-thrift-source/pom.xml?rev=1360070&r1=1360069&r2=1360070&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-thrift-source/pom.xml (original)
+++ flume/branches/branch-1.2.0/flume-ng-legacy-sources/flume-thrift-source/pom.xml Wed Jul 11 08:55:00 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/branches/branch-1.2.0/flume-ng-sdk/pom.xml
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/pom.xml?rev=1360070&r1=1360069&r2=1360070&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/pom.xml (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/pom.xml Wed Jul 11 08:55:00 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/branches/branch-1.2.0/pom.xml
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/pom.xml?rev=1360070&r1=1360069&r2=1360070&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/pom.xml (original)
+++ flume/branches/branch-1.2.0/pom.xml Wed Jul 11 08:55:00 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>