Skip to content

Commit 9a2e09d

Browse files
Update to apache lucene 9.X
- Additional package lucene-analysis-common required (KeywordAnalyzer, WhitespaceAnalyzer, PerFieldAnalyzerWrapper, CharTokenizer, LimitTokenCountAnalyzer) - FieldTypes were introduced to carry the field behavior (tokenization state, indexing options, storage settings) - BooleanQuery construction moved to builder - Collector interface was modified - TermEnum was replaced by TermsEnum - Terms are stored per field, so queries have to be specified with the target field - QuerySelectors were replaced by String sets - RAMDirecory was removed and is replaced by ByteBufferDirectories - Lock handling was reworked - Remove StoppableConvertor from Lucene Support Co-authored-by: Laszlo Kishalmi <laszlo.kishalmi@gmail.com>
1 parent 8da3d41 commit 9a2e09d

File tree

55 files changed

+1635
-1470
lines changed

Some content is hidden

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

55 files changed

+1635
-1470
lines changed

ide/csl.api/nbproject/project.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<build-prerequisite/>
7676
<compile-dependency/>
7777
<run-dependency>
78-
<release-version>3</release-version>
79-
<specification-version>3.0</specification-version>
78+
<release-version>9</release-version>
79+
<specification-version>9.0</specification-version>
8080
</run-dependency>
8181
</dependency>
8282
<dependency>

ide/jumpto/nbproject/project.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<build-prerequisite/>
107107
<compile-dependency/>
108108
<run-dependency>
109-
<release-version>2</release-version>
110-
<specification-version>2.31</specification-version>
109+
<release-version>3</release-version>
110+
<specification-version>3.0</specification-version>
111111
</run-dependency>
112112
</dependency>
113113
<dependency>

ide/libs.lucene/external/binaries-list

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
9EC77E2507F9CC01756964C71D91EFD8154A8C47 org.apache.lucene:lucene-core:3.6.2
17+
B4B3FBE8608B438D0A810D15187498E6DE974D0E org.apache.lucene:lucene-core:9.12.3
18+
1C25766443C63D4B75C4ACB5D2AE162A67D6F937 org.apache.lucene:lucene-analysis-common:9.12.3

ide/libs.lucene/external/lucene-core-3.6.2-notice.txt

Lines changed: 0 additions & 92 deletions
This file was deleted.

ide/libs.lucene/external/lucene-core-3.6.2-license.txt renamed to ide/libs.lucene/external/lucene-core-9.12.3-license.txt

Lines changed: 179 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Name: Apache Lucene
22
Description: Java-based indexing and search technology
3-
Version: 3.6.2
3+
Version: 9.12.3
44
Origin: Apache Software Foundation
55
License: Apache-2.0-lucene
66
URL: https://lucene.apache.org/core/
7-
Source: https://archive.apache.org/dist/lucene/java/3.6.2/
7+
Source: https://archive.apache.org/dist/lucene/java/9.12.3/
8+
Files: lucene-core-9.12.3.jar lucene-analysis-common-9.12.3.jar
89

910

1011
Apache License
@@ -211,7 +212,7 @@ Source: https://archive.apache.org/dist/lucene/java/3.6.2/
211212

212213

213214

214-
Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
215+
Some code in core/src/java/org/apache/lucene/util/UnicodeUtil.java was
215216
derived from unicode conversion examples available at
216217
http://www.unicode.org/Public/PROGRAMS/CVTUTF. Here is the copyright
217218
from those sources:
@@ -239,17 +240,80 @@ from those sources:
239240
*/
240241

241242

242-
Some code in src/java/org/apache/lucene/util/ArrayUtil.java was
243+
Some code in core/src/java/org/apache/lucene/util/ArrayUtil.java was
243244
derived from Python 2.4.2 sources available at
244245
http://www.python.org. Full license is here:
245246

246247
http://www.python.org/download/releases/2.4.2/license/
247248

249+
Some code in core/src/java/org/apache/lucene/util/UnicodeUtil.java was
250+
derived from Python 3.1.2 sources available at
251+
http://www.python.org. Full license is here:
252+
253+
http://www.python.org/download/releases/3.1.2/license/
254+
255+
Some code in core/src/java/org/apache/lucene/util/automaton was
256+
derived from Brics automaton sources available at
257+
www.brics.dk/automaton/. Here is the copyright from those sources:
248258

