You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2020/03/12 09:22:27 UTC
[lucene-solr] branch branch_8x updated (e783f37 -> 00e8d26)
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from e783f37 LUCENE-9258: DocTermsIndexDocValues' range scorer didn't support multi-valued fields
new 22a1c3c Changes to release scripts for 8.5 release
new 00e8d26 LUCENE-9171: Add CHANGES entry SOLR-12238: Add CHANGES entry
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/scripts/buildAndPushRelease.py | 2 +-
dev-tools/scripts/releaseWizard.py | 6 ++++--
dev-tools/scripts/releaseWizard.yaml | 4 ++--
dev-tools/scripts/smokeTestRelease.py | 4 +++-
lucene/CHANGES.txt | 6 ++++++
solr/CHANGES.txt | 4 ++++
6 files changed, 20 insertions(+), 6 deletions(-)
[lucene-solr] 02/02: LUCENE-9171: Add CHANGES entry SOLR-12238: Add
CHANGES entry
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 00e8d262f26567ac79767594d1d31962175ed6d8
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Mar 12 09:21:14 2020 +0000
LUCENE-9171: Add CHANGES entry
SOLR-12238: Add CHANGES entry
---
lucene/CHANGES.txt | 6 ++++++
solr/CHANGES.txt | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index ab958be..b9e5a57 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -69,6 +69,9 @@ API Changes
* LUCENE-9150: Restore support for dynamic PlanetModel in spatial3d. (Nick Knize)
+* LUCENE-9171: QueryBuilder.newTermQuery() and .newSynonymQuery() now take boost parameters.
+ (Alessandro Benedetti, Alan Woodward)
+
New Features
---------------------
@@ -108,6 +111,9 @@ Improvements
* LUCENE-8962: Add ability to selectively merge on commit (Michael Froh)
+* LUCENE-9171: QueryBuilder can now use BoostAttributes on input token streams to selectively
+ boost particular terms or synonyms in parsed queries. (Alessandro Benedetti, Alan Woodward)
+
Optimizations
---------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 245e434..65ac367 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -49,6 +49,10 @@ New Features
* SOLR-14139: Support backtick phrase queries in Streaming Expressions (Joel Bernstein)
+* SOLR-12238: Synonyms can be individually boosted by marking them with '|<boost>' in
+ the synonyms file, and adding a DelimitedBoostTokenFilter to the analysis chain
+ (Alessandro Benedetti, Alan Woodward)
+
Improvements
---------------------
* SOLR-14120: Define JavaScript methods 'includes' and 'startsWith' to ensure AdminUI can be displayed when using
[lucene-solr] 01/02: Changes to release scripts for 8.5 release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 22a1c3c769ea912399315b062521b0611c902648
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Mar 12 09:07:58 2020 +0000
Changes to release scripts for 8.5 release
* Warning message in releaseWizard about setting GPG_TTY
* Download GPG keys from new location
* Correct git commands in release wizard
---
dev-tools/scripts/buildAndPushRelease.py | 2 +-
dev-tools/scripts/releaseWizard.py | 6 ++++--
dev-tools/scripts/releaseWizard.yaml | 4 ++--
dev-tools/scripts/smokeTestRelease.py | 4 +++-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index f801e32..f24fe30 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -314,7 +314,7 @@ def check_key_in_keys(gpgKeyID, local_keys):
gpgKeyID[20:24], gpgKeyID[24:28], gpgKeyID[28:32], gpgKeyID[32:36], gpgKeyID[36:])
re_to_match = r"^pub .*\n\s+(%s|%s)" % (gpgKeyID40Char, gpgKeyID)
else:
- print('Invalid gpg key id format. Must be 8 byte short ID or 40 byte fingerprint, with or without 0x prefix, no spaces.')
+ print('Invalid gpg key id format [%s]. Must be 8 byte short ID or 40 byte fingerprint, with or without 0x prefix, no spaces.' % gpgKeyID)
exit(2)
if re.search(re_to_match, keysFileText, re.MULTILINE):
print(' Found key %s in KEYS file at %s' % (gpgKeyID, keysFileLocation))
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index 94c7452..da76fac 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -172,6 +172,8 @@ def check_prerequisites(todo=None):
sys.exit("You will need gpg installed")
if not check_ant().startswith('1.8'):
print("WARNING: This script will work best with ant 1.8. The script buildAndPushRelease.py may have problems with PGP password input under ant 1.10")
+ if not 'GPG_TTY' in os.environ:
+ print("WARNING: GPG_TTY environment variable is not set, GPG signing may not work correctly (try 'export GPG_TTY=$(TTY)'")
if not 'JAVA8_HOME' in os.environ or not 'JAVA11_HOME' in os.environ:
sys.exit("Please set environment variables JAVA8_HOME and JAVA11_HOME")
try:
@@ -1072,7 +1074,7 @@ def configure_pgp(gpg_todo):
id = str(input("Please enter your Apache id: (ENTER=skip) "))
if id.strip() == '':
return False
- all_keys = load('https://home.apache.org/keys/group/lucene.asc')
+ all_keys = load('https://downloads.apache.org/lucene/KEYS')
lines = all_keys.splitlines()
keyid_linenum = None
for idx, line in enumerate(lines):
@@ -1083,7 +1085,7 @@ def configure_pgp(gpg_todo):
keyid_line = lines[keyid_linenum]
assert keyid_line.startswith('LDAP PGP key: ')
gpg_id = keyid_line[14:].replace(" ", "")[-8:]
- print("Found gpg key id %s on file at Apache (https://home.apache.org/keys/group/lucene.asc)" % gpg_id)
+ print("Found gpg key id %s on file at Apache (https://downloads.apache.org/lucene/KEYS)" % gpg_id)
else:
print(textwrap.dedent("""\
Could not find your GPG key from Apache servers.
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index 12ca72e..51303d7 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -432,7 +432,7 @@ groups:
cmd: git checkout master
tee: true
- !Command
- cmd: git update
+ cmd: git pull
tee: true
- !Command
cmd: git ls-remote --exit-code --heads origin {{ stable_branch }}
@@ -461,7 +461,7 @@ groups:
cmd: git checkout {{ stable_branch }}
tee: true
- !Command
- cmd: git update
+ cmd: git pull
tee: true
- !Command
cmd: git ls-remote --exit-code --heads origin {{ release_branch }}
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 46cdae6..47f44b1 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -225,7 +225,9 @@ def checkAllJARs(topDir, project, gitRevision, version, tmpDir, baseURL):
for file in files:
if file.lower().endswith('.jar'):
if project == 'solr':
- if (normRoot.endswith('/contrib/dataimporthandler-extras/lib') and (file.startswith('javax.mail-') or file.startswith('activation-'))) or (normRoot.endswith('/test-framework/lib') and file.startswith('jersey-')):
+ if (normRoot.endswith('/contrib/dataimporthandler-extras/lib') and (file.startswith('javax.mail-') or file.startswith('activation-')))
+ or (normRoot.endswith('/test-framework/lib') and file.startswith('jersey-'))
+ or (normRoot.endsWith('/contrib/extraction/lib') and file.startswith('xml-apis-')):
print(' **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))
continue
else: