Merge branch 'cassandra-6.0' into trunk

* cassandra-6.0:
  Fix publishing to ASF Nexus of Accord artefacts when release staging

Author: michaelsembwever

.build/build-resolver.xml

@@ -146,7 +146,7 @@
             <attribute name="classifier" default=""/>
             <attribute name="packaging" default="jar"/>
             <sequential>
-                <exec dir="." executable="sh">
+                <exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
                     <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>
@@ -158,7 +158,7 @@
             <attribute name="classifier" default=""/>
             <attribute name="packaging" default="jar"/>
             <sequential>
-                <exec dir="." executable="sh">
+                <exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
                     <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>
@@ -168,7 +168,7 @@
             <attribute name="file"/>
             <sequential>
                 <echo message="gpg signing @{file}" />
-                <exec dir="." executable="sh">
+                <exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
                     <!-- 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'" />
                 </exec>

CHANGES.txt

@@ -4,6 +4,7 @@
  * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767)
  * Add a guardrail for misprepared statements (CASSANDRA-21139)
 Merged from 6.0:
+ * Fix maven remote publishing of Accord artifacts (CASSANDRA-21261)
  * Move long running TCM operations to a longer timout (CASSANDRA-21453)
  * Offline nodetool commands should not print network options in help (CASSANDRA-20876)
  * Defer creation of the system_cluster_metadata keyspace until CMS initialization (CASSANDRA-21477)

build.xml

@@ -111,9 +111,11 @@
     <property name="version.properties.dir"
               value="${build.src.resources}/org/apache/cassandra/config/" />
     <property name="final.name" value="${ant.project.name}-${version}"/>
+
     <property name="accord.dir" value="modules/accord" />
-    <!-- The reason not to use ant.project.name is we publish as "cassandra-accord" so the file names won't be named apache-cassandra-accord -->
-    <property name="accord.final.name" value="cassandra-accord-${version}"/>
+    <property name="accord-core.build.libs" value="${accord.dir}/accord-core/build" />
+    <property name="accord-core.build.name" value="accord-core-${version}" />
+    <property name="accord-core.build.pom" value="${accord-core.build.libs}/publications/mavenJava/pom-default.xml" />
 
     <property name="local.repository" value="${user.home}/.m2/repository" />
     <property name="accord.local.repository" value="${local.repository}/org/apache/cassandra/cassandra-accord/${version}" />
@@ -2320,17 +2322,18 @@
   <target name="publish"
           depends="mvn-install,sstableloader-mvn-install,artifacts"
           description="Publishes the artifacts to the Maven repository">
-    <!-- Accord -->
-    <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
-            file="${accord.local.repository}/${accord.final.name}.pom"
+
+    <!-- Accord (from the submodule's gradle build) -->
+    <deploy pomFile="${accord-core.build.pom}"
+            file="${accord-core.build.pom}"
             packaging="pom"/>
-    <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
-            file="${accord.local.repository}/${accord.final.name}.jar" />
-    <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
-            file="${accord.local.repository}/${accord.final.name}-sources.jar"
+    <deploy pomFile="${accord-core.build.pom}"
+            file="${accord-core.build.libs}/libs/${accord-core.build.name}.jar" />
+    <deploy pomFile="${accord-core.build.pom}"
+            file="${accord-core.build.libs}/libs/${accord-core.build.name}-sources.jar"
             classifier="sources"/>
-    <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
-            file="${accord.local.repository}/${accord.final.name}-javadoc.jar"
+    <deploy pomFile="${accord-core.build.pom}"
+            file="${accord-core.build.libs}/libs/${accord-core.build.name}-javadoc.jar"
             classifier="javadoc"/>
 
     <!-- the parent -->