Merge pull request #380 from jfarrell/master

Issue 349
hector-client · Jan 10, 2012 · ce5f433 · ce5f433
2 parents 0af58b8 + 6efd75f
commit ce5f433
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -104,20 +104,6 @@
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-thrift</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -102,11 +102,6 @@
         <artifactId>cassandra-thrift</artifactId>
         <version>1.0.6</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.thrift</groupId>
-        <artifactId>libthrift</artifactId>
-        <version>0.6.1</version>
-      </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>