Skip to content

[Backport 2.x] Increment version to 2.7.0-SNAPSHOT and update usage of XContentFactory.xContent#2451

Merged
stephen-crawford merged 7 commits into2.xfrom
backport/backport-2433-to-2.x
Feb 24, 2023
Merged

[Backport 2.x] Increment version to 2.7.0-SNAPSHOT and update usage of XContentFactory.xContent#2451
stephen-crawford merged 7 commits into2.xfrom
backport/backport-2433-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Contributor

@opensearch-trigger-bot opensearch-trigger-bot bot commented Feb 21, 2023

Backport bae002b from #2433

@cwperks @peternied @github-actions
Update usage of XContentFactory.xContent (#2433)
7be4d20 
* Switch from XContentType to MediaType

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
(cherry picked from commit bae002b)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team February 21, 2023 18:59
@cwperks
Copy link
Member

cwperks commented Feb 21, 2023

The CI will fail for this until Core merges the corresponding change in. I'm opening this PR to get ahead of this change in core. See comment from original core PR: opensearch-project/OpenSearch#6218

@kartg
Copy link
Member

kartg commented Feb 21, 2023 •
edited
Loading

@cwperks the dependent changes have been backported to 2.x in opensearch-project/OpenSearch#6414

RyanL1997
RyanL1997 previously approved these changes Feb 22, 2023
View reviewed changes
@codecov-commenter
Copy link

codecov-commenter commented Feb 22, 2023 •
edited
Loading

Codecov Report

Merging #2451 (be64409) into 2.x (ce207b8) will increase coverage by 0.04%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #2451      +/-   ##
============================================
+ Coverage     61.08%   61.13%   +0.04%     
- Complexity     3252     3256       +4     
============================================
  Files           258      258              
  Lines         18130    18130              
  Branches       3231     3231              
============================================
+ Hits          11075    11083       +8     
+ Misses         5485     5478       -7     
+ Partials       1570     1569       -1
Impacted Files Coverage Δ
.../org/opensearch/security/support/ConfigHelper.java 86.00% <100.00%> (ø)
...a/org/opensearch/security/tools/SecurityAdmin.java 36.00% <100.00%> (ø)
...ecurity/configuration/ConfigurationRepository.java 74.31% <0.00%> (+2.18%) ⬆️
...security/auditlog/sink/ExternalOpenSearchSink.java 61.72% <0.00%> (+2.46%) ⬆️
...ch/security/auditlog/routing/AsyncStoragePool.java 55.55% <0.00%> (+5.55%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@willyborankin willyborankin mentioned this pull request Feb 22, 2023
Merged
@cwperks
Copy link
Member

cwperks commented Feb 22, 2023

The backport in core was merged 6 hr ago: opensearch-project/OpenSearch#6433

I will re-run the CI for this as soon as a new SNAPSHOT includes the backport.

@cwperks
Copy link
Member

cwperks commented Feb 24, 2023

This PR depends on the version increment PR: #2473

@cwperks
Copy link
Member

cwperks commented Feb 24, 2023

I will push a change to this PR to also include the version increment

@cwperks
Increment version to 2.7.0.0
2f16bb5 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks dismissed stale reviews from stephen-crawford and RyanL1997 via 2f16bb5 February 24, 2023 15:40
@cwperks cwperks changed the title [Backport 2.x] Update usage of XContentFactory.xContent [Backport 2.x] Increment version to 2.7.0-SNAPSHOT and update usage of XContentFactory.xContent Feb 24, 2023
@cwperks cwperks mentioned this pull request Feb 24, 2023
Closed
DarshitChanpura
DarshitChanpura requested changes Feb 24, 2023
View reviewed changes
@cwperks
Update bwcVersion
d7b8c2e 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Update bwc_version in ci.yml
be64409 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
This was referenced Feb 24, 2023
Merged
Merged
@stephen-crawford stephen-crawford merged commit eb8c59d into 2.x Feb 24, 2023
@stephen-crawford stephen-crawford deleted the backport/backport-2433-to-2.x branch February 24, 2023 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cwperks cwperks cwperks left review comments

@DarshitChanpura DarshitChanpura DarshitChanpura approved these changes

@RyanL1997 RyanL1997 RyanL1997 left review comments

+2 more reviewers

@davidlago davidlago davidlago approved these changes

@stephen-crawford stephen-crawford stephen-crawford approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@cwperks @kartg @codecov-commenter @davidlago @DarshitChanpura @stephen-crawford @RyanL1997