Repository: cassandra
Updated Branches:
  refs/heads/trunk a87b15d1d -> 6a8f15031


Upgrade junit from 4.6 to 4.12

patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-13360


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

Branch: refs/heads/trunk
Commit: 6a8f15031569bcf8adf5344db9c701b1a6d2a802
Parents: a87b15d
Author: Jay Zhuang <jay.zhu...@yahoo.com>
Authored: Thu Mar 23 11:00:05 2017 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Mar 23 11:00:05 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 build.xml   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a8f1503/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c1d5e94..6897fb0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
  * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
  * Incremental repair not streaming correct sstables (CASSANDRA-13328)
  * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a8f1503/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 058b879..73d3051 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
           <dependency groupId="com.github.jbellis" artifactId="jamm" 
version="0.3.0"/>
 
           <dependency groupId="org.yaml" artifactId="snakeyaml" 
version="1.11"/>
-          <dependency groupId="junit" artifactId="junit" version="4.6" />
+          <dependency groupId="junit" artifactId="junit" version="4.12" />
           <dependency groupId="org.apache.rat" artifactId="apache-rat" 
version="0.10">
              <exclusion groupId="commons-lang" artifactId="commons-lang"/>
           </dependency>

Reply via email to