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

[Backport to 2.10] upgrading commons-lang3 version to fix conflict issue #1014

Merged
merged 2 commits into from
Sep 5, 2023
Merged

[Backport to 2.10] upgrading commons-lang3 version to fix conflict issue #1014

merged 2 commits into from
Sep 5, 2023

Conversation

jackiehanyang
Copy link
Collaborator

Description

Backport #1012 to 2.x.

Previous revert change is included in this backport pr because it was manually triggered as a separate pr.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

jackiehanyang and others added 2 commits September 1, 2023 13:49
…#949)"

This reverts commit 4b21068.

Signed-off-by: Jackie Han <jkhanjob@gmail.com>
* force commons-lang3 version to fix conflict issue

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

* getting commons-lang3 version from upstream version properties file

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

* getting commons-lang3 version from core

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

* getting commons-lang3 version from core

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

* upgrading commons-lang3 version to align with core

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

---------

Signed-off-by: Jackie Han <jkhanjob@gmail.com>
(cherry picked from commit db456c2)
@jackiehanyang jackiehanyang merged commit bb66129 into opensearch-project:2.10 Sep 5, 2023
5 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants