From b0cdaec5ae31a80808f9892ef353cc3df6a47dbf Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Mon, 30 Aug 2021 21:07:12 +0200
Subject: [PATCH] Exclude Jackson 1.x transitive dependency of hadoop* provided
 dependencies

 patch by Tatu Saloranta; reviewed by Mick Semb Wever for CASSANDRA-16854
---
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9b6a6dc051..aa0ad38fa0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.12
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
  * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
  * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
  * Fix ant-junit dependency issue (CASSANDRA-16827)
diff --git a/build.xml b/build.xml
index 1e5a126dfe..34bca92765 100644
--- a/build.xml
+++ b/build.xml
@@ -377,9 +377,11 @@
           	<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"/>
           </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="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
           </dependency>
           <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.2.2"/>