Revert "upgrade to OpenNLP 2.3.2 (#12674)" (minimum java requirement …

…not fulfilled) This reverts commit bb32700.
apache · Feb 11, 2024 · c0e767c · c0e767c
1 parent f4dbab4
commit c0e767c
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 130 deletions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
@@ -67,8 +67,6 @@ Improvements
   Tests are running with random byte order to ensure that the order does not affect correctness
   of code. Native order was enabled for LZ4 compression.  (Uwe Schindler)
 
-* GITHUB#11657, LUCENE-10621: Upgrade to OpenNLP 2.3.2. (Christine Poerschke, Eric Pugh)
-
 Optimizations
 ---------------------
 

diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md
@@ -17,12 +17,6 @@
 
 # Apache Lucene Migration Guide
 
-## Migration from Lucene 9.9 to Lucene 9.10
-
-### OpenNLP dependency upgrade
-
-[Apache OpenNLP](https://opennlp.apache.org) 2.x opens the door to accessing various models via the ONNX runtime.  To migrate you will need to update any deprecated OpenNLP methods that you may be using and be running on Java 17.
-
 ## Migration from Lucene 9.0 to Lucene 9.1
 
 ### Test framework package migration and module (LUCENE-10301)

diff --git a/.../opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java b/.../opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java
@@ -58,7 +58,7 @@ public class TestOpenNLPChunkerFilterFactory extends BaseTokenStreamTestCase {
     8, 15, 17, 21, 23, 29, 30, 39, 46, 48, 49, 51, 57, 58
   };
   private static final String[] SENTENCES_chunks = {
-    "B-NP", "I-NP", "I-NP", "I-NP", "I-NP", "I-NP", "O", "B-NP", "I-NP", "I-NP", "O", "B-NP",
+    "B-NP", "I-NP", "I-NP", "B-VP", "B-NP", "I-NP", "O", "B-NP", "I-NP", "I-NP", "O", "B-NP",
     "I-NP", "O"
   };
 

diff --git a/lucene/analysis/opennlp/src/tools/test-model-data/README.txt b/lucene/analysis/opennlp/src/tools/test-model-data/README.txt
@@ -3,4 +3,4 @@ Training data derived from Reuters corpus in very unscientific way.
 Tagging done with CCG Urbana-Champaign online demos:
 	http://cogcomp.cs.illinois.edu/page/demos
 
-When https://github.com/apache/lucene/issues/13002 is done, please run './gradlew ???' to generate models from training data here.
+Run 'ant train-test-models' to generate models from training data here.
diff --git a/lucene/licenses/opennlp-tools-1.9.4.jar.sha1 b/lucene/licenses/opennlp-tools-1.9.4.jar.sha1
@@ -0,0 +1 @@
+dd5c4a6d82453bcccb78ba4ac90f166366dde12b
diff --git a/lucene/licenses/opennlp-tools-2.3.2.jar.sha1 b/lucene/licenses/opennlp-tools-2.3.2.jar.sha1
diff --git a/lucene/licenses/opennlp-tools-NOTICE.txt b/lucene/licenses/opennlp-tools-NOTICE.txt
@@ -1,101 +1,11 @@
 Apache OpenNLP
-Copyright 2021-2023 The Apache Software Foundation
+Copyright 2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-============================================================================
-
 The snowball stemmers in
 opennlp-tools/src/main/java/opennlp/tools/stemmer/snowball
 were developed by Martin Porter and Richard Boulton.
 The full snowball package is available from
 http://snowball.tartarus.org/
-
-============================================================================
-
-Wordpiece tokenizer
-https://github.com/robrua/easy-bert
-
-The MIT License (MIT)
-
-Copyright (c) 2019 Rob Rua
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-============================================================================
-
-ONNX Runtime
-
-MIT License
-
-Copyright (c) Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-============================================================================
-
-SLF4J API
-https://github.com/qos-ch/slf4j
-
-MIT License
-
-Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-============================================================================
-
-jackson-databind
-https://github.com/FasterXML/jackson-databind
-The Apache Software License, Version 2.0
diff --git a/lucene/licenses/slf4j-api-1.7.36.jar.sha1 b/lucene/licenses/slf4j-api-1.7.36.jar.sha1
diff --git a/lucene/licenses/slf4j-api-LICENSE-MIT.txt b/lucene/licenses/slf4j-api-LICENSE-MIT.txt
diff --git a/versions.lock b/versions.lock
@@ -12,7 +12,7 @@ org.antlr:antlr4-runtime:4.11.1 (1 constraints: 39053f3b)
 org.apache.commons:commons-compress:1.19 (1 constraints: df04fa30)
 org.apache.httpcomponents:httpclient:4.5.13 (1 constraints: 3f054e3b)
 org.apache.httpcomponents:httpcore:4.4.13 (1 constraints: 591016a2)
-org.apache.opennlp:opennlp-tools:2.3.2 (1 constraints: 09050036)
+org.apache.opennlp:opennlp-tools:1.9.4 (1 constraints: 10050f36)
 org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
 org.carrot2:morfologik-polish:2.1.9 (1 constraints: 0e050136)
 org.carrot2:morfologik-stemming:2.1.9 (2 constraints: 1312040d)
@@ -22,7 +22,6 @@ org.ow2.asm:asm:7.2 (3 constraints: 2717d96b)
 org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)
 org.ow2.asm:asm-commons:7.2 (1 constraints: ad042e2c)
 org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
-org.slf4j:slf4j-api:1.7.36 (1 constraints: 6f0ed053)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: 10051b36)
 xerces:xercesImpl:2.12.0 (1 constraints: 3705353b)
 

diff --git a/versions.props b/versions.props
@@ -11,7 +11,7 @@ net.sourceforge.nekohtml:nekohtml=1.9.17
 org.antlr:antlr4*=4.11.1
 org.apache.commons:commons-compress=1.19
 org.apache.httpcomponents:httpclient=4.5.13
-org.apache.opennlp:opennlp-tools=2.3.2
+org.apache.opennlp:opennlp-tools=1.9.4
 org.assertj:*=3.21.0
 org.carrot2:morfologik-*=2.1.9
 org.eclipse.jetty:*=9.4.41.v20210516