This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch cassandra-6.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-6.0 by this push:
new 5282f81d0a Fix publishing to ASF Nexus of Accord artefacts when
release staging
5282f81d0a is described below
commit 5282f81d0ab3eae8cb74a83e0a6f2e39509adfd3
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Jun 29 16:31:31 2026 -0500
Fix publishing to ASF Nexus of Accord artefacts when release staging
Also fail the build if any artefacts fail to upload.
patch by mick semb wever; reviewed by David Capwell for CASSANDRA-21261
---
.build/build-resolver.xml | 6 +++---
CHANGES.txt | 1 +
build.xml | 25 ++++++++++++++-----------
modules/accord | 2 +-
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index 7e88a4ee73..6d47f4726f 100644
--- a/.build/build-resolver.xml
+++ b/.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>
diff --git a/CHANGES.txt b/CHANGES.txt
index c9b14d569d..06903a9008 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
6.0-alpha2
+ * 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)
diff --git a/build.xml b/build.xml
index 3f51e03c25..4783737abe 100644
--- a/build.xml
+++ b/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}" />
@@ -2312,17 +2314,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 -->
diff --git a/modules/accord b/modules/accord
index 66cab49f1c..fff32de2e9 160000
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 66cab49f1c9af471795339a5fdf9522e6e73b691
+Subproject commit fff32de2e915772fbc70d16b1c32346313877838
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
