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

Upgrade gradle to 8.4 #1289

Merged
merged 8 commits into from
Nov 6, 2023
Merged

Conversation

jmazanec15
Copy link
Member

Description

Upgrade gradle to 8.4 to support JDK-21. Refer to
https://docs.gradle.org/current/userguide/compatibility.html

Issues Resolved

N/A

Check List

  • 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.

Upgrade gradle to 8.4 to support JDK-21. Refer to
https://docs.gradle.org/current/userguide/compatibility.html

Signed-off-by: John Mazanec <jmazane@amazon.com>
@jmazanec15 jmazanec15 added the Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. label Nov 2, 2023
Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

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

LGTM! THanks

vamshin
vamshin previously approved these changes Nov 2, 2023
Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks

Signed-off-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: John Mazanec <jmazane@amazon.com>
Copy link

codecov bot commented Nov 2, 2023

Codecov Report

Merging #1289 (ffa9c72) into main (4d6cc16) will decrease coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1289      +/-   ##
============================================
- Coverage     85.07%   85.01%   -0.07%     
+ Complexity     1210     1207       -3     
============================================
  Files           160      160              
  Lines          4930     4930              
  Branches        449      449              
============================================
- Hits           4194     4191       -3     
- Misses          537      543       +6     
+ Partials        199      196       -3     

see 6 files with indirect coverage changes

heemin32
heemin32 previously approved these changes Nov 3, 2023
@jmazanec15 jmazanec15 requested a review from vamshin November 4, 2023 02:44
vamshin
vamshin previously approved these changes Nov 4, 2023
Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks

@navneet1v
Copy link
Collaborator

navneet1v commented Nov 4, 2023

@jmazanec15 can we check why windows JDK 11 is breaking, lets not merge the change if GH workflow is breaking.

@jmazanec15
Copy link
Member Author

@navneet1v Right, I thought windows was broken anyway - didnt realize we fixed it. Let me check what happened.

@jmazanec15 jmazanec15 dismissed stale reviews from vamshin and heemin32 via 3107c29 November 4, 2023 07:13
Simplifies Jacoco logic. From long ago, jacoco support was added through
a series of hacks. Some of these hacks are no longer necessary, so they
were removed to simplify.

Signed-off-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: John Mazanec <jmazane@amazon.com>
@jmazanec15
Copy link
Member Author

@navneet1v I fixed the windows issue by simplifying the jacoco logic. There were some outdated hacks in there that no longer apply because the OpenSearch TestTask and IntegTestTask extend the gradle Test class now.

@jmazanec15 jmazanec15 merged commit fa57b4b into opensearch-project:main Nov 6, 2023
40 of 44 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 6, 2023
Upgrade gradle to 8.4 to support JDK-21. Refer to
https://docs.gradle.org/current/userguide/compatibility.html

Simplifies Jacoco logic. From long ago, jacoco support was added through
a series of hacks. Some of these hacks are no longer necessary, so they
were removed to simplify.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit fa57b4b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants