pick Update Lucene from 7.5.0 to 9.9.1 as requested in #1408 to address

https://osv.dev/vulnerability/OSV-2023-705
stanfordnlp · Nov 5, 2024 · 7388be1 · 7388be1
1 parent cfa4349
commit 7388be1
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 29 deletions.
diff --git a/.classpath b/.classpath
@@ -23,10 +23,10 @@
 	<classpathentry exported="true" kind="lib" path="lib/protobuf-java-3.25.5.jar" sourcepath="libsrc/protobuf-java-3.25.5-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/javacc.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.json-1.1.6.jar" sourcepath="libsrc/jakarta.json-1.1.6-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-core-7.7.3.jar" sourcepath="libsrc/lucene-core-7.7.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-demo-7.7.3.jar" sourcepath="libsrc/lucene-demo-7.7.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-7.7.3.jar" sourcepath="lucene-analyzers-common-7.7.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-7.7.3.jar" sourcepath="lucene-queryparser-7.7.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-core-9.9.1.jar" sourcepath="libsrc/lucene-core-9.9.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-demo-9.9.1.jar" sourcepath="libsrc/lucene-demo-9.9.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-analysis-common-9.9.1.jar" sourcepath="lucene-analysis-common-9.9.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-9.9.1.jar" sourcepath="lucene-queryparser-9.9.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar" sourcepath="libsrc/slf4j-api-1.7.12-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple.jar" sourcepath="libsrc/slf4j-simple-1.7.12-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/javax.activation-api-1.2.0.jar" sourcepath="libsrc/javax.activation-api-1.2.0-sources.jar"/>

diff --git a/doc/corenlp/pom-full.xml b/doc/corenlp/pom-full.xml
@@ -62,19 +62,19 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>7.7.3</version>
+      <artifactId>lucene-analysis-common</artifactId>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->

diff --git a/lib/README b/lib/README
@@ -378,13 +378,13 @@ LAST UPDATE: 2024-10-08
 LAST UPDATE BY: John Bauer. Originally added by Sonal Gupta
 
 -----------------------------------------------------------------------
-lucene-analyzers-common-7.7.3.jar
-lucene-core-7.7.3.jar
-lucene-demo-7.7.3.jar
-lucene-queryparser-7.7.3.jar
+lucene-analysis-common-9.9.1.jar
+lucene-core-9.9.1.jar
+lucene-demo-9.9.1.jar
+lucene-queryparser-7.5.0.jar
 ORIGINAL JAR NAME: n/a
-VERSION: 7.7.3
-RELEASE DATE: 2020-04-24
+VERSION: 9.9.1
+RELEASE DATE: 2023-12-16
 SOURCE AVAILABLE: yes
 DESCRIPTION: "Apache Lucene is a high-performance, full-featured text
 search engine library written entirely in Java. It is a technology
@@ -394,7 +394,7 @@ in has version number, as before. Broken into several Jars in this version."
 URL: http://lucene.apache.org/
 USED BY: patterns.surface
 
-LAST UPDATE: 2024-10-08
+LAST UPDATE: 2024-01-17
 LAST UPDATE BY: John Bauer
 
 -----------------------------------------------------------------

diff --git a/lib/lucene-analysis-common-9.9.1.jar b/lib/lucene-analysis-common-9.9.1.jar
diff --git a/lib/lucene-analyzers-common-7.7.3.jar b/lib/lucene-analyzers-common-7.7.3.jar
diff --git a/lib/lucene-core-7.7.3.jar b/lib/lucene-core-7.7.3.jar
diff --git a/lib/lucene-core-9.9.1.jar b/lib/lucene-core-9.9.1.jar
diff --git a/lib/lucene-demo-7.7.3.jar b/lib/lucene-demo-7.7.3.jar
diff --git a/lib/lucene-demo-9.9.1.jar b/lib/lucene-demo-9.9.1.jar
diff --git a/lib/lucene-queryparser-7.7.3.jar b/lib/lucene-queryparser-7.7.3.jar
diff --git a/lib/lucene-queryparser-9.9.1.jar b/lib/lucene-queryparser-9.9.1.jar
diff --git a/libsrc/lucene-analysis-common-9.9.1-sources.jar b/libsrc/lucene-analysis-common-9.9.1-sources.jar
diff --git a/libsrc/lucene-analyzers-common-7.7.3-sources.jar b/libsrc/lucene-analyzers-common-7.7.3-sources.jar
diff --git a/libsrc/lucene-core-7.7.3-sources.jar b/libsrc/lucene-core-7.7.3-sources.jar
diff --git a/libsrc/lucene-core-9.9.1-sources.jar b/libsrc/lucene-core-9.9.1-sources.jar
diff --git a/libsrc/lucene-demo-7.7.3-sources.jar b/libsrc/lucene-demo-7.7.3-sources.jar
diff --git a/libsrc/lucene-demo-9.9.1-sources.jar b/libsrc/lucene-demo-9.9.1-sources.jar
diff --git a/libsrc/lucene-queryparser-7.7.3-sources.jar b/libsrc/lucene-queryparser-7.7.3-sources.jar
diff --git a/libsrc/lucene-queryparser-9.9.1-sources.jar b/libsrc/lucene-queryparser-9.9.1-sources.jar
diff --git a/pom-java-11.xml b/pom-java-11.xml
@@ -60,19 +60,19 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>7.7.3</version>
+      <artifactId>lucene-analysis-common</artifactId>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->

diff --git a/pom-java-17.xml b/pom-java-17.xml
@@ -60,19 +60,19 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>7.7.3</version>
+      <artifactId>lucene-analysis-common</artifactId>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->

diff --git a/pom.xml b/pom.xml
@@ -62,19 +62,19 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>7.7.3</version>
+      <artifactId>lucene-analysis-common</artifactId>
+      <version>9.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>7.7.3</version>
+      <version>9.9.1</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->

diff --git a/src/edu/stanford/nlp/patterns/LuceneSentenceIndex.java b/src/edu/stanford/nlp/patterns/LuceneSentenceIndex.java
@@ -152,7 +152,7 @@ Set<String> queryIndexGetSentences(CollectionValuedMap<String, String> words) th
     //Map<String, List<CoreLabel>> sents = null;
     TopDocs tp = searcher.search(query, Integer.MAX_VALUE);
     Set<String> sentids = new HashSet<>();
-    if (tp.totalHits > 0) {
+    if (tp.totalHits.value > 0) {
       for (ScoreDoc s : tp.scoreDocs) {
         int docId = s.doc;
         Document d = searcher.doc(docId);

diff --git a/src/edu/stanford/nlp/patterns/surface/PatternsForEachTokenLucene.java b/src/edu/stanford/nlp/patterns/surface/PatternsForEachTokenLucene.java
@@ -249,7 +249,7 @@ public Map<Integer, Set<E>> getPatternsForAllTokens(String sentId) {
     try {
       TermQuery query = new TermQuery(new Term("sentid", sentId));
       TopDocs tp = searcher.search(query,1);
-      if (tp.totalHits > 0) {
+      if (tp.totalHits.value > 0) {
         for (ScoreDoc s : tp.scoreDocs) {
           int docId = s.doc;
           Document d = searcher.doc(docId);