You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/14 20:27:55 UTC
[1/6] git commit: Exclude xerces to fix hadoop build issue.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 541a20dbb -> 2092da097
refs/heads/cassandra-2.1 c6efd35cf -> a680f721b
refs/heads/trunk 30aec9339 -> 1cfa56100
Exclude xerces to fix hadoop build issue.
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2092da09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2092da09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2092da09
Branch: refs/heads/cassandra-2.0
Commit: 2092da09747a8f00a790a5eed8323227033e2115
Parents: 541a20d
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:26:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:26:18 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2092da09/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index af571ed..6adb042 100644
--- a/build.xml
+++ b/build.xml
@@ -374,7 +374,9 @@
<dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
- <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+ <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+ <exclusion groupId="xerces" artifactId="xercesImpl"/>
+ </dependency>
<dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1cfa5610
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cfa5610
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cfa5610
Branch: refs/heads/trunk
Commit: 1cfa56100cafbf9119d7a3bc6a9be27c6c4d98db
Parents: 30aec93 a680f72
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:27:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:27:49 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cfa5610/build.xml
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a680f721
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a680f721
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a680f721
Branch: refs/heads/cassandra-2.1
Commit: a680f721b0bbedec1d367d5b6e8c8e8281d31a2f
Parents: c6efd35 2092da0
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:27:34 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:27:34 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a680f721/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 044e3a2,6adb042..c6dd55e
--- a/build.xml
+++ b/build.xml
@@@ -371,18 -366,19 +371,20 @@@
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
- <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6">
+ <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
+ <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
+ </dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
- <dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.11.1"/>
+ <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
- <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+ <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+ <exclusion groupId="xerces" artifactId="xercesImpl"/>
+ </dependency>
- <dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
<dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" />
[2/6] git commit: Exclude xerces to fix hadoop build issue.
Posted by br...@apache.org.
Exclude xerces to fix hadoop build issue.
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2092da09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2092da09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2092da09
Branch: refs/heads/cassandra-2.1
Commit: 2092da09747a8f00a790a5eed8323227033e2115
Parents: 541a20d
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:26:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:26:18 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2092da09/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index af571ed..6adb042 100644
--- a/build.xml
+++ b/build.xml
@@ -374,7 +374,9 @@
<dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
- <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+ <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+ <exclusion groupId="xerces" artifactId="xercesImpl"/>
+ </dependency>
<dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a680f721
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a680f721
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a680f721
Branch: refs/heads/trunk
Commit: a680f721b0bbedec1d367d5b6e8c8e8281d31a2f
Parents: c6efd35 2092da0
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:27:34 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:27:34 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a680f721/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 044e3a2,6adb042..c6dd55e
--- a/build.xml
+++ b/build.xml
@@@ -371,18 -366,19 +371,20 @@@
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
- <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6">
+ <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
+ <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
+ </dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
- <dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.11.1"/>
+ <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
- <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+ <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+ <exclusion groupId="xerces" artifactId="xercesImpl"/>
+ </dependency>
- <dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
<dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" />
[3/6] git commit: Exclude xerces to fix hadoop build issue.
Posted by br...@apache.org.
Exclude xerces to fix hadoop build issue.
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2092da09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2092da09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2092da09
Branch: refs/heads/trunk
Commit: 2092da09747a8f00a790a5eed8323227033e2115
Parents: 541a20d
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 13:26:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 13:26:18 2014 -0500
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2092da09/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index af571ed..6adb042 100644
--- a/build.xml
+++ b/build.xml
@@ -374,7 +374,9 @@
<dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
- <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+ <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+ <exclusion groupId="xerces" artifactId="xercesImpl"/>
+ </dependency>
<dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />