Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17026: Fix releaseBuild without signing (#2051)

Houston Putman15e56e9ae0da
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 876aadd509f..44416eed723 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -128,7 +128,7 @@ def prepare(root, version, pause_before_sign, mf_username, gpg_key_id, gpg_passw
if dev_mode:
cmd += ' -Pvalidation.git.failOnModified=false'
if gpg_key_id is None:
- cmd += ' -Psign=false -x signJarsPublication' # Disable signing if no key provided to script
+ cmd += ' -Psign=false' # Disable signing if no key provided to script
else:
cmd += ' -Psign --max-workers 2'
if sign_gradle:
diff --git a/gradle/maven/defaults-maven.gradle b/gradle/maven/defaults-maven.gradle
index 8d0ef8f2a43..96e82dcc1c4 100644
--- a/gradle/maven/defaults-maven.gradle
+++ b/gradle/maven/defaults-maven.gradle
@@ -177,7 +177,7 @@ configure(subprojects.findAll { it.path in rootProject.published }) { prj ->
if (project(":solr:distribution").ext.useGpgForSigning) {
useGpgCmd()
}
- required { !version.endsWith("SNAPSHOT") }
+ required { project(":solr:distribution").ext.withSignedArtifacts }
sign publishing.publications.jars
}
}