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 2.x] Fix 2.x imports #1483

Merged

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Mar 28, 2023

Fix build failures on 2.x after xcontent changes backported to 2.x


(cherry picked from commit 18cd844)

Description

[Describe what this change achieves]

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.

… instead of jenkins (opensearch-project#1437)

* fix ci failures on main

Signed-off-by: Derek Ho <dxho@amazon.com>

* change back some references

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix up

Signed-off-by: Derek Ho <dxho@amazon.com>

* try incrementing bwc version to 2.7

Signed-off-by: Derek Ho <dxho@amazon.com>

* keep 2.6

Signed-off-by: Derek Ho <dxho@amazon.com>

* try using maven

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix zxip

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix version

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove job scheduler url reef

Signed-off-by: Derek Ho <dxho@amazon.com>

* add base version

Signed-off-by: Derek Ho <dxho@amazon.com>

* hard code

Signed-off-by: Derek Ho <dxho@amazon.com>

* try configuration zip

Signed-off-by: Derek Ho <dxho@amazon.com>

* try zip archive

Signed-off-by: Derek Ho <dxho@amazon.com>

* move dep

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix imports

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix last file

Signed-off-by: Derek Ho <dxho@amazon.com>

* add back job scheduler bwc

Signed-off-by: Derek Ho <dxho@amazon.com>

* add zip archive

Signed-off-by: Derek Ho <dxho@amazon.com>

* move ot 2.7.0 bwc

Signed-off-by: Derek Ho <dxho@amazon.com>

* hard code link

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 18cd844)
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho marked this pull request as ready for review March 28, 2023 19:34
@derek-ho derek-ho requested a review from a team as a code owner March 28, 2023 19:34
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho
Copy link
Collaborator Author

This is blocked by Job scheduler PR to go in:
opensearch-project/job-scheduler#350

@derek-ho derek-ho changed the title [BACKPORT] Fix main CI upstream opensearch imports and use maven repo… [BACKPORT 2.x] Fix 2.x imports Mar 29, 2023
@derek-ho derek-ho merged commit cde5a2c into opensearch-project:2.x Mar 29, 2023
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.

3 participants