249-
Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
259+
/*
260+
* Copyright (c) 2001-2009 Anders Moeller
261+
* All rights reserved.
262+
*
263+
* Redistribution and use in source and binary forms, with or without
264+
* modification, are permitted provided that the following conditions
265+
* are met:
266+
* 1. Redistributions of source code must retain the above copyright
267+
* notice, this list of conditions and the following disclaimer.
268+
* 2. Redistributions in binary form must reproduce the above copyright
269+
* notice, this list of conditions and the following disclaimer in the
270+
* documentation and/or other materials provided with the distribution.
271+
* 3. The name of the author may not be used to endorse or promote products
272+
* derived from this software without specific prior written permission.
273+
*
274+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
275+
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
276+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
277+
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
278+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
279+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
280+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
281+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
282+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
283+
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
284+
*/
285+
286+
The levenshtein automata tables in core/src/java/org/apache/lucene/util/automaton
287+
were automatically generated with the moman/finenight FSA package.
288+
Here is the copyright for those sources:
289+
290+
# Copyright (c) 2010, Jean-Philippe Barrette-LaPierre, <jpb@rrette.com>
291+
#
292+
# Permission is hereby granted, free of charge, to any person
293+
# obtaining a copy of this software and associated documentation
294+
# files (the "Software"), to deal in the Software without
295+
# restriction, including without limitation the rights to use,
296+
# copy, modify, merge, publish, distribute, sublicense, and/or sell
297+
# copies of the Software, and to permit persons to whom the
298+
# Software is furnished to do so, subject to the following
299+
# conditions:
300+
#
301+
# The above copyright notice and this permission notice shall be
302+
# included in all copies or substantial portions of the Software.
303+
#
304+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
305+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
306+
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
307+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
308+
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
309+
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
310+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
311+
# OTHER DEALINGS IN THE SOFTWARE.
312+
313+
Some code in core/src/java/org/apache/lucene/util/UnicodeUtil.java was
250314
derived from ICU (http://www.icu-project.org)
251315
The full license is available here:
252-
http://source.icu-project.org/repos/icu/icu/trunk/license.html
316+
https://github.com/unicode-org/icu/blob/main/icu4c/LICENSE
253317

254318
/*
255319
* Copyright (C) 1999-2010, International Business Machines
@@ -341,3 +405,112 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
341405
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
342406
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
343407
SUCH DAMAGE.
408+
409+
The following license applies to the Morfologik project:
410+
411+
Copyright (c) 2006 Dawid Weiss
412+
Copyright (c) 2007-2011 Dawid Weiss, Marcin Miłkowski
413+
All rights reserved.
414+
415+
Redistribution and use in source and binary forms, with or without modification,
416+
are permitted provided that the following conditions are met:
417+
418+
* Redistributions of source code must retain the above copyright notice,
419+
this list of conditions and the following disclaimer.
420+
421+
* Redistributions in binary form must reproduce the above copyright notice,
422+
this list of conditions and the following disclaimer in the documentation
423+
and/or other materials provided with the distribution.
424+
425+
* Neither the name of Morfologik nor the names of its contributors
426+
may be used to endorse or promote products derived from this software
427+
without specific prior written permission.
428+
429+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
430+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
431+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
432+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
433+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
434+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
435+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
436+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
437+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
438+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
439+
440+
---
441+
442+
The dictionary comes from Morfologik project. Morfologik uses data from
443+
Polish ispell/myspell dictionary hosted at http://www.sjp.pl/slownik/en/ and
444+
is licenced on the terms of (inter alia) LGPL and Creative Commons
445+
ShareAlike. The part-of-speech tags were added in Morfologik project and
446+
are not found in the data from sjp.pl. The tagset is similar to IPI PAN
447+
tagset.
448+
449+
---
450+
451+
The following license applies to the Morfeusz project,
452+
used by org.apache.lucene.analysis.morfologik.
453+
454+
BSD-licensed dictionary of Polish (SGJP)
455+
http://sgjp.pl/morfeusz/
456+
457+
Copyright © 2011 Zygmunt Saloni, Włodzimierz Gruszczyński,
458+
Marcin Woliński, Robert Wołosz
459+
460+
All rights reserved.
461+
462+
Redistribution and use in source and binary forms, with or without
463+
modification, are permitted provided that the following conditions are
464+
met:
465+
466+
1. Redistributions of source code must retain the above copyright
467+
notice, this list of conditions and the following disclaimer.
468+
469+
2. Redistributions in binary form must reproduce the above copyright
470+
notice, this list of conditions and the following disclaimer in the
471+
documentation and/or other materials provided with the
472+
distribution.
473+
474+
THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS
475+
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
476+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
477+
DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE
478+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
479+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
480+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
481+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
482+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
483+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
484+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
485+
486+
---
487+
488+
core/src/java/org/apache/lucene/util/compress/LZ4.java is a Java
489+
implementation of the LZ4 (https://github.com/lz4/lz4/tree/dev/lib)
490+
compression format for Lucene's DataInput/DataOutput abstractions.
491+
492+
LZ4 Library
493+
Copyright (c) 2011-2016, Yann Collet
494+
All rights reserved.
495+
496+
Redistribution and use in source and binary forms, with or without modification,
497+
are permitted provided that the following conditions are met:
498+
499+
* Redistributions of source code must retain the above copyright notice, this
500+
list of conditions and the following disclaimer.
501+
502+
* Redistributions in binary form must reproduce the above copyright notice, this
503+
list of conditions and the following disclaimer in the documentation and/or
504+
other materials provided with the distribution.
505+
506+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
507+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
508+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
509+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
510+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
511+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
512+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
513+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
514+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
515+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
516+

0 commit comments

Comments
 (0)