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/backport 1572 to 2.x #1580

Merged

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Jul 31, 2023

Description

Backports: #1572 to 2.x line since the upstream breaking changes were backported to the 2.x line. Also updates some dependencies to make the build pass.

Upstream changes: opensearch-project/OpenSearch#8540

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

derek-ho and others added 7 commits June 29, 2023 10:19
* remove job scheduler

Signed-off-by: Derek Ho <[email protected]>

* remove job scheduler files and build.gradle

Signed-off-by: Derek Ho <[email protected]>

* ktlint

Signed-off-by: Derek Ho <[email protected]>

* add back job scheduler to fix bwc

Signed-off-by: Derek Ho <[email protected]>

* remove job scheduler and add it back for older version

Signed-off-by: Derek Ho <[email protected]>

* remove job scheduler in prepare Bwc Tests

Signed-off-by: Derek Ho <[email protected]>

* bump bwc version

Signed-off-by: Derek Ho <[email protected]>

* add todo of removing job scheduler things after 2.9 release

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 4e0ca5a)
Signed-off-by: Derek Ho <[email protected]>
* resolve dependency issues

Signed-off-by: Eric <[email protected]>

* resolve jacocoagent missing issue

Signed-off-by: Eric <[email protected]>

* bump up build.gradle

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Eric <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
(cherry picked from commit 4345041)
Signed-off-by: Derek Ho <[email protected]>
…o backport/backport-1572-to-2.x

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
@derek-ho derek-ho force-pushed the backport/backport-1572-to-2.x branch from 1b5b810 to c610774 Compare August 1, 2023 14:02
@derek-ho derek-ho mentioned this pull request Aug 1, 2023
6 tasks
Copy link
Contributor

@pjfitzgibbons pjfitzgibbons left a comment

Choose a reason for hiding this comment

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

@derek-ho For complicated backports, please add a full link to the originating PR and copy the description.

@derek-ho
Copy link
Collaborator Author

derek-ho commented Aug 1, 2023

@derek-ho For complicated backports, please add a full link to the originating PR and copy the description.

@pjfitzgibbons done

@derek-ho derek-ho merged commit 8db71c9 into opensearch-project:2.x Aug 1, 2023
20 checks passed
@derek-ho derek-ho deleted the backport/backport-1572-to-2.x branch August 1, 2023 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants