Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOLR-16684 Stop overriding org.apache.opennlp:opennlp-tools in solr #1424

Conversation

solrbot
Copy link
Collaborator

@solrbot solrbot commented Mar 2, 2023

This was initially an upgrade attempt by renovate, but we ended up instead removing opennlp-tools from versions.props in order to inherit version from Lucene. Original renovate PR text below...


This PR contains the following updates:

Package Type Update Change
org.apache.opennlp:opennlp-tools (source) dependencies major 1.9.4 -> 2.1.1

Configuration

📅 Schedule: Branch creation - "* * * * *" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot

Copy link
Contributor

@risdenk risdenk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test failures look related to this change:

- org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testSimpleExtract (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testSimpleExtract" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testArrayExtract (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testArrayExtract" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testExtractFieldRegexReplaceAll (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testExtractFieldRegexReplaceAll" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testMultiExtract (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testMultiExtract" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testEquivalentExtraction (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testEquivalentExtraction" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testExtractFieldRegexReplaceAllWithEntityType (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testExtractFieldRegexReplaceAllWithEntityType" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testSelectorExtract (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testSelectorExtract" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

  - org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testMultipleExtracts (:solr:modules:analysis-extras)
    Test output: /tmp/src/solr/solr/modules/analysis-extras/build/test-results/test/outputs/OUTPUT-org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.txt
    Reproduce with: gradlew :solr:modules:analysis-extras:test --tests "org.apache.solr.update.processor.TestOpenNLPExtractNamedEntitiesUpdateProcessorFactory.testMultipleExtracts" -Ptests.jvms=96 "-Ptests.jvmargs=-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:ActiveProcessorCount=1 -XX:ReservedCodeCacheSize=120m" -Ptests.seed=27965D3EF85A5857 -Ptests.file.encoding=ISO-8859-1

@janhoy
Copy link
Contributor

janhoy commented Mar 2, 2023

Our analysis-extras module depends on lucene-analysis-opennlp which depends on opennlp-tools 1.9.1. So Solr has to use the exact same version. I'll try to remove this line from versions.props and let it flow in from lucene instead.

…ne dependency

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
@janhoy janhoy changed the title Update dependency org.apache.opennlp:opennlp-tools to v2 Stop overriding org.apache.opennlp:opennlp-tools in solr Mar 2, 2023
@janhoy
Copy link
Contributor

janhoy commented Mar 2, 2023

Re-purposing this PR to remove version override of opennlp-tools in solr.

@solrbot
Copy link
Collaborator Author

solrbot commented Mar 2, 2023

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

Warning: custom changes will be lost.

@janhoy
Copy link
Contributor

janhoy commented Mar 2, 2023

Crave.io is not happy when applying its patches

error: versions.props: patch does not apply

I manually ran both the analysis-extras and langid tests, which pass, and versions.lock is identical as before, so think this is safe.

@janhoy janhoy changed the title Stop overriding org.apache.opennlp:opennlp-tools in solr SOLR-16684 Stop overriding org.apache.opennlp:opennlp-tools in solr Mar 2, 2023
@janhoy
Copy link
Contributor

janhoy commented Mar 2, 2023

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
janhoy added a commit that referenced this pull request Mar 2, 2023
…1424)

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
@janhoy
Copy link
Contributor

janhoy commented Mar 2, 2023

Merged by hand

@janhoy janhoy closed this Mar 2, 2023
janhoy added a commit that referenced this pull request Mar 2, 2023
…1424)

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
(cherry picked from commit 1d0c8a1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants