Skip to content

Commit 5282f81

Browse files
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
1 parent b1f30e9 commit 5282f81

4 files changed

Lines changed: 19 additions & 15 deletions

File tree

.build/build-resolver.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<attribute name="classifier" default=""/>
147147
<attribute name="packaging" default="jar"/>
148148
<sequential>
149-
<exec dir="." executable="sh">
149+
<exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
150150
<arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
151151
</exec>
152152
</sequential>
@@ -158,7 +158,7 @@
158158
<attribute name="classifier" default=""/>
159159
<attribute name="packaging" default="jar"/>
160160
<sequential>
161-
<exec dir="." executable="sh">
161+
<exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
162162
<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}'" />
163163
</exec>
164164
</sequential>
@@ -168,7 +168,7 @@
168168
<attribute name="file"/>
169169
<sequential>
170170
<echo message="gpg signing @{file}" />
171-
<exec dir="." executable="sh">
171+
<exec dir="." executable="sh" failonerror="true" failifexecutionfails="true">
172172
<!-- dummy out the deploy parameters, only the signing is required here -->
173173
<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'" />
174174
</exec>

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
6.0-alpha2
2+
* Fix maven remote publishing of Accord artifacts (CASSANDRA-21261)
23
* Move long running TCM operations to a longer timout (CASSANDRA-21453)
34
* Offline nodetool commands should not print network options in help (CASSANDRA-20876)
45
* Defer creation of the system_cluster_metadata keyspace until CMS initialization (CASSANDRA-21477)

build.xml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,11 @@
111111
<property name="version.properties.dir"
112112
value="${build.src.resources}/org/apache/cassandra/config/" />
113113
<property name="final.name" value="${ant.project.name}-${version}"/>
114+
114115
<property name="accord.dir" value="modules/accord" />
115-
<!-- 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 -->
116-
<property name="accord.final.name" value="cassandra-accord-${version}"/>
116+
<property name="accord-core.build.libs" value="${accord.dir}/accord-core/build" />
117+
<property name="accord-core.build.name" value="accord-core-${version}" />
118+
<property name="accord-core.build.pom" value="${accord-core.build.libs}/publications/mavenJava/pom-default.xml" />
117119

118120
<property name="local.repository" value="${user.home}/.m2/repository" />
119121
<property name="accord.local.repository" value="${local.repository}/org/apache/cassandra/cassandra-accord/${version}" />
@@ -2312,17 +2314,18 @@
23122314
<target name="publish"
23132315
depends="mvn-install,sstableloader-mvn-install,artifacts"
23142316
description="Publishes the artifacts to the Maven repository">
2315-
<!-- Accord -->
2316-
<deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
2317-
file="${accord.local.repository}/${accord.final.name}.pom"
2317+
2318+
<!-- Accord (from the submodule's gradle build) -->
2319+
<deploy pomFile="${accord-core.build.pom}"
2320+
file="${accord-core.build.pom}"
23182321
packaging="pom"/>
2319-
<deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
2320-
file="${accord.local.repository}/${accord.final.name}.jar" />
2321-
<deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
2322-
file="${accord.local.repository}/${accord.final.name}-sources.jar"
2322+
<deploy pomFile="${accord-core.build.pom}"
2323+
file="${accord-core.build.libs}/libs/${accord-core.build.name}.jar" />
2324+
<deploy pomFile="${accord-core.build.pom}"
2325+
file="${accord-core.build.libs}/libs/${accord-core.build.name}-sources.jar"
23232326
classifier="sources"/>
2324-
<deploy pomFile="${accord.local.repository}/${accord.final.name}.pom"
2325-
file="${accord.local.repository}/${accord.final.name}-javadoc.jar"
2327+
<deploy pomFile="${accord-core.build.pom}"
2328+
file="${accord-core.build.libs}/libs/${accord-core.build.name}-javadoc.jar"
23262329
classifier="javadoc"/>
23272330

23282331
<!-- the parent -->

modules/accord

0 commit comments

Comments
 (0)