This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d7a9f41cf14e5b8177a08d36cb5477a3436f21b4
Merge: f32d2b06de 850336217b
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Tue Apr 12 11:45:34 2022 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc build.xml
index 5948eca37f,f443e26a8c..be1168ec4d
--- a/build.xml
+++ b/build.xml
@@@ -378,11 -352,14 +378,11 @@@
<exclusion groupId="org.apache.httpcomponents"
artifactId="httpclient"/>
<exclusion groupId="org.apache.httpcomponents"
artifactId="httpcore"/>
</dependency>
- <dependency groupId="junit" artifactId="junit" version="4.6"
scope="test">
+ <dependency groupId="junit" artifactId="junit" version="4.12"
scope="test">
<exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/>
</dependency>
- <dependency groupId="org.apache.rat" artifactId="apache-rat"
version="0.10">
- <exclusion groupId="commons-lang" artifactId="commons-lang"/>
- </dependency>
<dependency groupId="org.mockito" artifactId="mockito-core"
version="3.2.4" scope="test"/>
- <dependency groupId="org.apache.cassandra" artifactId="dtest-api"
version="0.0.11" scope="test"/>
+ <dependency groupId="org.apache.cassandra" artifactId="dtest-api"
version="0.0.13" scope="test"/>
<dependency groupId="org.reflections" artifactId="reflections"
version="0.9.12" scope="test"/>
<dependency groupId="org.quicktheories" artifactId="quicktheories"
version="0.25" scope="test"/>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
version="1.0.3" scope="provided">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
