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
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new d93e43e Cleanup dependencies scopes
d93e43e is described below
commit d93e43ed9b3abad438c4ec9db6ae94d768f52896
Author: Mick Semb Wever <[email protected]>
AuthorDate: Fri Jun 11 12:15:08 2021 +0200
Cleanup dependencies scopes
patch by Angelo Polo; reviewed by Mick Semb Wever for CASSANDRA-16704
Co-authored-by: Angelo Polo <[email protected]>
---
CHANGES.txt | 1 +
build.xml | 72 ++++++++++------------
.../cql3/statements/QualifiedStatement.java | 4 +-
.../statements/schema/CreateTableStatement.java | 2 +-
.../apache/cassandra/transport/DriverBurnTest.java | 2 +-
.../cassandra/transport/SimpleClientPerfTest.java | 2 +-
.../auth/CassandraNetworkAuthorizerTest.java | 2 +-
.../org/apache/cassandra/db/LivenessInfoTest.java | 1 -
.../db/compaction/CompactionsCQLTest.java | 2 +-
test/unit/org/apache/cassandra/dht/RangeTest.java | 5 +-
.../repair/asymmetric/ReduceHelperTest.java | 4 +-
.../cassandra/utils/CassandraVersionTest.java | 4 --
12 files changed, 45 insertions(+), 56 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index a086d24..5e078f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0.1
+ * Cleanup dependency scopes (CASSANDRA-16704)
* Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues()
thread-safe (CASSANDRA-16707)
4.0-rc2
diff --git a/build.xml b/build.xml
index 9198410..1c31e4e 100644
--- a/build.xml
+++ b/build.xml
@@ -504,7 +504,7 @@
<dependency groupId="commons-io" artifactId="commons-io"
version="2.6" scope="test"/>
<dependency groupId="org.apache.commons" artifactId="commons-lang3"
version="3.11"/>
<dependency groupId="org.apache.commons" artifactId="commons-math3"
version="3.2"/>
- <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2">
+ <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"
scope="provided">
<exclusion groupId="org.antlr" artifactId="stringtemplate"/>
</dependency>
<dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
@@ -528,9 +528,9 @@
</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}" />
+ <dependency groupId="com.google.code.java-allocation-instrumenter"
artifactId="java-allocation-instrumenter"
version="${allocation-instrumenter.version}" scope="test"/>
<dependency groupId="org.apache.cassandra" artifactId="dtest-api"
version="0.0.7" scope="test"/>
- <dependency groupId="org.reflections" artifactId="reflections"
version="0.9.12" />
+ <dependency groupId="org.reflections" artifactId="reflections"
version="0.9.12" 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"/>
@@ -548,10 +548,10 @@
<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}" />
@@ -559,6 +559,8 @@
<dependency groupId="org.openjdk.jmh" artifactId="jmh-core"
version="1.21" scope="test"/>
<dependency groupId="org.openjdk.jmh"
artifactId="jmh-generator-annprocess" version="1.21" scope="test"/>
+ <dependency groupId="org.apache.ant" artifactId="ant-junit"
version="1.9.7" scope="test"/>
+
<dependency groupId="org.apache.cassandra"
artifactId="cassandra-all" version="${version}" />
<dependency groupId="io.dropwizard.metrics"
artifactId="metrics-core" version="3.1.5" />
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm"
version="3.1.5" />
@@ -646,7 +648,7 @@
this that the new assertj's `assertj-parent-pom` depends on. -->
<dependency groupId="org.junit" artifactId="junit-bom"
version="5.6.0" type="pom" scope="test"/>
<!-- when updating assertj, make sure to also update the
corresponding junit-bom dependency -->
- <dependency groupId="org.assertj" artifactId="assertj-core"
version="3.15.0" scope="test"/>
+ <dependency groupId="org.assertj" artifactId="assertj-core"
version="3.15.0" scope="provided"/>
<dependency groupId="org.awaitility" artifactId="awaitility"
version="4.0.3" scope="test">
<exclusion groupId="org.hamcrest" artifactId="hamcrest"/>
</dependency>
@@ -707,30 +709,24 @@
artifactId="cassandra-parent"
version="${version}"
relativePath="${final.name}-parent.pom"/>
- <dependency groupId="junit" artifactId="junit" scope="test"/>
- <dependency groupId="commons-io" artifactId="commons-io" scope="test"/>
- <dependency groupId="org.mockito" artifactId="mockito-core"
scope="test"/>
- <dependency groupId="org.quicktheories" artifactId="quicktheories"
scope="test"/>
- <dependency groupId="org.reflections" artifactId="reflections"
scope="test"/>
- <dependency groupId="com.google.code.java-allocation-instrumenter"
artifactId="java-allocation-instrumenter"
version="${allocation-instrumenter.version}" scope="test"/>
- <dependency groupId="org.apache.cassandra" artifactId="dtest-api"
scope="test"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"
scope="test"/>
- <dependency groupId="org.openjdk.jmh"
artifactId="jmh-generator-annprocess" scope="test"/>
- <dependency groupId="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations" scope="test"/>
- <dependency groupId="org.apache.ant" artifactId="ant-junit"
version="1.9.7" scope="test"/>
+ <dependency groupId="junit" artifactId="junit"/>
+ <dependency groupId="commons-io" artifactId="commons-io"/>
+ <dependency groupId="org.mockito" artifactId="mockito-core"/>
+ <dependency groupId="org.quicktheories" artifactId="quicktheories"/>
+ <dependency groupId="org.reflections" artifactId="reflections"/>
+ <dependency groupId="com.google.code.java-allocation-instrumenter"
artifactId="java-allocation-instrumenter"
version="${allocation-instrumenter.version}"/>
+ <dependency groupId="org.apache.cassandra" artifactId="dtest-api"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
+ <dependency groupId="org.openjdk.jmh"
artifactId="jmh-generator-annprocess"/>
+ <dependency groupId="org.apache.ant" artifactId="ant-junit"/>
<!-- adding this dependency is necessary for assertj. When updating
assertj, need to also update the version of
this that the new assertj's `assertj-parent-pom` depends on. -->
- <dependency groupId="org.junit" artifactId="junit-bom" type="pom"
scope="test"/>
- <dependency groupId="org.assertj" artifactId="assertj-core"
scope="test"/>
- <dependency groupId="org.awaitility" artifactId="awaitility"
scope="test"/>
- <dependency groupId="org.hamcrest" artifactId="hamcrest" scope="test"/>
+ <dependency groupId="org.junit" artifactId="junit-bom" type="pom"/>
+ <dependency groupId="org.awaitility" artifactId="awaitility"/>
+ <dependency groupId="org.hamcrest" artifactId="hamcrest"/>
<!-- coverage debs -->
- <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"
scope="test"/>
- <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"
scope="test"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-install"
scope="test"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman"
scope="test"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"
scope="test"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"
scope="test"/>
+ <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
+ <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
</artifact:pom>
<!-- now the pom's for artifacts being deployed to Maven Central -->
@@ -775,8 +771,8 @@
<dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
<!-- don't need hadoop classes to run, but if you use the hadoop stuff
-->
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
optional="true" scope="provided"/>
- <dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster" optional="true" scope="provided"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
optional="true"/>
+ <dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster" optional="true"/>
<!-- don't need the Java Driver to run, but if you use the hadoop
stuff or UDFs -->
<dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" classifier="shaded" optional="true"/>
@@ -821,13 +817,13 @@
<dependency groupId="com.googlecode.concurrent-trees"
artifactId="concurrent-trees" />
<!-- compile tools -->
- <dependency groupId="com.google.code.findbugs" artifactId="jsr305"
scope="provided"/>
- <dependency groupId="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations" scope="provided"/>
- <dependency groupId="org.assertj" artifactId="assertj-core"
scope="provided"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-install"
scope="provided"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman"
scope="provided"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"
scope="provided"/>
- <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"
scope="provided"/>
+ <dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
+ <dependency groupId="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations"/>
+ <dependency groupId="org.assertj" artifactId="assertj-core"/>
+ <dependency groupId="org.jboss.byteman" artifactId="byteman-install"/>
+ <dependency groupId="org.jboss.byteman" artifactId="byteman"/>
+ <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/>
+ <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/>
</artifact:pom>
</target>
diff --git
a/src/java/org/apache/cassandra/cql3/statements/QualifiedStatement.java
b/src/java/org/apache/cassandra/cql3/statements/QualifiedStatement.java
index a9c1f19..573d1b6 100644
--- a/src/java/org/apache/cassandra/cql3/statements/QualifiedStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/QualifiedStatement.java
@@ -17,8 +17,8 @@
*/
package org.apache.cassandra.cql3.statements;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.cassandra.cql3.CQLStatement;
import org.apache.cassandra.cql3.QualifiedName;
diff --git
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
index 19884a7..1339ba3 100644
---
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
@@ -21,7 +21,7 @@ import java.util.*;
import com.google.common.collect.ImmutableSet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/test/burn/org/apache/cassandra/transport/DriverBurnTest.java
b/test/burn/org/apache/cassandra/transport/DriverBurnTest.java
index 74f8155..37ebec1 100644
--- a/test/burn/org/apache/cassandra/transport/DriverBurnTest.java
+++ b/test/burn/org/apache/cassandra/transport/DriverBurnTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java
b/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java
index 4714535..20b8cb3 100644
--- a/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java
+++ b/test/burn/org/apache/cassandra/transport/SimpleClientPerfTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git
a/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java
b/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java
index 2e57173..31af270 100644
--- a/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java
+++ b/test/unit/org/apache/cassandra/auth/CassandraNetworkAuthorizerTest.java
@@ -22,7 +22,7 @@ import java.util.Set;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/test/unit/org/apache/cassandra/db/LivenessInfoTest.java
b/test/unit/org/apache/cassandra/db/LivenessInfoTest.java
index 83d670c..5578706 100644
--- a/test/unit/org/apache/cassandra/db/LivenessInfoTest.java
+++ b/test/unit/org/apache/cassandra/db/LivenessInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db;
import static org.junit.Assert.*;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.hadoop.mapred.machines_jsp;
import org.junit.Test;
public class LivenessInfoTest
diff --git
a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index c6017d4..48caef6 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java
b/test/unit/org/apache/cassandra/dht/RangeTest.java
index 68113f0..7cdb788 100644
--- a/test/unit/org/apache/cassandra/dht/RangeTest.java
+++ b/test/unit/org/apache/cassandra/dht/RangeTest.java
@@ -33,8 +33,6 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.commons.collections.CollectionUtils;
-
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.PartitionPosition;
import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
@@ -355,8 +353,7 @@ public class RangeTest
expected.add(makeRange(tokens[i], tokens[i+1]));
}
- assert CollectionUtils.isEqualCollection(result, expected);
-
+ assertEquals(result, expected);
}
@Test
diff --git
a/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java
b/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java
index 01b0cae..be5a553 100644
--- a/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java
+++ b/test/unit/org/apache/cassandra/repair/asymmetric/ReduceHelperTest.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.repair.asymmetric;
import java.net.UnknownHostException;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -36,7 +37,6 @@ import java.util.TreeSet;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
-import org.apache.commons.collections.keyvalue.AbstractMapEntry;
import org.junit.Test;
import org.apache.cassandra.dht.Murmur3Partitioner;
@@ -414,7 +414,7 @@ public class ReduceHelperTest
static Map.Entry<Range<Token>, StreamFromOptions> rangeEntry(long t, long
t2)
{
- return new AbstractMapEntry(range(t, t2), new StreamFromOptions(null,
null)) {};
+ return new AbstractMap.SimpleEntry<>(range(t, t2), new
StreamFromOptions(null, null));
}
@Test
diff --git a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java
b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java
index b83990e..049f997 100644
--- a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java
+++ b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java
@@ -24,18 +24,14 @@ import java.util.Collections;
import java.util.List;
import com.google.common.base.Splitter;
-import org.apache.commons.lang.CharRange;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import com.datastax.driver.core.VersionNumber;
-import org.apache.cassandra.io.sstable.format.Version;
import org.assertj.core.api.Assertions;
import org.quicktheories.core.Gen;
import org.quicktheories.generators.Generate;
import org.quicktheories.generators.SourceDSL;
-import org.quicktheories.impl.Constraint;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertThat;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
