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.

Sign up for GitHub

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

Jump to bottom

SOLR-13669: DIH: Add System property toggle for use of dataConfig param #1260

Merged
merged 2 commits into from
Feb 18, 2020
Merged

SOLR-13669: DIH: Add System property toggle for use of dataConfig param #1260

merged 2 commits into from
Feb 18, 2020

Conversation

HoustonPutman
Copy link
Contributor

@HoustonPutman HoustonPutman commented Feb 14, 2020 •
edited
Loading

(cherry picked from commit 325824c)

Addresses CVE-2019-0193 / SOLR-13669

Backport from Solr 8.1.2

Checklist

Please review the following and check all that apply:

  • I have reviewed the guidelines for How to Contribute and my code conforms to the standards described there to the best of my ability.
  • I have created a Jira issue and added the issue ID to my pull request title.
  • I have given Solr maintainers access to contribute to my PR branch. (optional but recommended)
  • I have developed this patch against the master branch.
  • I have run ant precommit and the appropriate test suite.
  • I have added tests for my changes.
  • I have added documentation for the Ref Guide (for Solr changes only).
@HoustonPutman
Copy link
Contributor Author

I can't ant precommit, do to an issue with a missing license in solr/contrib/clustering/lib/simple-xml-safe-2.7.1.jar.

99% sure the error isn't because of this commit.
@dweiss
Copy link
Contributor

dweiss commented Feb 14, 2020

You need to copy this license (and checksum) from master or 8x?
@HoustonPutman
Copy link
Contributor Author

The license file name wasn't updated when the library name was changed in the previous commit.
@HoustonPutman
Copy link
Contributor Author

Ok, so the added tests work, and precommit passes. This should be good to go.
@HoustonPutman
Copy link
Contributor Author

Full test suite looks fine as well. Will merge this unless there are any objections.
@HoustonPutman HoustonPutman merged commit 224c038 into apache:branch_7_7 Feb 18, 2020
@HoustonPutman HoustonPutman deleted the solr13669_solr7_7 branch February 18, 2020 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants
@HoustonPutman @dweiss @dsmiley