From 334024751c4dd2726ff244f691687647a0e94c5f Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Wed, 3 Jun 2020 15:41:33 +0200
Subject: [PATCH] Remove generated files from apache-cassandra-*-src.tar.gz
 artifacts

 patch by Mick Semb Wever; reviewed by Robert Stupp for CASSANDRA-15849
---
 .gitignore  | 1 +
 CHANGES.txt | 1 +
 build.xml   | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index acaa51a646..895483160c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ lib/jsr223/jython/*.jar
 lib/jsr223/jython/cachedir
 lib/jsr223/scala/*.jar
 
+.ant_targets
\ No newline at end of file
diff --git a/CHANGES.txt b/CHANGES.txt
index 00507d2008..788b2bf5d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.18
+ * Remove generated files from source artifact (CASSANDRA-15849)
  * Remove duplicated tools binaries from tarballs (CASSANDRA-15768)
  * Duplicate results with DISTINCT queries in mixed mode (CASSANDRA-15501)
  * Disable JMX rebinding (CASSANDRA-15653)
diff --git a/build.xml b/build.xml
index 0fa23801b4..83fb674a76 100644
--- a/build.xml
+++ b/build.xml
@@ -1153,6 +1153,10 @@
           <exclude name="build/**" />
           <exclude name="src/gen-java/**" />
           <exclude name=".git/**" />
+          <exclude name="venv/**" />
+          <exclude name="src/resources/org/apache/cassandra/config/version.properties" />
+          <exclude name="conf/hotspot_compiler" />
+          <exclude name="doc/cql3/CQL.html" />
           <exclude name="bin/*" /> <!-- handled separately below -->
           <!-- exclude Eclipse files -->
           <exclude name=".project" />