Merge pull request #7460 from mbien/lucene911

Update maven-indexer to 7.1.3 and lucene to 9.11.0
apache · Jun 24, 2024 · b52e02c · b52e02c
2 parents 6d52cb8 + 5375232
commit b52e02c
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 41 deletions.
diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list
@@ -14,13 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-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
-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
+6B6780786C8FBF64FE4C809BBAC2CE4FD5D996C4 org.apache.maven.indexer:indexer-core:7.1.3
+7AB214FA5A675719E011F514939E52C010F049F6 org.apache.maven.indexer:search-api:7.1.3
+58A364CECD56F04A55D2F0C932DF879C7168C4C3 org.apache.maven.indexer:search-backend-smo:7.1.3
+2E487755A6814B2A1BC770C26569DCBA86873DCF org.apache.lucene:lucene-core:9.11.0
+DB385446BC3FD70E7C6A744276C0A157BD60EE0A org.apache.lucene:lucene-backward-codecs:9.11.0
+44ACCDC03C5482E602718F7BF91E5940BA4E4870 org.apache.lucene:lucene-highlighter:9.11.0
+E97FE1C0D102EDB8D6E1C01454992FD2B8D80AE0 org.apache.lucene:lucene-queryparser:9.11.0
+75A0A333CF1E043102743066C929E65FE51CBCDA org.apache.lucene:lucene-analysis-common:9.11.0
 934C04D3CFEF185A8008E7BF34331B79730A9D43 javax.annotation:javax.annotation-api:1.3.2
-B3ADD478D4382B78EA20B1671390A858002FEB6C com.google.code.gson:gson:2.10.1
+527175CA6D81050B53BDD4C457A6D6E017626B0E com.google.code.gson:gson:2.11.0
diff --git a/....indexer/external/gson-2.10.1-license.txt → ....indexer/external/gson-2.11.0-license.txt b/....indexer/external/gson-2.10.1-license.txt → ....indexer/external/gson-2.11.0-license.txt
@@ -1,7 +1,7 @@
 Name: GSon
 Description: JSon serialization/deserialization library
 Origin: GitHub
-Version: 2.10.1
+Version: 2.11.0
 License: Apache-2.0
 Source: https://github.com/google/gson
 

diff --git a/...r/external/indexer-core-7.1.2-license.txt → ...r/external/indexer-core-7.1.3-license.txt b/...r/external/indexer-core-7.1.2-license.txt → ...r/external/indexer-core-7.1.3-license.txt
@@ -1,11 +1,11 @@
 Name: Maven Indexer
 Description: Maven remote repository indexing engine.
-Version: 7.1.2
+Version: 7.1.3
 Origin: Apache Software Foundation
 License: Apache-2.0
 URL: https://repo.maven.apache.org/maven2/org/apache/maven/indexer/
 Source: https://github.com/apache/maven-indexer
-Files: indexer-core-7.1.2.jar search-api-7.1.2.jar search-backend-smo-7.1.2.jar
+Files: indexer-core-7.1.3.jar search-api-7.1.3.jar search-backend-smo-7.1.3.jar
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/...er/external/indexer-core-7.1.2-notice.txt → ...er/external/indexer-core-7.1.3-notice.txt b/...er/external/indexer-core-7.1.2-notice.txt → ...er/external/indexer-core-7.1.3-notice.txt
diff --git a/...ndexer/external/lucene-9.10.0-license.txt → ...ndexer/external/lucene-9.11.0-license.txt b/...ndexer/external/lucene-9.10.0-license.txt → ...ndexer/external/lucene-9.11.0-license.txt
@@ -1,11 +1,11 @@
 Name: Apache Lucene
 Description: Java-based indexing and search technology
-Version: 9.10.0
+Version: 9.11.0
 Origin: Apache Software Foundation
 License: Apache-2.0-lucene2
 URL: https://lucene.apache.org/
 Source: https://github.com/apache/lucene
