diff --git a/CHANGES.txt b/CHANGES.txt index 6da7d5c7aa..7b792e4668 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.1 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) * Add client warnings and abort to tombstone and coordinator reads which go past a low/high watermark (CASSANDRA-16850) * Add TTL support to nodetool snapshots (CASSANDRA-16789) * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks (CASSANDRA-16842) diff --git a/build.xml b/build.xml index 16dd96fe39..3d827ce7dc 100644 --- a/build.xml +++ b/build.xml @@ -540,10 +540,12 @@ + + diff --git a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java index f72d1ec78d..8760270886 100644 --- a/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java +++ b/test/unit/org/apache/cassandra/service/snapshot/SnapshotManifestTest.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; import static org.assertj.core.api.Assertions.assertThat; import org.apache.cassandra.config.Duration; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; public class SnapshotManifestTest {