Apache Solr open-source search software
Fix smoke test jar checks & release wizard (#1470)
Houston Putman37b8c3cc5ebb
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex 7e6875889aa..42fb044383d 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -747,7 +747,7 @@ groups:cmd: git pull --ff-onlytee: true- !Command- cmd: python3 -u dev-tools/scripts/buildAndPushRelease.py {{ local_keys }} --logfile {{ logfile }} --push-local "{{ dist_file_path }}" --rc-num {{ rc_number }} --manifest-username {{ gpg.apache_id }} --sign {{ gpg.gpg_fingerprint | default("<gpg_fingerprint>", True) }} --gpg-pass-noprompt+ cmd: python3 -u dev-tools/scripts/buildAndPushRelease.py {{ local_keys }} --logfile {{ logfile }} --push-local "{{ dist_file_path }}" --rc-num {{ rc_number }} --dev-mode --mf-username {{ gpg.apache_id }} --sign {{ gpg.gpg_fingerprint | default("<gpg_fingerprint>", True) }} --gpg-pass-nopromptcomment: "Using gpg command for signing."logfile: build_rc.logtee: truediff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.pyindex 5a78213d298..191ccdf4598 100755--- a/dev-tools/scripts/smokeTestRelease.py+++ b/dev-tools/scripts/smokeTestRelease.py@@ -204,9 +204,9 @@ def checkAllJARs(topDir, gitRevision, version):for file in files:if file.lower().endswith('.jar'):if ((normRoot.endswith('/modules/extraction/lib') and file.startswith('jakarta.activation-'))- or (normRoot.endswith('/modules/extraction/lib') and file.startswith('jakarta.annotation-api-'))- or (normRoot.endswith('/modules/extraction/lib') and file.startswith('jakarta.xml.bind-api-'))- or (normRoot.endswith('/modules/extraction/lib') and file.startswith('unit-api-'))):+ or (normRoot.endswith('/modules/extraction/lib') and file.startswith('unit-api-'))+ or (normRoot.endswith('/server/solr-webapp/webapp/WEB-INF/lib') and file.startswith('jakarta.'))+ or (normRoot.endswith('/server/lib/ext') and file.startswith('jetty-servlet-api-'))):print(' **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))continuefullPath = '%s/%s' % (root, file)