-Files: lucene-analysis-common-9.10.0.jar lucene-backward-codecs-9.10.0.jar lucene-core-9.10.0.jar lucene-highlighter-9.10.0.jar lucene-queryparser-9.10.0.jar
+Files: lucene-analysis-common-9.11.0.jar lucene-backward-codecs-9.11.0.jar lucene-core-9.11.0.jar lucene-highlighter-9.11.0.jar lucene-queryparser-9.11.0.jar
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/...indexer/external/lucene-9.10.0-notice.txt → ...indexer/external/lucene-9.11.0-notice.txt b/...indexer/external/lucene-9.10.0-notice.txt → ...indexer/external/lucene-9.11.0-notice.txt
diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties
@@ -19,15 +19,15 @@ test.config.stableBTD.includes=**/*Test.class
 is.autoload=true
 javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
-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.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/indexer-core-7.1.3.jar=modules/ext/maven/indexer-core-7.1.3.jar
+release.external/search-api-7.1.3.jar=modules/ext/maven/search-api-7.1.3.jar
+release.external/search-backend-smo-7.1.3.jar=modules/ext/maven/search-backend-smo-7.1.3.jar
+release.external/gson-2.11.0.jar=modules/ext/maven/gson-2.11.0.jar
+release.external/lucene-core-9.11.0.jar=modules/ext/maven/lucene-core-9.11.0.jar
+release.external/lucene-backward-codecs-9.11.0.jar=modules/ext/maven/lucene-backward-codecs-9.11.0.jar
+release.external/lucene-highlighter-9.11.0.jar=modules/ext/maven/lucene-highlighter-9.11.0.jar
+release.external/lucene-queryparser-9.11.0.jar=modules/ext/maven/lucene-queryparser-9.11.0.jar
+release.external/lucene-analysis-common-9.11.0.jar=modules/ext/maven/lucene-analysis-common-9.11.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

diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml
@@ -176,44 +176,44 @@
                 <package>org.netbeans.modules.maven.indexer.spi.impl</package>
             </friend-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/indexer-core-7.1.2.jar</runtime-relative-path>
-                <binary-origin>external/indexer-core-7.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/maven/indexer-core-7.1.3.jar</runtime-relative-path>
+                <binary-origin>external/indexer-core-7.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/search-api-7.1.2.jar</runtime-relative-path>
-                <binary-origin>external/search-api-7.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/maven/search-api-7.1.3.jar</runtime-relative-path>
+                <binary-origin>external/search-api-7.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/search-backend-smo-7.1.2.jar</runtime-relative-path>
-                <binary-origin>external/search-backend-smo-7.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/maven/search-backend-smo-7.1.3.jar</runtime-relative-path>
+                <binary-origin>external/search-backend-smo-7.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/maven/lucene-core-9.11.0.jar</runtime-relative-path>
+                <binary-origin>external/lucene-core-9.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/maven/lucene-backward-codecs-9.11.0.jar</runtime-relative-path>
+                <binary-origin>external/lucene-backward-codecs-9.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/maven/lucene-highlighter-9.11.0.jar</runtime-relative-path>
+                <binary-origin>external/lucene-highlighter-9.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/maven/lucene-queryparser-9.11.0.jar</runtime-relative-path>
+                <binary-origin>external/lucene-queryparser-9.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/maven/lucene-analysis-common-9.11.0.jar</runtime-relative-path>
+                <binary-origin>external/lucene-analysis-common-9.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <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>
-                <binary-origin>external/gson-2.10.1.jar</binary-origin>
+                <runtime-relative-path>ext/maven/gson-2.11.0.jar</runtime-relative-path>
+                <binary-origin>external/gson-2.11.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/nbbuild/jms-config/base.flags b/nbbuild/jms-config/base.flags
@@ -1,3 +1,4 @@
+--enable-native-access=ALL-UNNAMED
 --add-opens=java.base/java.net=ALL-UNNAMED
 --add-opens=java.base/java.lang.ref=ALL-UNNAMED
 --add-opens=java.base/java.lang=ALL-UNNAMED