Skip to content

Commit 2d9378f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into SOLR-18111
2 parents ad5bcdd + f80dc74 commit 2d9378f

145 files changed

Lines changed: 4166 additions & 892 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/validate-changelog-yaml.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- Each author has a 'name' field (non-empty string)
3131
- Contains either 'links' or 'issues' field (or both)
3232
- If 'issues' is present, it must be an integer not exceeding 17000
33+
- Comment block is removed
3334
"""
3435

3536
import sys
@@ -41,10 +42,12 @@ def validate_changelog_yaml(file_path):
4142
valid_types = ['added', 'changed', 'fixed', 'deprecated', 'removed', 'dependency_update', 'security', 'other']
4243
valid_keys = ['title', 'type', 'issues', 'links', 'important_notes', 'modules', 'authors']
4344
deprecated_keys = ['merge_requests', 'configurations']
45+
not_allowed_text = ['DELETE ALL COMMENTS UP HERE', 'Most such changes are too small']
4446

4547
try:
4648
with open(file_path, 'r', encoding='utf-8') as f:
47-
data = yaml.safe_load(f)
49+
raw_content = f.read()
50+
data = yaml.safe_load(raw_content)
4851

4952
# Check if file contains a mapping (dictionary)
5053
if not isinstance(data, dict):
@@ -120,6 +123,12 @@ def validate_changelog_yaml(file_path):
120123
print(f"::error file={file_path}::Field 'issues' value {data['issues']} points to a non-existing github PR. Did you intend to reference a JIRA issue, please use 'links'.")
121124
return False
122125

126+
# Validate that comments are removed
127+
for not_allowed in not_allowed_text:
128+
if not_allowed in raw_content:
129+
print(f"::error file={file_path}::File still contains commented template text. Please remove the comment block at the top of the file.")
130+
return False
131+
123132
# All validations passed
124133
print(f"✓ {file_path} is valid")
125134
print(f" Title: {data['title']}")
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
title: Update com.lmax:disruptor to v4
2+
type: dependency_update
3+
authors:
4+
- name: solrbot
5+
links:
6+
- name: PR#3127
7+
url: https://github.com/apache/solr/pull/3127
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
title: Gradle now syncs dependency versions across more configurations, forcing the choosing of one version in most cases
2+
type: other
3+
authors:
4+
- name: Jan Høydahl
5+
- name: David Smiley
6+
- name: Christos Malliaridis
7+
links:
8+
- name: PR#4140
9+
url: https://github.com/apache/solr/pull/4140
10+
11+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
title: SOLR 17845 - Implement OAuth support in new UI
2+
type: added
3+
authors:
4+
- name: Christos Malliaridis
5+
nick: malliaridis
6+
url: https://home.apache.org/phonebook.html?uid=malliaridis
7+
links:
8+
- name: SOLR-17845
9+
url: https://issues.apache.org/jira/browse/SOLR-17845
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Provide NoOpRequestWriter and NoOpRequestHandler that can be used to disable implicitly configured equivalents.
3+
type: added # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Eric Pugh
6+
links:
7+
- name: SOLR-18095
8+
url: https://issues.apache.org/jira/browse/SOLR-18095
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Remove deprecated StandardRequestHandler in favor of SearchHandler
3+
type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Eric Pugh
6+
links:
7+
- name: SOLR-18105
8+
url: https://issues.apache.org/jira/browse/SOLR-18105
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Improve footer UI of Solr Cloud - Graph when you have large numbers of collections. Plus code refactor.
3+
type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Eric Pugh
6+
links:
7+
- name: SOLR-18113
8+
url: https://issues.apache.org/jira/browse/SOLR-18113
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Script creating a cluster using bin/solr start -e cloud with --prompt-inputs option.
3+
type: added # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Eric Pugh
6+
- name: Rahul Goswami
7+
links:
8+
- name: SOLR-18118
9+
url: https://issues.apache.org/jira/browse/SOLR-18118
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Support repeated parents.preFilter values in nested vector knn queries
3+
type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Arup Chauhan
6+
nick: arup-chauhan
7+
links:
8+
- name: SOLR-18039
9+
url: https://issues.apache.org/jira/browse/SOLR-18039
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: "CrossDC Consumer: add /health endpoint"
3+
type: added # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Andrzej Bialecki
6+
nick: ab
7+
links:
8+
- name: SOLR-18061
9+
url: https://issues.apache.org/jira/browse/SOLR-18061

0 commit comments

Comments
 (0)