Skip to content

Commit

Permalink
maven indexing: update lucene from 9.9.1 to 9.10.0.
Browse files Browse the repository at this point in the history
 - maintenance release
 - can now use (final) foreign memory API on JDK 22
 - can now use (preview) vector API on JDK 22 too
  • Loading branch information
mbien committed Feb 21, 2024
1 parent 6a9d501 commit 1e68855
Show file tree
Hide file tree
Showing 11 changed files with 1,453 additions and 603 deletions.
12 changes: 6 additions & 6 deletions java/maven.indexer/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
C867D9AA6A9AB14F62D35FB689A789A6CB5AF62E org.apache.maven.indexer:indexer-core:7.1.2
219D09C157DDFBD741642FEDC28931D3561984B6 org.apache.maven.indexer:search-api:7.1.2
2625D44190FDB8E7B85C8FCF1803637390A20ACC org.apache.maven.indexer:search-backend-smo:7.1.2
55249FA9A0ED321ADCF8283C6F3B649A6812B0A9 org.apache.lucene:lucene-core:9.9.1
11C46007366BB037BE7D271AB0A5849B1D544662 org.apache.lucene:lucene-backward-codecs:9.9.1
30928513461BF79A5CB057E84DA7D34A1E53227D org.apache.lucene:lucene-highlighter:9.9.1
12D844FE224F6F97C510AC20D68903ED7F626F6C org.apache.lucene:lucene-queryparser:9.9.1
24C8401B530308F9568EB7B408C2029C63F564C6 org.apache.lucene:lucene-analysis-common:9.9.1
479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2
64E5624754D59386BE5D9159C68F81FF96298704 org.apache.lucene:lucene-core:9.10.0
6570EBF974D07025AD4CD9FFAA9927546B534704 org.apache.lucene:lucene-backward-codecs:9.10.0
2F21ADE4B4896F1ECE2B3A823E1640C762C9D0CF org.apache.lucene:lucene-highlighter:9.10.0
C50F82D244EA5ADAC2D2D9295DE85DDCCC2D45CB org.apache.lucene:lucene-queryparser:9.10.0
92E559808A23F61C818EF90A9CCAB3669A25CAA0 org.apache.lucene:lucene-analysis-common:9.10.0
934C04D3CFEF185A8008E7BF34331B79730A9D43 javax.annotation:javax.annotation-api:1.3.2
B3ADD478D4382B78EA20B1671390A858002FEB6C com.google.code.gson:gson:2.10.1
355 changes: 0 additions & 355 deletions java/maven.indexer/external/javax.annotation-api-1.2-license.txt

This file was deleted.

405 changes: 405 additions & 0 deletions java/maven.indexer/external/javax.annotation-api-1.3.2-license.txt

Large diffs are not rendered by default.

514 changes: 514 additions & 0 deletions java/maven.indexer/external/lucene-9.10.0-license.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).

Includes software from other Apache Software Foundation projects,
including, but not limited to:
- Apache Ant
- Apache Jakarta Regexp
- Apache Commons
- Apache Xerces
Expand Down Expand Up @@ -38,9 +37,6 @@ under the 2-clause BSD license.
The Google Code Prettify is Apache License 2.0.
See http://code.google.com/p/google-code-prettify/

JUnit (junit-4.10) is licensed under the Common Public License v. 1.0
See http://junit.sourceforge.net/cpl-v10.html

This product includes code (JaspellTernarySearchTrie) from Java Spelling Checkin
g Package (jaspell): http://jaspell.sourceforge.net/
License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
Expand Down Expand Up @@ -105,9 +101,6 @@ developed by Dawid Weiss and Marcin Miłkowski
(https://github.com/morfologik/morfologik-stemming) and uses
data from the BSD-licensed dictionary of Polish (SGJP, http://sgjp.pl/morfeusz/).

Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
source code for this can be found at http://www.eclipse.org/jetty/downloads.php

===========================================================================
Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
===========================================================================
Expand Down Expand Up @@ -197,11 +190,8 @@ Nori Korean Morphological Analyzer - Apache Lucene Integration

This software includes a binary and/or source version of data from

mecab-ko-dic-2.0.3-20170922
mecab-ko-dic-2.1.1-20180720

which can be obtained from

https://bitbucket.org/eunjeon/mecab-ko-dic/downloads/mecab-ko-dic-2.0.3-20170922.tar.gz

The floating point precision conversion in NumericUtils.Float16Converter is derived from work by
Jeroen van der Zijp, granted for use under the Apache license.
https://bitbucket.org/eunjeon/mecab-ko-dic/downloads/mecab-ko-dic-2.1.1-20180720.tar.gz
210 changes: 0 additions & 210 deletions java/maven.indexer/external/lucene-9.9.1-license.txt

This file was deleted.

12 changes: 6 additions & 6 deletions java/maven.indexer/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ release.external/indexer-core-7.1.2.jar=modules/ext/maven/indexer-core-7.1.2.jar
release.external/search-api-7.1.2.jar=modules/ext/maven/search-api-7.1.2.jar
release.external/search-backend-smo-7.1.2.jar=modules/ext/maven/search-backend-smo-7.1.2.jar
release.external/gson-2.10.1.jar=modules/ext/maven/gson-2.10.1.jar
release.external/lucene-core-9.9.1.jar=modules/ext/maven/lucene-core-9.9.1.jar
release.external/lucene-backward-codecs-9.9.1.jar=modules/ext/maven/lucene-backward-codecs-9.9.1.jar
release.external/lucene-highlighter-9.9.1.jar=modules/ext/maven/lucene-highlighter-9.9.1.jar
release.external/lucene-queryparser-9.9.1.jar=modules/ext/maven/lucene-queryparser-9.9.1.jar
release.external/lucene-analysis-common-9.9.1.jar=modules/ext/maven/lucene-analysis-common-9.9.1.jar
release.external/javax.annotation-api-1.2.jar=modules/ext/maven/javax.annotation-api-1.2.jar
release.external/lucene-core-9.10.0.jar=modules/ext/maven/lucene-core-9.10.0.jar
release.external/lucene-backward-codecs-9.10.0.jar=modules/ext/maven/lucene-backward-codecs-9.10.0.jar
release.external/lucene-highlighter-9.10.0.jar=modules/ext/maven/lucene-highlighter-9.10.0.jar
release.external/lucene-queryparser-9.10.0.jar=modules/ext/maven/lucene-queryparser-9.10.0.jar
release.external/lucene-analysis-common-9.10.0.jar=modules/ext/maven/lucene-analysis-common-9.10.0.jar
release.external/javax.annotation-api-1.3.2.jar=modules/ext/maven/javax.annotation-api-1.3.2.jar
# XXX so long as Lucene is bundled here:
sigtest.gen.fail.on.error=false

Expand Down
24 changes: 12 additions & 12 deletions java/maven.indexer/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,28 +188,28 @@
<binary-origin>external/search-backend-smo-7.1.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-core-9.9.1.jar</runtime-relative-path>
<binary-origin>external/lucene-core-9.9.1.jar</binary-origin>
<runtime-relative-path>ext/maven/lucene-core-9.10.0.jar</runtime-relative-path>
<binary-origin>external/lucene-core-9.10.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-backward-codecs-9.9.1.jar</runtime-relative-path>
<binary-origin>external/lucene-backward-codecs-9.9.1.jar</binary-origin>
<runtime-relative-path>ext/maven/lucene-backward-codecs-9.10.0.jar</runtime-relative-path>
<binary-origin>external/lucene-backward-codecs-9.10.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-highlighter-9.9.1.jar</runtime-relative-path>
<binary-origin>external/lucene-highlighter-9.9.1.jar</binary-origin>
<runtime-relative-path>ext/maven/lucene-highlighter-9.10.0.jar</runtime-relative-path>
<binary-origin>external/lucene-highlighter-9.10.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-queryparser-9.9.1.jar</runtime-relative-path>
<binary-origin>external/lucene-queryparser-9.9.1.jar</binary-origin>
<runtime-relative-path>ext/maven/lucene-queryparser-9.10.0.jar</runtime-relative-path>
<binary-origin>external/lucene-queryparser-9.10.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-analysis-common-9.9.1.jar</runtime-relative-path>
<binary-origin>external/lucene-analysis-common-9.9.1.jar</binary-origin>
<runtime-relative-path>ext/maven/lucene-analysis-common-9.10.0.jar</runtime-relative-path>
<binary-origin>external/lucene-analysis-common-9.10.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/javax.annotation-api-1.2.jar</runtime-relative-path>
<binary-origin>external/javax.annotation-api-1.2.jar</binary-origin>
<runtime-relative-path>ext/maven/javax.annotation-api-1.3.2.jar</runtime-relative-path>
<binary-origin>external/javax.annotation-api-1.3.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/gson-2.10.1.jar</runtime-relative-path>
Expand Down
Loading

0 comments on commit 1e68855

Please sign in to comment.