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 after core #8157 (#486) #499

Merged

Conversation

Hailong-am
Copy link
Contributor

Backport 003071c from #486

* Fix after core #8157

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Fix ktlint issue

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Fix spotless java check

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 003071c)
Signed-off-by: Hailong Cui <ihailong@amazon.com>
@@ -9,7 +9,7 @@ buildscript {
opensearch_version = System.getProperty("opensearch.version", "2.10.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
kotlin_version = System.getProperty("kotlin.version", "1.6.10")
kotlin_version = System.getProperty("kotlin.version", "1.8.21")
Copy link
Contributor Author

@Hailong-am Hailong-am Jul 21, 2023

Choose a reason for hiding this comment

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

@bowenlan-amzn I am not sure we need upgrade this in 2.x branch, can you confirm?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, this should be fine

@Hailong-am Hailong-am mentioned this pull request Jul 21, 2023
5 tasks
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #499 (3f446f5) into 2.x (a009369) will increase coverage by 0.01%.
The diff coverage is 80.00%.

@@             Coverage Diff              @@
##                2.x     #499      +/-   ##
============================================
+ Coverage     72.82%   72.84%   +0.01%     
+ Complexity      837      835       -2     
============================================
  Files           129      129              
  Lines          5587     5586       -1     
  Branches        683      683              
============================================
  Hits           4069     4069              
+ Misses         1216     1215       -1     
  Partials        302      302              
Impacted Files Coverage Δ
...ain/java/org/opensearch/commons/authuser/User.java 87.82% <ø> (ø)
...commons/destination/message/LegacyBaseMessage.java 67.44% <ø> (ø)
...ommons/destination/message/LegacyChimeMessage.java 89.47% <ø> (ø)
...estination/message/LegacyCustomWebhookMessage.java 74.68% <ø> (ø)
...ommons/destination/message/LegacyEmailMessage.java 89.47% <ø> (ø)
.../commons/destination/message/LegacySNSMessage.java 0.00% <ø> (ø)
...ommons/destination/message/LegacySlackMessage.java 85.71% <ø> (ø)
...mmons/destination/response/LegacyBaseResponse.java 100.00% <ø> (ø)
...estination/response/LegacyDestinationResponse.java 100.00% <ø> (ø)
...search/commons/alerting/AlertingPluginInterface.kt 51.85% <ø> (ø)
... and 103 more

... and 1 file with indirect coverage changes

@Hailong-am
Copy link
Contributor Author

@bowenlan-amzn @AWSHurneyt would you mind do the review for this PR?

@bowenlan-amzn bowenlan-amzn merged commit 0062835 into opensearch-project:2.x Jul 22, 2023
7 of 8 checks passed
AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
* Fix after core #8157



* Fix ktlint issue



* Fix spotless java check



---------


(cherry picked from commit 003071c)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants