From f7b952387ae17a5975de2c1da12410eac41559cc Mon Sep 17 00:00:00 2001
From: Bereng <berenguerblasi@gmail.com>
Date: Wed, 21 Jun 2023 08:52:05 +0200
Subject: [PATCH] Move checkstyle files into .build

patch by Berenguer Blasi; reviewed by Stefan Miklosovic for CASSANDRA-18603
---
 checkstyle.xml => .build/checkstyle.xml           |  0
 .../checkstyle_suppressions.xml                   |  0
 checkstyle_test.xml => .build/checkstyle_test.xml |  0
 build.xml                                         | 15 ++++++++-------
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename checkstyle.xml => .build/checkstyle.xml (100%)
 rename checkstyle_suppressions.xml => .build/checkstyle_suppressions.xml (100%)
 rename checkstyle_test.xml => .build/checkstyle_test.xml (100%)

diff --git a/checkstyle.xml b/.build/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to .build/checkstyle.xml
diff --git a/checkstyle_suppressions.xml b/.build/checkstyle_suppressions.xml
similarity index 100%
rename from checkstyle_suppressions.xml
rename to .build/checkstyle_suppressions.xml
diff --git a/checkstyle_test.xml b/.build/checkstyle_test.xml
similarity index 100%
rename from checkstyle_test.xml
rename to .build/checkstyle_test.xml
diff --git a/build.xml b/build.xml
index da21569de7..2756baecd1 100644
--- a/build.xml
+++ b/build.xml
@@ -40,6 +40,7 @@
 
     <!-- directory details -->
     <property name="basedir" value="."/>
+    <property name="build.helpers.dir" value="${basedir}/.build"/>
     <property name="build.src" value="${basedir}/src"/>
     <property name="build.src.java" value="${basedir}/src/java"/>
     <property name="build.src.antlr" value="${basedir}/src/antlr"/>
@@ -2325,8 +2326,8 @@
       <property name="checkstyle.report.file" value="${checkstyle.log.dir}/checkstyle_report.xml"/>
       <mkdir  dir="${checkstyle.log.dir}" />
 
-      <property name="checkstyle.properties" value="${basedir}/checkstyle.xml" />
-      <property name="checkstyle.suppressions" value="${basedir}/checkstyle_suppressions.xml" />
+      <property name="checkstyle.properties" value="${build.helpers.dir}/checkstyle.xml" />
+      <property name="checkstyle.suppressions" value="${build.helpers.dir}/checkstyle_suppressions.xml" />
       <checkstyle config="${checkstyle.properties}"
                   failureProperty="checkstyle.failure"
                   failOnViolation="true">
@@ -2341,8 +2342,8 @@
       <property name="checkstyle_test.report.file" value="${checkstyle.log.dir}/checkstyle_report_test.xml"/>
       <mkdir  dir="${checkstyle.log.dir}" />
 
-      <property name="checkstyle_test.properties" value="${basedir}/checkstyle_test.xml" />
-      <property name="checkstyle.suppressions" value="${basedir}/checkstyle_suppressions.xml" />
+      <property name="checkstyle_test.properties" value="${build.helpers.dir}/checkstyle_test.xml" />
+      <property name="checkstyle.suppressions" value="${build.helpers.dir}/checkstyle_suppressions.xml" />
       <checkstyle config="${checkstyle_test.properties}"
                   failureProperty="checkstyle.failure"
                   failOnViolation="true">
@@ -2399,7 +2400,7 @@
 
   </target>
 
-  <import file="${basedir}/.build/build-resolver.xml"/>
-  <import file="${basedir}/.build/build-rat.xml"/>
-  <import file="${basedir}/.build/build-owasp.xml"/>
+  <import file="${build.helpers.dir}/build-resolver.xml"/>
+  <import file="${build.helpers.dir}/build-rat.xml"/>
+  <import file="${build.helpers.dir}/build-owasp.xml"/>
 </project>