This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 54ef268fc14 SOLR-17026: Fix releaseBuild without signing (#2051)
54ef268fc14 is described below

commit 54ef268fc1462ca9893acafa9700760cf5f64ab3
Author: Houston Putman <[email protected]>
AuthorDate: Tue Oct 31 12:10:40 2023 -0400

    SOLR-17026: Fix releaseBuild without signing (#2051)
    
    (cherry picked from commit 15e56e9ae0da514447a587084cf053c68f689b04)
---
 dev-tools/scripts/buildAndPushRelease.py | 2 +-
 gradle/maven/defaults-maven.gradle       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
       }
     }

Reply via email to