You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/08/30 03:17:04 UTC

[1/2] git commit: update pom dependencies for commons-lang3

Updated Branches:
  refs/heads/trunk 84dfa0647 -> 164f15866


update pom dependencies for commons-lang3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7693fa9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7693fa9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7693fa9

Branch: refs/heads/trunk
Commit: e7693fa92ddf9b3d8a1e2539b09b934ffc5ef071
Parents: d6be037
Author: Dave Brosius <db...@apache.org>
Authored: Thu Aug 29 21:14:56 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Aug 29 21:14:56 2013 -0400

----------------------------------------------------------------------
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7693fa9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4d8ae14..254cc2d 100644
--- a/build.xml
+++ b/build.xml
@@ -340,7 +340,7 @@
           <dependency groupId="com.google.guava" artifactId="guava" version="13.0.1"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
           <dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
-          <dependency groupId="commons-lang" artifactId="commons-lang" version="3.1"/>
+          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
           <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/>
           <dependency groupId="org.antlr" artifactId="antlr" version="3.2"/>
           <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/>
@@ -438,7 +438,7 @@
         <dependency groupId="com.google.guava" artifactId="guava"/>
         <dependency groupId="commons-cli" artifactId="commons-cli"/>
         <dependency groupId="commons-codec" artifactId="commons-codec"/>
-        <dependency groupId="commons-lang" artifactId="commons-lang"/>
+        <dependency groupId="org.apache.commons" artifactId="commons-lang3"/>
         <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru"/>
         <dependency groupId="org.antlr" artifactId="antlr"/>
         <dependency groupId="org.slf4j" artifactId="slf4j-api"/>
@@ -479,7 +479,7 @@
                 artifactId="cassandra-parent"
                 version="${version}"/>
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
-        <dependency groupId="commons-lang" artifactId="commons-lang"/>
+        <dependency groupId="org.apache.commons" artifactId="commons-lang3"/>
         <dependency groupId="org.slf4j" artifactId="slf4j-api"/>
         <dependency groupId="org.apache.thrift" artifactId="libthrift"/>
       </artifact:pom>


[2/2] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/164f1586
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/164f1586
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/164f1586

Branch: refs/heads/trunk
Commit: 164f15866204637d71b9fe5729ce2db9fd30c65c
Parents: 84dfa06 e7693fa
Author: Dave Brosius <db...@apache.org>
Authored: Thu Aug 29 21:16:09 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Aug 29 21:16:09 2013 -0400

----------------------------------------------------------------------
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/164f1586/build.xml
----------------------------------------------------------------------