You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/10/05 21:34:09 UTC
[lucene] branch main updated: LUCENE-9809 Adapt Release Wizard to
only release Lucene (#344)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new 674b66d LUCENE-9809 Adapt Release Wizard to only release Lucene (#344)
674b66d is described below
commit 674b66dd16f5b89b7c97ea9aedcac077e6d7f3b9
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Tue Oct 5 23:33:59 2021 +0200
LUCENE-9809 Adapt Release Wizard to only release Lucene (#344)
* Update wording in README and poll-mirrors.py
* First pass at updating wizard
- lucene/solr -> lucene
- removed solr-only tasks and python functions
* Update addVersion to remove Solr parts
- fixes bug with a regex and missing String qualifier for gradle baseVersion
* buildAndPushRelease - remove solr parts
* githubPRs.py report on PRs from new lucene repo and lucene JIRA only
* update smokeTestRelease.py example in README.md (but not smokeTestRelease.py itself)
* remove Solr references in releasedJirasRegex.py
* Update releasedJirasRegex.py
* Add gpg release signing to buildAndPushRelease.py
Co-authored-by: Christine Poerschke <cp...@apache.org>
---
dev-tools/scripts/README.md | 17 +-
dev-tools/scripts/addVersion.py | 51 +-----
dev-tools/scripts/buildAndPushRelease.py | 31 +---
dev-tools/scripts/githubPRs.py | 16 +-
dev-tools/scripts/poll-mirrors.py | 4 +-
dev-tools/scripts/releaseWizard.py | 40 ++---
dev-tools/scripts/releaseWizard.yaml | 265 +++++--------------------------
dev-tools/scripts/releasedJirasRegex.py | 16 +-
8 files changed, 91 insertions(+), 349 deletions(-)
diff --git a/dev-tools/scripts/README.md b/dev-tools/scripts/README.md
index fceee98..0aab402 100644
--- a/dev-tools/scripts/README.md
+++ b/dev-tools/scripts/README.md
@@ -18,7 +18,7 @@
# Developer Scripts
This folder contains various useful scripts for developers, mostly related to
-releasing new versions of Lucene/Solr and testing those.
+releasing new versions of Lucene and testing those.
Python scripts require Python 3. To install necessary python modules, please run:
@@ -62,7 +62,7 @@ the full tests.
--download-only Only perform download and sha hash check steps
Example usage:
- python3 -u dev-tools/scripts/smokeTestRelease.py https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-6.0.1-RC2-revc7510a0...
+ python3 -u dev-tools/scripts/smokeTestRelease.py https://dist.apache.org/repos/dist/dev/lucene/lucene-9.0.1-RC2-revc7510a0...
### releaseWizard.py
@@ -102,7 +102,7 @@ of the other tools in this folder.
--push-local PATH Push the release to the local path
--sign KEYID Sign the release with the given gpg key
--rc-num NUM Release Candidate number. Default: 1
- --root PATH Root of Git working tree for lucene-solr. Default: "."
+ --root PATH Root of Git working tree for lucene. Default: "."
(the current directory)
--logfile PATH Specify log file path (default /tmp/release.log)
@@ -132,8 +132,7 @@ of the other tools in this folder.
usage: addVersion.py [-h] version
- Add a new version to CHANGES, to Version.java, build.gradle and
- solrconfig.xml files
+ Add a new version to CHANGES, to Version.java and build.gradle files
positional arguments:
version
@@ -163,9 +162,9 @@ and prints a regular expression that will match all of them
usage: reproduceJenkinsFailures.py [-h] [--no-git] [--iters N] URL
- Must be run from a Lucene/Solr git workspace. Downloads the Jenkins
+ Must be run from a Lucene git workspace. Downloads the Jenkins
log pointed to by the given URL, parses it for Git revision and failed
- Lucene/Solr tests, checks out the Git revision in the local workspace,
+ Lucene tests, checks out the Git revision in the local workspace,
groups the failed tests by module, then runs
'ant test -Dtest.dups=%d -Dtests.class="*.test1[|*.test2[...]]" ...'
in each module of interest, failing at the end if any of the runs fails.
@@ -185,13 +184,13 @@ and prints a regular expression that will match all of them
usage: poll-mirrors.py [-h] [-version VERSION] [-path PATH]
[-interval INTERVAL] [-details] [-once]
- Periodically checks that all Lucene/Solr mirrors contain either a copy of a
+ Periodically checks that all Lucene mirrors contain either a copy of a
release or a specified path
optional arguments:
-h, --help show this help message and exit
-version VERSION, -v VERSION
- Lucene/Solr version to check
+ Lucene version to check
-path PATH, -p PATH instead of a versioned release, check for
some/explicit/path
-interval INTERVAL, -i INTERVAL
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 37ddd7c..7f20ef4 100755
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -111,10 +111,11 @@ def update_build_version(new_version):
def edit(buffer, match, line):
if new_version.dot in line:
return None
- buffer.append(' baseVersion = \'' + new_version.dot + '\'\n')
- return True
+ buffer.append(' String baseVersion = \'' + new_version.dot + '\'\n')
+ return True
- changed = update_file(filename, scriptutil.version_prop_re, edit)
+ version_prop_re = re.compile(r'baseVersion\s*=\s*([\'"])(.*)\1')
+ changed = update_file(filename, version_prop_re, edit)
print('done' if changed else 'uptodate')
def update_latest_constant(new_version):
@@ -133,45 +134,13 @@ def update_latest_constant(new_version):
def onerror(x):
raise x
-def update_example_solrconfigs(new_version):
- print(' updating example solrconfig.xml files')
- matcher = re.compile('<luceneMatchVersion>')
-
- paths = ['solr/server/solr/configsets', 'solr/example', 'solr/core/src/test-files/solr/configsets/_default']
- for path in paths:
- if not os.path.isdir(path):
- raise RuntimeError("Can't locate configset dir (layout change?) : " + path)
- for root,dirs,files in os.walk(path, onerror=onerror):
- for f in files:
- if f == 'solrconfig.xml':
- update_solrconfig(os.path.join(root, f), matcher, new_version)
-
-def update_solrconfig(filename, matcher, new_version):
- print(' %s...' % filename, end='', flush=True)
- def edit(buffer, match, line):
- if new_version.dot in line:
- return None
- match = new_version.previous_dot_matcher.search(line)
- if match is None:
- return False
- buffer.append(line.replace(match.group(1), new_version.dot))
- return True
-
- changed = update_file(filename, matcher, edit)
- print('done' if changed else 'uptodate')
-
def check_lucene_version_tests():
print(' checking lucene version tests...', end='', flush=True)
run('./gradlew -p lucene/core test --tests TestVersion')
print('ok')
-def check_solr_version_tests():
- print(' checking solr version tests...', end='', flush=True)
- run('./gradlew -p solr/core test --tests TestLuceneMatchVersion')
- print('ok')
-
def read_config(current_version):
- parser = argparse.ArgumentParser(description='Add a new version to CHANGES, to Version.java, build.gradle and solrconfig.xml files')
+ parser = argparse.ArgumentParser(description='Add a new version to CHANGES, to Version.java and build.gradle files')
parser.add_argument('version', type=Version.parse)
newconf = parser.parse_args()
@@ -189,13 +158,7 @@ def parse_properties_file(filename):
parser.read_string("[DUMMY_SECTION]\n" + contents) # Add required section
return dict(parser.items('DUMMY_SECTION'))
-def get_solr_init_changes():
- return dedent('''
- Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
- Docker and contrib modules have separate CHANGES.md files.
- ''')
-
def main():
if not os.path.exists('build.gradle'):
sys.exit("Tool must be run from the root of a source checkout.")
@@ -207,8 +170,6 @@ def main():
# See LUCENE-8883 for some thoughts on which categories to use
update_changes('lucene/CHANGES.txt', newconf.version, '\n',
['Bug Fixes'] if is_bugfix else ['API Changes', 'New Features', 'Improvements', 'Optimizations', 'Bug Fixes', 'Other'])
- update_changes('solr/CHANGES.txt', newconf.version, get_solr_init_changes(),
- ['Bug Fixes'] if is_bugfix else ['New Features', 'Improvements', 'Optimizations', 'Bug Fixes', 'Other Changes'])
latest_or_backcompat = newconf.is_latest_version or current_version.is_back_compat_with(newconf.version)
if latest_or_backcompat:
@@ -220,7 +181,6 @@ def main():
print('\nUpdating latest version')
update_build_version(newconf.version)
update_latest_constant(newconf.version)
- update_example_solrconfigs(newconf.version)
if newconf.version.is_major_release():
print('\nTODO: ')
@@ -229,7 +189,6 @@ def main():
elif latest_or_backcompat:
print('\nTesting changes')
check_lucene_version_tests()
- check_solr_version_tests()
print()
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 21861cb..7f573c1 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -117,9 +117,7 @@ def prepare(root, version, gpgKeyID, gpgPassword):
print(' prepare-release')
cmd = './gradlew -Dversion.release=%s clean assembleDist' % version
if gpgKeyID is not None:
- # TODO sign
- # cmd += ' -Psigning.keyId=%s publishSignedPublicationToMavenLocal' % gpgKeyID
- pass
+ cmd += ' -Psigning.gnupg.keyName=%s signDist' % gpgKeyID
cmd += ' mavenToLocalFolder'
if gpgPassword is not None:
@@ -135,9 +133,9 @@ reVersion1 = re.compile(r'\>(\d+)\.(\d+)\.(\d+)(-alpha|-beta)?/\<', re.IGNORECAS
reVersion2 = re.compile(r'-(\d+)\.(\d+)\.(\d+)(-alpha|-beta)?\.zip<', re.IGNORECASE)
reDoapRevision = re.compile(r'(\d+)\.(\d+)(?:\.(\d+))?(-alpha|-beta)?', re.IGNORECASE)
def checkDOAPfiles(version):
- # In Lucene and Solr DOAP files, verify presence of all releases less than the one being produced.
+ # In Lucene DOAP file, verify presence of all releases less than the one being produced.
errorMessages = []
- for product in 'lucene', 'solr':
+ for product in ['lucene']:
url = 'https://archive.apache.org/dist/lucene/%s' % ('java' if product == 'lucene' else product)
distpage = load(url)
releases = set()
@@ -186,9 +184,8 @@ def pushLocal(version, root, rev, rcNum, localDir):
print('Push local [%s]...' % localDir)
os.makedirs(localDir)
- dir = 'lucene-solr-%s-RC%d-rev%s' % (version, rcNum, rev)
+ dir = 'lucene-%s-RC%d-rev%s' % (version, rcNum, rev)
os.makedirs('%s/%s/lucene' % (localDir, dir))
- os.makedirs('%s/%s/solr' % (localDir, dir))
print(' Lucene')
lucene_dist_dir = '%s/lucene/packaging/build/distributions' % root
os.chdir(lucene_dist_dir)
@@ -201,21 +198,9 @@ def pushLocal(version, root, rev, rcNum, localDir):
print(' unzip...')
run('tar xjf "%s/lucene.tar.bz2"' % lucene_dist_dir)
os.remove('%s/lucene.tar.bz2' % lucene_dist_dir)
-
- print(' Solr')
- solr_dist_dir = '%s/solr/packaging/build/distributions' % root
- os.chdir(solr_dist_dir)
- print(' zip...')
- if os.path.exists('solr.tar.bz2'):
- os.remove('solr.tar.bz2')
- run('tar cjf solr.tar.bz2 *')
- print(' unzip...')
- os.chdir('%s/%s/solr' % (localDir, dir))
- run('tar xjf "%s/solr.tar.bz2"' % solr_dist_dir)
- os.remove('%s/solr.tar.bz2' % solr_dist_dir)
+ os.chdir('..')
print(' chmod...')
- os.chdir('..')
run('chmod -R a+rX-w .')
print(' done!')
@@ -243,7 +228,7 @@ def parse_config():
parser.add_argument('--rc-num', metavar='NUM', type=int, default=1,
help='Release Candidate number. Default: 1')
parser.add_argument('--root', metavar='PATH', default='.',
- help='Root of Git working tree for lucene-solr. Default: "." (the current directory)')
+ help='Root of Git working tree for lucene. Default: "." (the current directory)')
parser.add_argument('--logfile', metavar='PATH',
help='Specify log file path (default /tmp/release.log)')
config = parser.parse_args()
@@ -261,8 +246,8 @@ def parse_config():
cwd = os.getcwd()
os.chdir(config.root)
config.root = os.getcwd() # Absolutize root dir
- if os.system('git rev-parse') or 3 != len([d for d in ('dev-tools','lucene','solr') if os.path.isdir(d)]):
- parser.error('Root path "%s" is not a valid lucene-solr checkout' % config.root)
+ if os.system('git rev-parse') or 2 != len([d for d in ('dev-tools','lucene') if os.path.isdir(d)]):
+ parser.error('Root path "%s" is not a valid lucene checkout' % config.root)
os.chdir(cwd)
global LOG
if config.logfile:
diff --git a/dev-tools/scripts/githubPRs.py b/dev-tools/scripts/githubPRs.py
index 322301e..38e8c6b 100755
--- a/dev-tools/scripts/githubPRs.py
+++ b/dev-tools/scripts/githubPRs.py
@@ -56,21 +56,21 @@ def make_html(dict):
sys.exit(1)
global conf
template = Environment(loader=BaseLoader).from_string("""
- <h1>Lucene/Solr Github PR report</h1>
+ <h1>Lucene Github PR report</h1>
<p>Number of open Pull Requests: {{ open_count }}</p>
<h2>PRs lacking JIRA reference in title ({{ no_jira_count }})</h2>
<ul>
{% for pr in no_jira %}
- <li><a href="https://github.com/apache/lucene-solr/pull/{{ pr.number }}">#{{ pr.number }}: {{ pr.created }} {{ pr.title }}</a> ({{ pr.user }})</li>
+ <li><a href="https://github.com/apache/lucene/pull/{{ pr.number }}">#{{ pr.number }}: {{ pr.created }} {{ pr.title }}</a> ({{ pr.user }})</li>
{%- endfor %}
</ul>
<h2>Open PRs with a resolved JIRA ({{ closed_jira_count }})</h2>
<ul>
{% for pr in closed_jira %}
- <li><a href="https://github.com/apache/lucene-solr/pull/{{ pr.pr_number }}">#{{ pr.pr_number }}</a>: <a href="https://issues.apache.org/jira/browse/{{ pr.issue_key }}">{{ pr.status }} {{ pr.resolution_date }} {{ pr.issue_key}}: {{ pr.issue_summary }}</a> ({{ pr.assignee }})</li>
+ <li><a href="https://github.com/apache/lucene/pull/{{ pr.pr_number }}">#{{ pr.pr_number }}</a>: <a href="https://issues.apache.org/jira/browse/{{ pr.issue_key }}">{{ pr.status }} {{ pr.resolution_date }} {{ pr.issue_key}}: {{ pr.issue_summary }}</a> ({{ pr.assignee }})</li>
{%- endfor %}
</ul>
""")
@@ -86,14 +86,14 @@ def main():
gh = Github()
jira = JIRA('https://issues.apache.org/jira')
result = {}
- repo = gh.get_repo('apache/lucene-solr')
+ repo = gh.get_repo('apache/lucene')
open_prs = repo.get_pulls(state='open')
- out("Lucene/Solr Github PR report")
+ out("Lucene Github PR report")
out("============================")
out("Number of open Pull Requests: %s" % open_prs.totalCount)
result['open_count'] = open_prs.totalCount
- lack_jira = list(filter(lambda x: not re.match(r'.*\b(LUCENE|SOLR)-\d{3,6}\b', x.title), open_prs))
+ lack_jira = list(filter(lambda x: not re.match(r'.*\b(LUCENE)-\d{3,6}\b', x.title), open_prs))
result['no_jira_count'] = len(lack_jira)
lack_jira_list = []
for pr in lack_jira:
@@ -104,12 +104,12 @@ def main():
out(" #%s: %s %s (%s)" % (pr['number'], pr['created'], pr['title'], pr['user'] ))
out("\nOpen PRs with a resolved JIRA")
- has_jira = list(filter(lambda x: re.match(r'.*\b(LUCENE|SOLR)-\d{3,6}\b', x.title), open_prs))
+ has_jira = list(filter(lambda x: re.match(r'.*\b(LUCENE)-\d{3,6}\b', x.title), open_prs))
issue_ids = []
issue_to_pr = {}
for pr in has_jira:
- jira_issue_str = re.match(r'.*\b((LUCENE|SOLR)-\d{3,6})\b', pr.title).group(1)
+ jira_issue_str = re.match(r'.*\b((LUCENE)-\d{3,6})\b', pr.title).group(1)
issue_ids.append(jira_issue_str)
issue_to_pr[jira_issue_str] = pr
diff --git a/dev-tools/scripts/poll-mirrors.py b/dev-tools/scripts/poll-mirrors.py
index 7a94a29..342ee5e 100755
--- a/dev-tools/scripts/poll-mirrors.py
+++ b/dev-tools/scripts/poll-mirrors.py
@@ -102,9 +102,9 @@ def check_mirror(url):
return url
-desc = 'Periodically checks that all Lucene/Solr mirrors contain either a copy of a release or a specified path'
+desc = 'Periodically checks that all Lucene mirrors contain either a copy of a release or a specified path'
parser = argparse.ArgumentParser(description=desc)
-parser.add_argument('-version', '-v', help='Lucene/Solr version to check')
+parser.add_argument('-version', '-v', help='Lucene version to check')
parser.add_argument('-path', '-p', help='instead of a versioned release, check for some/explicit/path')
parser.add_argument('-interval', '-i', help='seconds to wait before re-querying mirrors', type=int, default=300)
parser.add_argument('-details', '-d', help='print missing mirror URLs', action='store_true', default=False)
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index b73ef4b..fdcaa57 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -66,7 +66,7 @@ from consolemenu.items import FunctionItem, SubmenuItem, ExitItem
from consolemenu.screen import Screen
from scriptutil import BranchType, Version, download, run
-# Solr-to-Java version mapping
+# Lucene-to-Java version mapping
java_versions = {6: 8, 7: 8, 8: 8, 9: 11}
editor = None
@@ -97,7 +97,6 @@ def expand_jinja(text, vars=None):
'release_version_major': state.release_version_major,
'release_version_minor': state.release_version_minor,
'release_version_bugfix': state.release_version_bugfix,
- 'release_version_refguide': state.get_refguide_release() ,
'state': state,
'gpg_key' : state.get_gpg_key(),
'gradle_cmd' : 'gradlew.bat' if is_windows() else './gradlew',
@@ -111,7 +110,6 @@ def expand_jinja(text, vars=None):
'vote_close_72h_epoch': unix_time_millis(vote_close_72h_date()),
'vote_close_72h_holidays': vote_close_72h_holidays(),
'lucene_news_file': lucene_news_file,
- 'solr_news_file': solr_news_file,
'load_lines': load_lines,
'set_java_home': set_java_home,
'latest_version': state.get_latest_version(),
@@ -234,11 +232,11 @@ def maybe_remove_rc_from_svn():
Commands(state.get_git_checkout_folder(),
"""Looks like you uploaded artifacts for {{ build_rc.git_rev | default("<git_rev>", True) }} to svn which needs to be removed.""",
[Command(
- """svn -m "Remove cancelled Lucene/Solr {{ release_version }} RC{{ rc_number }}" rm {{ dist_url }}""",
+ """svn -m "Remove cancelled Lucene {{ release_version }} RC{{ rc_number }}" rm {{ dist_url }}""",
logfile="svn_rm.log",
tee=True,
vars={
- 'dist_folder': """lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}""",
+ 'dist_folder': """lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}""",
'dist_url': "{{ dist_url_base }}/{{ dist_folder }}"
}
)],
@@ -552,7 +550,7 @@ class ReleaseState:
return folder
def get_git_checkout_folder(self):
- folder = os.path.join(self.get_release_folder(), "lucene-solr")
+ folder = os.path.join(self.get_release_folder(), "lucene")
return folder
def get_website_git_folder(self):
@@ -582,9 +580,6 @@ class ReleaseState:
if self.release_type == 'bugfix':
return "%s.%s.%s" % (self.release_version_major, self.release_version_minor, self.release_version_bugfix + 1)
- def get_refguide_release(self):
- return "%s_%s" % (self.release_version_major, self.release_version_minor)
-
def get_java_home(self):
return self.get_java_home_for_version(self.release_version)
@@ -887,7 +882,7 @@ def get_todo_menuitem_title():
def get_releasing_text():
- return "Releasing Lucene/Solr %s RC%d" % (state.release_version, state.rc_number)
+ return "Releasing Lucene %s RC%d" % (state.release_version, state.rc_number)
def get_start_new_rc_menu_title():
@@ -943,14 +938,14 @@ def unix_to_datetime(unix_stamp):
def generate_asciidoc():
base_filename = os.path.join(state.get_release_folder(),
- "lucene_solr_release_%s"
+ "lucene_release_%s"
% (state.release_version.replace("\.", "_")))
filename_adoc = "%s.adoc" % base_filename
filename_html = "%s.html" % base_filename
fh = open(filename_adoc, "w")
- fh.write("= Lucene/Solr Release %s\n\n" % state.release_version)
+ fh.write("= Lucene Release %s\n\n" % state.release_version)
fh.write("(_Generated by releaseWizard.py v%s at %s_)\n\n"
% (getScriptVersion(), datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")))
fh.write(":numbered:\n\n")
@@ -1329,7 +1324,7 @@ def main():
global dry_run
global templates
- print("Lucene/Solr releaseWizard v%s" % getScriptVersion())
+ print("Lucene releaseWizard v%s" % getScriptVersion())
c = parse_config()
if c.dry:
@@ -1383,18 +1378,15 @@ def main():
os.environ['JAVACMD'] = state.get_java_cmd()
global lucene_news_file
- global solr_news_file
lucene_news_file = os.path.join(state.get_website_git_folder(), 'content', 'core', 'core_news',
"%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
- solr_news_file = os.path.join(state.get_website_git_folder(), 'content', 'solr', 'solr_news',
- "%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
website_folder = state.get_website_git_folder()
- main_menu = UpdatableConsoleMenu(title="Lucene/Solr ReleaseWizard",
+ main_menu = UpdatableConsoleMenu(title="Lucene ReleaseWizard",
subtitle=get_releasing_text,
prologue_text="Welcome to the release wizard. From here you can manage the process including creating new RCs. "
"All changes are persisted, so you can exit any time and continue later. Make sure to read the Help section.",
- epilogue_text="® 2020 The Lucene/Solr project. Licensed under the Apache License 2.0\nScript version v%s)" % getScriptVersion(),
+ epilogue_text="® 2021 The Lucene project. Licensed under the Apache License 2.0\nScript version v%s)" % getScriptVersion(),
screen=MyScreen())
todo_menu = UpdatableConsoleMenu(title=get_releasing_text,
@@ -1905,7 +1897,7 @@ def create_ical(todo):
if ask_yes_no("Do you want to add a Calendar reminder for the close vote time?"):
c = Calendar()
e = Event()
- e.name = "Lucene/Solr %s vote ends" % state.release_version
+ e.name = "Lucene %s vote ends" % state.release_version
e.begin = vote_close_72h_date()
e.description = "Remember to sum up votes and continue release :)"
c.events.add(e)
@@ -1958,16 +1950,6 @@ def prepare_announce_lucene(todo):
print("Draft already exist, not re-generating")
return True
-def prepare_announce_solr(todo):
- if not os.path.exists(solr_news_file):
- solr_text = expand_jinja("(( template=announce_solr ))")
- with open(solr_news_file, 'w') as fp:
- fp.write(solr_text)
- # print("Wrote Solr announce draft to %s" % solr_news_file)
- else:
- print("Draft already exist, not re-generating")
- return True
-
def set_java_home(version):
os.environ['JAVA_HOME'] = state.get_java_home_for_version(version)
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index 5d2765e..915d3de 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -32,7 +32,7 @@
#
templates:
help: |
- Welcome to the role as Release Manager for Lucene/Solr, and the releaseWizard!
+ Welcome to the role as Release Manager for Lucene, and the releaseWizard!
The Release Wizard aims to walk you through the whole release process step by step,
helping you to to run the right commands in the right order, generating
@@ -65,7 +65,7 @@ templates:
.Mail template {% if passed %}successful{% else %}failed{% endif %} vote
----
To: dev@lucene.apache.org
- Subject: [{% if passed %}RESULT{% else %}FAILED{% endif %}] [VOTE] Release Lucene/Solr {{ release_version }} RC{{ rc_number }}
+ Subject: [{% if passed %}RESULT{% else %}FAILED{% endif %}] [VOTE] Release Lucene {{ release_version }} RC{{ rc_number }}
It's been >72h since the vote was initiated and the result is:
@@ -102,35 +102,6 @@ templates:
Please read CHANGES.txt for a full list of {% if is_feature_release %}new features and {% endif %}changes:
<https://lucene.apache.org/core/{{ release_version_underscore }}/changes/Changes.html>
- announce_solr: |
- Title: Apache Solr™ {{ release_version }} available
- category: solr/news
- save_as:
-
- The Lucene PMC is pleased to announce the release of Apache Solr {{ release_version }}.
-
- Solr is the popular, blazing fast, open source NoSQL search platform from the Apache Lucene project. Its major features include powerful full-text search, hit highlighting, faceted search, dynamic clustering, database integration, rich document handling, and geospatial search. Solr is highly scalable, providing fault tolerant distributed search and indexing, and powers the search and navigation features of many of the world's largest internet sites.
-
- Solr {{ release_version }} is available for immediate download at:
-
- <https://lucene.apache.org/solr/downloads.html>
-
- ### Solr {{ release_version }} Release Highlights:
-
- * Feature 1 pasted from WIKI release notes
- * Feature 2 ...
-
- Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:
-
- <https://lucene.apache.org/solr/guide/{{ release_version_refguide }}/solr-upgrade-notes.html>
-
- Please read CHANGES.txt for a full list of {% if is_feature_release %}new features, changes and {% endif %}bugfixes:
-
- <https://lucene.apache.org/solr/{{ release_version_underscore }}/changes/Changes.html>
-
- Solr {{ release_version }} also includes {% if is_feature_release %}features, optimizations and {% endif %}bugfixes in the corresponding Apache Lucene release:
-
- <https://lucene.apache.org/core/{{ release_version_underscore }}/changes/Changes.html>
announce_lucene_mail: |
The template below can be used to announce the Lucene release to the
internal mailing lists.
@@ -165,40 +136,6 @@ templates:
distributing releases. It is possible that the mirror you are using may not have
replicated the release yet. If that is the case, please try another mirror.
This also applies to Maven access.
- announce_solr_mail: |
- The template below can be used to announce the Solr release to the
- internal mailing lists.
-
- .Mail template
- ----
- To: dev@lucene.apache.org, general@lucene.apache.org, solr-user@lucene.apache.org
- Subject: [ANNOUNCE] Apache Solr {{ release_version }} released
-
- (( template=announce_solr_mail_body ))
- ----
- announce_solr_sign_mail: |
- The template below can be used to announce the Solr release to the
- `announce@apache.org` mailing list. The mail *should be signed with PGP.*
- and sent *from your `@apache.org` account*.
-
- .Mail template
- ----
- From: {{ gpg.apache_id }}@apache.org
- To: announce@apache.org
- Subject: [ANNOUNCE] Apache Solr {{ release_version }} released
-
- (( template=announce_solr_mail_body ))
- ----
- announce_solr_mail_body: |
- {% for line in load_lines(solr_news_file, 4) -%}
- {{ line }}
- {%- endfor %}
-
-
- Note: The Apache Software Foundation uses an extensive mirroring network for
- distributing releases. It is possible that the mirror you are using may not have
- replicated the release yet. If that is the case, please try another mirror.
- This also applies to Maven access.
# TODOs belong to groups for easy navigation in menus. Todo objects may contain asciidoc
# descriptions, a number of commands to execute, some links to display, user input to gather
# etc. Here is the documentation of each type of object. For further details, please consult
@@ -280,10 +217,10 @@ groups:
voting rules, create a PGP/GPG key for use with signing and more. Please familiarise
yourself with the resources listed below.
links:
- - http://www.apache.org/dev/release-publishing.html
- - http://www.apache.org/legal/release-policy.html
- - http://www.apache.org/dev/release-signing.html
- - https://wiki.apache.org/lucene-java/ReleaseTodo
+ - https://www.apache.org/dev/release-publishing.html
+ - https://www.apache.org/legal/release-policy.html
+ - https://infra.apache.org/release-signing.html
+ - https://cwiki.apache.org/confluence/display/LUCENE/ReleaseTodo
- !Todo
id: tools
title: Necessary tools are installed
@@ -334,7 +271,6 @@ groups:
If you are a PMC member, you will already have the necessary permissions.
links:
- https://issues.apache.org/jira/projects/LUCENE
- - https://issues.apache.org/jira/projects/SOLR
- !TodoGroup
id: preparation
title: Prepare for the release
@@ -378,7 +314,7 @@ groups:
- '{{ git_checkout_folder }}'
commands:
- !Command
- cmd: git clone --progress https://gitbox.apache.org/repos/asf/lucene-solr.git lucene-solr
+ cmd: git clone --progress https://gitbox.apache.org/repos/asf/lucene.git lucene
logfile: git_clone.log
- !Todo
id: gradle_precommit
@@ -535,7 +471,7 @@ groups:
- major
- minor
links:
- - https://wiki.apache.org/lucene-java/JenkinsReleaseBuilds
+ - https://cwiki.apache.org/confluence/display/LUCENEJAVA/JenkinsReleaseBuilds
- !Todo
id: inform_devs
title: Inform Devs of the new Release Branch
@@ -549,7 +485,7 @@ groups:
.Mail template
----
To: dev@lucene.apache.org
- Subject: New branch and feature freeze for Lucene/Solr {{ release_version }}
+ Subject: New branch and feature freeze for Lucene {{ release_version }}
NOTICE:
@@ -589,7 +525,7 @@ groups:
.Mail template
----
To: dev@lucene.apache.org
- Subject: Bugfix release Lucene/Solr {{ release_version }}
+ Subject: Bugfix release Lucene {{ release_version }}
NOTICE:
@@ -616,7 +552,6 @@ groups:
These are typically edited on the Wiki
Clone a page for a previous version as a starting point for your release notes.
- You will need two pages, one for Lucene and another for Solr, see links.
Edit the contents of `CHANGES.txt` into a more concise format for public consumption.
Ask on dev@ for input. Ideally the timing of this request mostly coincides with the
release branch creation. It's a good idea to remind the devs of this later in the release too.
@@ -624,7 +559,6 @@ groups:
NOTE: Do not add every single JIRA issue, but distill the Release note into important changes!
links:
- https://cwiki.apache.org/confluence/display/LUCENE/Release+Notes
- - https://cwiki.apache.org/confluence/display/SOLR/Release+Notes
- !Todo
id: new_jira_versions
title: Add a new version in JIRA for the next release
@@ -635,14 +569,11 @@ groups:
. Change name of version `main ({{ release_version_major }}.0)` into `{{ release_version_major }}.0`
{%- endif %}
. Create a new (unreleased) version `{{ get_next_version }}`
-
- This needs to be done both for Lucene and Solr JIRAs, see links.
types:
- major
- minor
links:
- https://issues.apache.org/jira/plugins/servlet/project-config/LUCENE/versions
- - https://issues.apache.org/jira/plugins/servlet/project-config/SOLR/versions
- !TodoGroup
id: artifacts
title: Build the release artifacts
@@ -732,7 +663,7 @@ groups:
title: Run the smoke tester
depends: build_rc
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'
tmp_dir: '{{ [rc_folder, ''smoketest''] | path_join }}'
local_keys: '{% if keys_downloaded %} --local-keys "{{ [config_path, ''KEYS''] | path_join }}"{% endif %}'
@@ -752,7 +683,7 @@ groups:
Here we'll import the artifacts into Subversion.
depends: smoke_tester
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'
dist_url: https://dist.apache.org/repos/dist/dev/lucene/{{ dist_folder}}
commands: !Commands
@@ -760,7 +691,7 @@ groups:
commands_text: Have your Apache credentials handy, you'll be prompted for your password
commands:
- !Command
- cmd: svn -m "Lucene/Solr {{ release_version }} RC{{ rc_number }}" import {{ dist_path }} {{ dist_url }}
+ cmd: svn -m "Lucene {{ release_version }} RC{{ rc_number }}" import {{ dist_path }} {{ dist_url }}
logfile: import_svn.log
tee: true
- !Todo
@@ -771,7 +702,7 @@ groups:
area and checks hash and signatures, but does not re-run all tests.
depends: import_svn
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
dist_url: https://dist.apache.org/repos/dist/dev/lucene/{{ dist_folder}}
tmp_dir: '{{ [rc_folder, ''smoketest_staged''] | path_join }}'
local_keys: '{% if keys_downloaded %} --local-keys "{{ [config_path, ''KEYS''] | path_join }}"{% endif %}'
@@ -800,17 +731,17 @@ groups:
.Mail template
----
To: dev@lucene.apache.org
- Subject: [VOTE] Release Lucene/Solr {{ release_version }} RC{{ rc_number }}
+ Subject: [VOTE] Release Lucene {{ release_version }} RC{{ rc_number }}
- Please vote for release candidate {{ rc_number }} for Lucene/Solr {{ release_version }}
+ Please vote for release candidate {{ rc_number }} for Lucene {{ release_version }}
The artifacts can be downloaded from:
- https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ https://dist.apache.org/repos/dist/dev/lucene/lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
You can run the smoke tester directly with this command:
python3 -u dev-tools/scripts/smokeTestRelease.py \
- https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ https://dist.apache.org/repos/dist/dev/lucene/lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
The vote will be open for at least 72 hours i.e. until {{ vote_close }}.
@@ -920,18 +851,18 @@ groups:
logs_prefix: tag_release
commands:
- !Command
- cmd: git tag -a releases/lucene-solr/{{ release_version }} -m "Lucene/Solr {{ release_version }} release" {{ build_rc.git_rev | default("<git_rev>", True) }}
+ cmd: git tag -a releases/lucene/{{ release_version }} -m "Lucene {{ release_version }} release" {{ build_rc.git_rev | default("<git_rev>", True) }}
logfile: git_tag.log
tee: true
- !Command
- cmd: git push origin releases/lucene-solr/{{ release_version }}
+ cmd: git push origin releases/lucene/{{ release_version }}
logfile: git_push_tag.log
tee: true
- !Todo
id: rm_staged_mvn
title: Delete mvn artifacts from staging repo
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'
dist_stage_url: https://dist.apache.org/repos/dist/dev/lucene/{{ dist_folder}}
commands: !Commands
@@ -943,15 +874,11 @@ groups:
cmd: svn rm -m "Delete the lucene maven artifacts" {{ dist_stage_url }}/lucene/maven
logfile: svn_rm_mvn_lucene.log
tee: true
- - !Command
- cmd: svn rm -m "Delete the solr maven artifacts" {{ dist_stage_url }}/solr/maven
- logfile: svn_rm_mvn_solr.log
- tee: true
- !Todo
id: mv_to_release
title: Move release artifacts to release repo
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
dist_stage_url: https://dist.apache.org/repos/dist/dev/lucene/{{ dist_folder}}
dist_release_url: https://dist.apache.org/repos/dist/release/lucene
commands: !Commands
@@ -964,20 +891,16 @@ groups:
logfile: svn_mv_lucene.log
tee: true
- !Command
- cmd: svn move -m "Move Solr {{ release_version }} RC{{ rc_number }} to release repo" {{ dist_stage_url }}/solr {{ dist_release_url }}/solr/{{ release_version }}
- logfile: svn_mv_solr.log
- tee: true
- - !Command
- cmd: svn rm -m "Clean up the RC folder for {{ release_version }} RC{{ rc_number }}" https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ cmd: svn rm -m "Clean up the RC folder for {{ release_version }} RC{{ rc_number }}" https://dist.apache.org/repos/dist/dev/lucene/lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
logfile: svn_rm_containing.log
comment: Clean up containing folder on the staging repo
tee: true
- post_description: 'Note at this point you will see the Jenkins job "Lucene-Solr-SmokeRelease-main" begin to fail, until you run the "Generate Backcompat Indexes" '
+ post_description: 'Note at this point you will see the Jenkins job "Lucene-SmokeRelease-main" begin to fail, until you run the "Generate Backcompat Indexes" '
- !Todo
id: stage_maven
title: Stage the maven artifacts for publishing
vars:
- dist_folder: lucene-solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
+ dist_folder: lucene-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}
commands: !Commands
root_folder: '{{ git_checkout_folder }}'
confirm_each_command: true
@@ -986,12 +909,7 @@ groups:
- !Command
cmd: ant clean stage-maven-artifacts -Dmaven.dist.dir={{ [dist_file_path, dist_folder, 'lucene', 'maven'] | path_join }} -Dm2.repository.id=apache.releases.https -Dm2.repository.url={{ m2_repository_url }}
logfile: publish_lucene_maven.log
- - !Command
- cmd: ant clean stage-maven-artifacts -Dmaven.dist.dir={{ [dist_file_path, dist_folder, 'solr', 'maven'] | path_join }} -Dm2.repository.id=apache.releases.https -Dm2.repository.url={{ m2_repository_url }}
- logfile: publish_solr_maven.log
post_description: The artifacts are not published yet, please proceed with the next step to actually publish!
- links:
- - https://wiki.apache.org/lucene-java/PublishMavenArtifacts
- !Todo
id: publish_maven
depends: stage_maven
@@ -1004,11 +922,11 @@ groups:
. Log in to https://repository.apache.org/ with your ASF credentials
. Select "Staging Repositories" under "Build Promotion" from the navigation bar on the left
. Select the staging repository containing the Lucene artifacts
- . Click on the "Close" button above the repository list, then enter a description when prompted, e.g. "Lucene/Solr {{ release_version }} RC{{ rc_number }}"
+ . Click on the "Close" button above the repository list, then enter a description when prompted, e.g. "Lucene {{ release_version }} RC{{ rc_number }}"
* The system will now spend some time validating the artifacts. Grab a coke and come back.
- * Release the Lucene and/or Solr artifacts
+ * Release the Lucene artifacts
. Wait and keep clicking refresh until the "Release" button becomes available
- . Click on the "Release" button above the repository list, then enter a description when prompted, e.g. "Lucene/Solr {{ release_version }}".
+ . Click on the "Release" button above the repository list, then enter a description when prompted, e.g. "Lucene {{ release_version }}".
Maven central should show the release after a short while, but you need to
wait 24 hours to give the Apache mirrors a chance to copy the new release.
@@ -1032,8 +950,7 @@ groups:
description: |
For every release, we publish docs on the website, we need to update the
download pages etc. The website is hosted in https://github.com/apache/lucene-site
- but the Javadocs and Solr Reference Guide are pushed to SVN and then included
- in the main site through links.
+ but the Javadocs are pushed to SVN and then included in the main site through links.
todos:
- !Todo
id: website_docs
@@ -1044,9 +961,8 @@ groups:
At the end of the task, the two links below shall work.
links:
- http://lucene.apache.org/core/{{ version }}
- - http://lucene.apache.org/solr/{{ version }}
vars:
- release_tag: releases/lucene-solr/{{ release_version }}
+ release_tag: releases/lucene/{{ release_version }}
version: "{{ release_version_major }}_{{ release_version_minor }}_{{ release_version_bugfix }}"
commands: !Commands
root_folder: '{{ git_checkout_folder }}'
@@ -1064,10 +980,6 @@ groups:
cmd: svn -m "Add docs, changes and javadocs for Lucene {{ release_version }}" import {{ git_checkout_folder }}/lucene/build/docs https://svn.apache.org/repos/infra/sites/lucene/core/{{ version }}
logfile: add-docs-lucene.log
comment: Add docs for Lucene
- - !Command
- cmd: svn -m "Add docs, changes and javadocs for Solr {{ release_version }}" import {{ git_checkout_folder }}/solr/build/docs https://svn.apache.org/repos/infra/sites/solr/docs/{{ version }}
- logfile: add-docs-solr.log
- comment: Add docs for Solr
- !Todo
id: website_git_clone
title: Do a clean git clone of the website repo
@@ -1086,7 +998,7 @@ groups:
title: Update website versions
depends: website_git_clone
vars:
- release_tag: releases/lucene-solr/{{ release_version }}
+ release_tag: releases/lucene/{{ release_version }}
description: |
We need to update the website so that the download pages list the new release, and the
"latest" javadoc links point to the new release.
@@ -1135,31 +1047,6 @@ groups:
post_description: |
You will push and verify all changes in a later step
- !Todo
- id: prepare_announce_solr
- title: Author the Solr release news
- depends: website_git_clone
- description: |
- Edit a news text for the Solr website. This text will be the basis for the release announcement email later.
- This step will open an editor with a template. You will need to copy/paste the final release announcement text
- from the Wiki page and format it as Markdown.
- function: prepare_announce_solr
- commands: !Commands
- root_folder: '{{ git_website_folder }}'
- commands_text: |
- Copy the Solr announcement from https://cwiki.apache.org/confluence/display/SOLR/Release+Notes
- You have to exit the editor after edit to continue.
- commands:
- - !Command
- cmd: "{{ editor }} {{ solr_news_file }}"
- comment: Edit the Solr announcement news
- stdout: true
- - !Command
- cmd: git add . && git commit -m "Adding Solr news for release {{ release_version }}"
- logfile: commit.log
- stdout: true
- post_description: |
- You will push and verify all changes in a later step
- - !Todo
id: update_other
title: Update rest of webpage
depends: website_update_versions
@@ -1189,7 +1076,7 @@ groups:
id: stage_website
title: Stage the website changes
depends:
- - prepare_announce_solr
+ - prepare_announce_lucene
description: |
Push the website changes to 'main' branch, and check the staging site.
You will get a chance to preview the diff of all changes before you push.
@@ -1252,20 +1139,18 @@ groups:
Verify on https://lucene.apache.org that the site is OK.
- You can now also verify that http://lucene.apache.org/solr/api/solr-core/ and http://lucene.apache.org/core/api/core/
- redirects to the latest version
+ You can now also verify that http://lucene.apache.org/core/api/core/ redirects to the latest version
links:
- https://ci2.apache.org/#/builders/3
- https://lucene.apache.org
- - http://lucene.apache.org/solr/api/solr-core/
- http://lucene.apache.org/core/api/core/
- !Todo
id: update_doap
title: Update the DOAP files
description: |
- Update the Core & Solr DOAP RDF files on the unstable, stable and release branches to
+ Update the DOAP RDF files on the unstable, stable and release branches to
reflect the new versions (note that the website .htaccess file redirects from their
- canonical URLs to their locations in the Lucene/Solr Git source repository - see
+ canonical URLs to their locations in the Lucene Git source repository - see
dev-tools/doap/README.txt for more info)
commands: !Commands
root_folder: '{{ git_checkout_folder }}'
@@ -1280,11 +1165,7 @@ groups:
comment: Edit Lucene DOAP, add version {{ release_version }}
stdout: true
- !Command
- cmd: "{{ editor }} dev-tools/doap/solr.rdf"
- comment: Edit Solr DOAP, add version {{ release_version }}
- stdout: true
- - !Command
- cmd: git add dev-tools/doap/lucene.rdf dev-tools/doap/solr.rdf && git commit -m "DOAP changes for release {{ release_version }}"
+ cmd: git add dev-tools/doap/lucene.rdf && git commit -m "DOAP changes for release {{ release_version }}"
logfile: commit.log
stdout: true
- !Command
@@ -1344,11 +1225,6 @@ groups:
description: |
(( template=announce_lucene_mail ))
- !Todo
- id: announce_solr
- title: Announce the Solr release (@l.a.o)
- description: |
- (( template=announce_solr_mail ))
- - !Todo
id: setup_pgp_mail
title: Setup your mail client for PGP
description: |
@@ -1373,11 +1249,6 @@ groups:
description: |
(( template=announce_lucene_sign_mail ))
- !Todo
- id: announce_solr_sig
- title: Announce the Solr release (announce@a.o)
- description: |
- (( template=announce_solr_sign_mail ))
- - !Todo
id: add_to_wikipedia
title: Add the new version to Wikipedia
description: |
@@ -1386,7 +1257,6 @@ groups:
If you know other languages than English, edit those as well.
links:
- https://en.wikipedia.org/wiki/Apache_Lucene
- - https://en.wikipedia.org/wiki/Apache_Solr
- !Todo
id: add_to_apache_reporter
title: Add the new version to the Apache Release Reporter
@@ -1464,7 +1334,7 @@ groups:
logfile: checkout-release.log
stdout: true
- !Command
- cmd: python3 -u -B dev-tools/scripts/releasedJirasRegex.py {{ release_version }} lucene/CHANGES.txt && python3 -u -B dev-tools/scripts/releasedJirasRegex.py {{ release_version }} solr/CHANGES.txt
+ cmd: python3 -u -B dev-tools/scripts/releasedJirasRegex.py {{ release_version }} lucene/CHANGES.txt
tee: true
comment: Find version regexes
- !Command
@@ -1472,12 +1342,8 @@ groups:
comment: Go to main branch
logfile: checkout-main.log
- !Command
- cmd: "{{ editor }} solr/CHANGES.txt"
- comment: Edit Solr CHANGES, do necessary changes
- stdout: true
- - !Command
cmd: "{{ editor }} lucene/CHANGES.txt"
- comment: Edit Lucene CHANGES, do necessary changes
+ comment: Edit CHANGES.txt for main branch, do necessary changes
stdout: true
- !Command
cmd: git add -u . && git commit -m "Sync CHANGES for {{ release_version }}" && git push
@@ -1487,12 +1353,8 @@ groups:
comment: Go to stable branch
logfile: checkout-stable.log
- !Command
- cmd: "{{ editor }} solr/CHANGES.txt"
- comment: Edit Solr CHANGES, do necessary changes
- stdout: true
- - !Command
cmd: "{{ editor }} lucene/CHANGES.txt"
- comment: Edit Lucene CHANGES, do necessary changes
+ comment: Edit CHANGES.txt for stable branch, do necessary changes
stdout: true
- !Command
cmd: git add -u . && git commit -m "Sync CHANGES for {{ release_version }}" && git push
@@ -1640,34 +1502,26 @@ groups:
. Fill in the release date ({{ release_date | formatdate }})
. It will give the option of transitioning issues marked fix-for the released version to the
next version, but do not do this as it will send an email for each issue :)
-
- This needs to be done both for Lucene and Solr JIRAs, see links.
links:
- https://issues.apache.org/jira/plugins/servlet/project-config/LUCENE/versions
- - https://issues.apache.org/jira/plugins/servlet/project-config/SOLR/versions
- !Todo
id: jira_close_resolved
title: Close all issues resolved in the release
description: |-
- Go to JIRA search in both Solr and Lucene and find all issues that were fixed in the release
+ Go to JIRA search to find all issues that were fixed in the release
you just made, whose Status is Resolved.
- . Go to https://issues.apache.org/jira/issues/?jql=project+in+(LUCENE,SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version }}
+ . Go to https://issues.apache.org/jira/issues/?jql=project+in+(LUCENE)+AND+status=Resolved+AND+fixVersion={{ release_version }}
. Do a bulk change (Under Tools... menu) to close all of these issues. This is a workflow transition task
. In the 'Comment' box type `Closing after the {{ release_version }} release`
. *Uncheck* the box that says `Send mail for this update`
-
- This needs to be done both for Lucene and Solr JIRAs, see links.
links:
- - https://issues.apache.org/jira/issues/?jql=project+in+(LUCENE,SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version }}
+ - https://issues.apache.org/jira/issues/?jql=project+in+(LUCENE)+AND+status=Resolved+AND+fixVersion={{ release_version }}
- !Todo
id: jira_change_unresolved
title: Remove fixVersion for unresolved
description: |-
Do another JIRA search to find all issues with Resolution=_Unresolved_ and fixVersion=_{{ release_version }}_.
- You need to do this separately for Lucene and Solr.
-
- *Lucene*
. Open https://issues.apache.org/jira/issues/?jql=project+=+LUCENE+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}
. In the `Tools` menu, start a bulk change - operation="Edit issues"
@@ -1675,34 +1529,8 @@ groups:
. Check the box next to `Change Fix Version/s` and in the dropdown `Find and remove these`, selecting v {{ release_version }}
. On the bottom of the form, uncheck the box that says `Send mail for this update`
. Click `Next`, review the changes and click `Confirm`
-
- *Solr*
-
- . Open https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}
- . In the `Tools` menu, start a bulk change - operation="Edit issues"
- . Identify issues that *are included* in the release, but are unresolved e.g. due to being REOPENED. These shall *not* be bulk changed!
- . Check the box next to `Change Fix Version/s` and in the dropdown `Find and remove these`, selecting v {{ release_version }}
- . On the bottom of the form, uncheck the box that says `Send mail for this update`
- . Click `Next`, review the changes and click `Confirm`
links:
- https://issues.apache.org/jira/issues/?jql=project+=+LUCENE+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}
- - https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}
- - !Todo
- id: jira_clear_security
- title: Clear Security Level of Public Solr JIRA Issues
- description: |-
- ASF JIRA has a deficiency in which issues that have a security level of "Public" are nonetheless not searchable.
- As a maintenance task, we'll clear the security flag for all public Solr JIRAs, even if it is not a task directly
- related to the release:
-
- . Open in browser: https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+level+=+%22Public%22
- . In the `Tools` menu, start a bulk change, select all issues and click `Next`
- . Select operation="Edit issues" and click `Next`
- . Click the checkbox next to `Change security level` and choose `None` in the dropdown.
- . On the bottom of the form, uncheck the box that says `Send mail for this update`
- . Click `Next`, review the changes and click `Confirm`
- links:
- - https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+level+=+%22Public%22
- !Todo
id: new_jira_versions_bugfix
title: Add a new version in JIRA for the next release
@@ -1710,20 +1538,17 @@ groups:
Go to the JIRA "Manage Versions" Administration pages and add the new version:
. Create a new (unreleased) version `{{ get_next_version }}`
-
- This needs to be done both for Lucene and Solr JIRAs, see links.
types:
- bugfix
links:
- https://issues.apache.org/jira/plugins/servlet/project-config/LUCENE/versions
- - https://issues.apache.org/jira/plugins/servlet/project-config/SOLR/versions
- !Todo
id: stop_mirroring
title: Stop mirroring old releases
description: |
Shortly after new releases are first mirrored, they are automatically copied to the archives.
Only the latest point release from each active branch should be kept under the Lucene PMC
- svnpubsub areas `dist/releases/lucene/` and `dist/releases/solr/`. Older releases can be
+ svnpubsub area `dist/releases/lucene/`. Older releases can be
safely deleted, since they are already backed up in the archives.
Currenlty these versions are in the mirrors:
@@ -1747,7 +1572,3 @@ groups:
cmd: |
svn rm -m "Stop mirroring old Lucene releases"{% for ver in mirrored_versions_to_delete %} https://dist.apache.org/repos/dist/release/lucene/java/{{ ver }}{% endfor %}
logfile: svn-rm-lucene.log
- - !Command
- cmd: |
- svn rm -m "Stop mirroring old Solr releases"{% for ver in mirrored_versions_to_delete %} https://dist.apache.org/repos/dist/release/lucene/solr/{{ ver }}{% endfor %}
- logfile: svn-rm-lucene.log
diff --git a/dev-tools/scripts/releasedJirasRegex.py b/dev-tools/scripts/releasedJirasRegex.py
index 7de0b05..1ec80fd 100755
--- a/dev-tools/scripts/releasedJirasRegex.py
+++ b/dev-tools/scripts/releasedJirasRegex.py
@@ -26,15 +26,15 @@ import re
# under the given version in the given CHANGES.txt file
# and prints a regular expression that will match all of them
#
-# Caveat: In ancient versions (Lucene v1.9 and older; Solr v1.1 and older),
+# Caveat: In ancient versions (Lucene v1.9 and older),
# does not find Bugzilla bugs or JIRAs not mentioned at the beginning of
# bullets or numbered entries.
#
def print_released_jiras_regex(version, filename):
release_boundary_re = re.compile(r'\s*====*\s+(.*)\s+===')
version_re = re.compile(r'%s(?:$|[^-])' % version)
- bullet_re = re.compile(r'\s*(?:[-*]|\d+\.(?=(?:\s|(?:LUCENE|SOLR)-)))(.*)')
- jira_ptn = r'(?:LUCENE|SOLR)-\d+'
+ bullet_re = re.compile(r'\s*(?:[-*]|\d+\.(?=(?:\s|(?:LUCENE)-)))(.*)')
+ jira_ptn = r'(?:LUCENE)-\d+'
jira_re = re.compile(jira_ptn)
jira_list_ptn = r'(?:[:,/()\s]*(?:%s))+' % jira_ptn
jira_list_re = re.compile(jira_list_ptn)
@@ -43,7 +43,6 @@ def print_released_jiras_regex(version, filename):
requested_version_found = False
more_jiras_on_next_line = False
lucene_jiras = []
- solr_jiras = []
with open(filename, 'r') as changes:
for line in changes:
version_boundary = release_boundary_re.match(line)
@@ -63,18 +62,15 @@ def print_released_jiras_regex(version, filename):
if jira_list_match is not None:
jira_match = jira_re.findall(jira_list_match.group(0))
for jira in jira_match:
- (lucene_jiras if jira.startswith('LUCENE-') else solr_jiras).append(jira.rsplit('-', 1)[-1])
+ lucene_jiras.append(jira.rsplit('-', 1)[-1])
more_jiras_on_next_line = more_jiras_on_next_line_re.match(content)
if not requested_version_found:
raise Exception('Could not find %s in %s' % (version, filename))
print()
- if (len(lucene_jiras) == 0 and len(solr_jiras) == 0):
+ if (len(lucene_jiras) == 0):
print('(No JIRAs => no regex)', end='')
else:
- if len(lucene_jiras) > 0:
- print(r'LUCENE-(?:%s)\b%s' % ('|'.join(lucene_jiras), '|' if len(solr_jiras) > 0 else ''), end='')
- if len(solr_jiras) > 0:
- print(r'SOLR-(?:%s)\b' % '|'.join(solr_jiras), end='')
+ print(r'LUCENE-(?:%s)\b' % '|'.join(lucene_jiras), end='')
print()
def read_config():