This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 05e7cc1553d009c6f7ea8b6a20bc09483f916183 Merge: 636ab42 32194ec Author: Mick Semb Wever <[email protected]> AuthorDate: Sat Sep 11 00:21:21 2021 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index 106cf91,db2d64c..ed66f63 --- a/build.xml +++ b/build.xml @@@ -527,35 -368,30 +527,35 @@@ <exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/> </dependency> <dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4" scope="test"/> + <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.26" scope="test"/> + <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}" scope="test"> + <exclusion groupId="com.google.guava" artifactId="guava"/> + </dependency> - <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.8" scope="test"/> + <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.9" 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"> - <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/> - <exclusion groupId="commons-logging" artifactId="commons-logging"/> - <exclusion groupId="org.eclipse.jdt" artifactId="core"/> - <exclusion groupId="ant" artifactId="ant"/> - <exclusion groupId="junit" artifactId="junit"/> + <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/> + <exclusion groupId="commons-logging" artifactId="commons-logging"/> + <exclusion groupId="org.eclipse.jdt" artifactId="core"/> + <exclusion groupId="ant" artifactId="ant"/> + <exclusion groupId="junit" artifactId="junit"/> <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3" scope="provided"> - <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 --> + <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 --> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/> </dependency> - <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.2.2"/> + <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.6.0"/> - <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/> - <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/> + <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}" scope="test"/> + <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" scope="test"/> - <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}"/> - <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"/> - <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"/> - <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/> + <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="provided"/> + <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="provided"/> + <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="provided"/> + <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="provided"/> <dependency groupId="net.bytebuddy" artifactId="byte-buddy" version="${bytebuddy.version}" /> <dependency groupId="net.bytebuddy" artifactId="byte-buddy-agent" version="${bytebuddy.version}" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
