Merge branch 'feat/incremental-compaction-strategy'

scylladb · Jul 22, 2024 · 4359d30 · 4359d30
2 parents 9a514ff + 927825c
commit 4359d30
Showing 1 changed file with 38 additions and 27 deletions.
diff --git a/build.xml b/build.xml
@@ -34,7 +34,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="3.11.13"/>
+    <property name="base.version" value="3.12.0"/>
     <property name="base.javaDriverVersion" value="3.11.5.3"/>
     <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
@@ -184,34 +184,39 @@
     -->
 
     <!-- details of what version of Resolver ANT Tasks to fetch -->
-    <property name="resolver-ant-tasks.version" value="1.3.0" />
-    <property name="resolver-ant-tasks.local" value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
-    <property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
+    <property name="resolver-ant-tasks.version" value="1.3.0"/>
+    <property name="resolver-ant-tasks.local"
+              value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
+    <property name="resolver-ant-tasks.url"
+              value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks"/>
 
     <!-- version of lib/ downloads -->
     <property name="lib.download.sha" value="27de93ebb1285e731570eb8585d66832c79c4289"/>
 
     <condition property="resolver-ant-tasks.jar.exists">
-        <available file="${resolver-ant-tasks.local}" />
+        <available file="${resolver-ant-tasks.local}"/>
     </condition>
 
-    <path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}" />
+    <path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}"/>
 
     <!--
        Fetch Resolver Ant Tasks and Cassandra's dependencies.
     -->
 
-    <target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
+    <target name="_resolver_download" unless="resolver-ant-tasks.jar.exists"
+            description="Fetch Resolver ANT Tasks from Maven Central Repository">
         <echo>Downloading Resolver ANT Tasks...</echo>
-        <mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
+        <mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}"/>
 
         <get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
              dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
     </target>
 
-    <target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized" description="Initialize Resolver ANT Tasks">
+    <target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized"
+            description="Initialize Resolver ANT Tasks">
 
-        <typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="resolver-ant-tasks.classpath" />
+        <typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml"
+                 classpathref="resolver-ant-tasks.classpath"/>
         <resolver:remoterepos id="all">
             <remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
             <remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
@@ -228,7 +233,7 @@
         <resolver:resolve>
             <remoterepos refid="all"/>
             <dependencies>
-                <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
+                <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6"/>
             </dependencies>
             <path refid="rat.classpath" classpath="runtime"/>
         </resolver:resolve>
@@ -248,7 +253,7 @@
             <attribute name="packaging" default="jar"/>
             <sequential>
                 <exec dir="." executable="sh">
-                    <arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+                    <arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'"/>
                 </exec>
             </sequential>
         </macrodef>
@@ -260,18 +265,18 @@
             <attribute name="packaging" default="jar"/>
             <sequential>
                 <exec dir="." executable="sh">
-                    <arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+                    <arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'"/>
                 </exec>
             </sequential>
         </macrodef>
 
         <macrodef name="sign-dist">
             <attribute name="file"/>
             <sequential>
-                <echo message="gpg signing @{file}" />
+                <echo message="gpg signing @{file}"/>
                 <exec dir="." executable="sh">
                     <!-- dummy out the deploy parameters, only the signing is required here -->
-                    <arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'" />
+                    <arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'"/>
                 </exec>
             </sequential>
         </macrodef>
@@ -287,17 +292,20 @@
         <resolver:resolve>
             <remoterepos refid="all"/>
             <dependencies pomRef="thrift-pom"/>
-            <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
+            <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}"
+                   scopes="compile,provided,!system"/>
         </resolver:resolve>
         <resolver:resolve>
             <remoterepos refid="all"/>
             <dependencies pomRef="all-pom"/>
-            <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
+            <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}"
+                   scopes="compile,provided,!system"/>
         </resolver:resolve>
         <resolver:resolve>
             <remoterepos refid="all"/>
             <dependencies pomRef="pom-deps"/>
-            <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/>
+            <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}"
+                   scopes="test,!provide,!system"/>
         </resolver:resolve>
 
     </target>
@@ -308,18 +316,21 @@
         <resolver:resolve failOnMissingAttachments="true">
             <remoterepos refid="all"/>
             <dependencies pomRef="all-pom"/>
-            <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
+            <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}"
+                   scopes="compile,!provide,!system"/>
         </resolver:resolve>
         <resolver:resolve failOnMissingAttachments="true">
             <remoterepos refid="all"/>
             <dependencies pomRef="thrift-pom"/>
-            <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
+            <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}"
+                   scopes="compile,!provide,!system"/>
         </resolver:resolve>
         <mkdir dir="${local.repository}/org/apache/cassandra/deps/sigar-bin"/>
         <mkdir dir="${build.lib}/sigar-bin"/>
 
         <!-- apache/cassandra/lib -->
-        <get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
+        <get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true"
+             skipexisting="true">
             <url url="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/sigar-bin/libsigar-amd64-linux.so"/>
         </get>
 
@@ -851,21 +862,21 @@
 
     <!-- Run tests and reports errors and generates a junit report after -->
     <macrodef name="testmacro">
-        <attribute name="inputdir" />
-        <attribute name="timeout" default="${test.timeout}" />
+        <attribute name="inputdir"/>
+        <attribute name="timeout" default="${test.timeout}"/>
         <attribute name="forkmode" default="perTest"/>
         <attribute name="showoutput" default="true"/>
-        <element name="optjvmargs" implicit="true" optional="true" />
+        <element name="optjvmargs" implicit="true" optional="true"/>
         <attribute name="filter" default="**/${test.name}.java"/>
-        <attribute name="exclude" default="" />
-        <attribute name="filelist" default="" />
+        <attribute name="exclude" default=""/>
+        <attribute name="filelist" default=""/>
         <attribute name="testtag" default=""/>
 
         <sequential>
             <testmacrohelper inputdir="@{inputdir}" timeout="@{timeout}"
                              forkmode="@{forkmode}" filter="@{filter}"
                              exclude="@{exclude}" filelist="@{filelist}"
-                             testtag="@{testtag}" showoutput="false" >
+                             testtag="@{testtag}" showoutput="false">
                 <optjvmargs/>
             </testmacrohelper>
             <fail message="Some test(s) failed.">