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

Incremented version to 2.1.1. #478

Merged
merged 4 commits into from
Aug 11, 2022

Conversation

gaiksaya
Copy link
Member

Coming from opensearch-project/opensearch-build#1818 post release activities.

@gaiksaya gaiksaya requested a review from a team July 13, 2022 23:43
@codecov-commenter
Copy link

codecov-commenter commented Jul 13, 2022

Codecov Report

Merging #478 (e72625d) into 2.1 (1d598f9) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                2.1     #478   +/-   ##
=========================================
  Coverage     71.01%   71.01%           
  Complexity      112      112           
=========================================
  Files           124      124           
  Lines          3923     3923           
  Branches        613      613           
=========================================
  Hits           2786     2786           
  Misses          961      961           
  Partials        176      176           
Flag Coverage Δ
dashboards-notifications 86.40% <ø> (ø)
opensearch-notifications 61.70% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@@ -64,7 +64,7 @@ dependencies {
} // ${kotlin_version} does not work for coroutines
implementation "${group}:common-utils:${common_utils_version}"
// TODO: change compile to implementation when the _local/stats API is supported
compileOnly "org.json:json:20180813"
compileOnly "org.json:json:2.1.1813"
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there are compile failures because it can't find that version of json. Would you be able to check to see if it was correctly defined?

Copy link
Member Author

Choose a reason for hiding this comment

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

This was auto updated. Should I revert this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, if it's not necessary you can revert it. Also please rebase your branch since this PR has been open for a while.

Copy link
Member Author

Choose a reason for hiding this comment

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

I did rebase but since this branch's base is 2.1 I think not much changes were backported. Also I replicated what you did in #493
Locally gradle build was successful. Let's see if this goes through. Not sure if the mockito version change should be in this version

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, I think it was one change that was added that shouldn't affect this PR but just wanted to be sure the test run is an accurate reflection of the current state.

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like it passed now. Can you review the changes? Thanks!

Signed-off-by: Sayali Rohidas Gaikawad <gaiksaya@amazon.com>
Signed-off-by: Sayali Rohidas Gaikawad <gaiksaya@amazon.com>
@gaiksaya gaiksaya force-pushed the increment-to-2.1.1 branch from e4a7b81 to 7227b6e Compare August 10, 2022 18:13
Signed-off-by: Sayali Rohidas Gaikawad <gaiksaya@amazon.com>
@qreshi
Copy link
Contributor

qreshi commented Aug 10, 2022

@gaiksaya Would you mind updating this in your PR as well to be 2.1. 2.x is tracking the latest development version now so we don't want to run against that for this branch.

You can ignore the OPENSEARCH_PLUGIN_VERSION variable since it's not being used. It started being used in later versions when Cypress test runs were added.

Signed-off-by: Sayali Rohidas Gaikawad <gaiksaya@amazon.com>
@gaiksaya gaiksaya requested a review from AWSHurneyt August 10, 2022 21:13
@AWSHurneyt
Copy link
Contributor

@qreshi Would it be worthwhile to backport this bump to main out of curiosity? I'm wondering whether to do something similar for the alerting plugins.

@qreshi
Copy link
Contributor

qreshi commented Aug 10, 2022

@AWSHurneyt No, I think patch level version bumps should happen in the branch for the version itself (2.1). A minor version bump like 2.2 would make sense to go through main to get to 2.x if main wasn't already on 3.0 by that point.

@AWSHurneyt
Copy link
Contributor

@AWSHurneyt No, I think patch level version bumps should happen in the branch for the version itself (2.1). A minor version bump like 2.2 would make sense to go through main to get to 2.x if main wasn't already on 3.0 by that point.

Sounds good, just wanted to get your thoughts.

@gaiksaya gaiksaya merged commit 2c0f707 into opensearch-project:2.1 Aug 11, 2022
@gaiksaya gaiksaya deleted the increment-to-2.1.1 branch August 11, 2022 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants