Skip to content

Increment version to 2.12.0-SNAPSHOT and change imports to align with core lucene upgrade#1296

Merged
heemin32 merged 3 commits intoopensearch-project:2.xfrom
ryanbogan:backport_lucene
Nov 7, 2023
Merged

Increment version to 2.12.0-SNAPSHOT and change imports to align with core lucene upgrade#1296
heemin32 merged 3 commits intoopensearch-project:2.xfrom
ryanbogan:backport_lucene

Conversation

@ryanbogan
Copy link
Copy Markdown
Member

@ryanbogan ryanbogan commented Nov 6, 2023

Description

Combination of #1211 and backport of #1147

CI will not pass unless both are combined on the branch.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as 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.

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@ryanbogan ryanbogan changed the title [Backport 2.x] Change imports to align with core lucene upgrade Increment version to 2.12.0-SNAPSHOT and change imports to align with core lucene upgrade Nov 6, 2023
@martin-gaievski
Copy link
Copy Markdown
Member

Why we're combining backport and infra changes? Say comparing this PR with merging #1211 and converting this one to just a backport. I think separate PRs give better visibility on history of changes

@heemin32
Copy link
Copy Markdown
Collaborator

heemin32 commented Nov 6, 2023

Why we're combining backport and infra changes? Say comparing this PR with merging #1211 and converting this one to just a backport. I think separate PRs give better visibility on history of changes

I guess, build will fail with only either of the change. Therefore both changes are needed in single PR.

@ryanbogan
Copy link
Copy Markdown
Member Author

Why we're combining backport and infra changes? Say comparing this PR with merging #1211 and converting this one to just a backport. I think separate PRs give better visibility on history of changes

In order to do that, we would have to merge a PR with all tests failing. There will be compile errors if either one of the PR's is merged alone.

@martin-gaievski
Copy link
Copy Markdown
Member

that makes sense, let's merge this PR

@heemin32 heemin32 merged commit 785e477 into opensearch-project:2.x Nov 7, 2023
@ryanbogan ryanbogan deleted the backport_lucene branch November 7, 2023 17:05
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