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

Update to Gradle 7.5 #208

Merged
merged 2 commits into from
Aug 31, 2022
Merged

Conversation

reta
Copy link
Contributor

@reta reta commented Jul 25, 2022

Signed-off-by: Andriy Redko [email protected]

Description

Update to Gradle 7.5

Issues Resolved

Closes #207

Check List

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

@reta reta requested a review from a team July 25, 2022 17:58
@codecov-commenter
Copy link

Codecov Report

Merging #208 (bd21e6f) into main (7a76d6f) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #208   +/-   ##
=========================================
  Coverage     53.19%   53.19%           
  Complexity       65       65           
=========================================
  Files             8        8           
  Lines           438      438           
  Branches         50       50           
=========================================
  Hits            233      233           
  Misses          186      186           
  Partials         19       19           

Help us with your feedback. Take ten seconds to tell us how you rate us.

build.gradle Outdated
@@ -7,7 +7,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
Copy link
Member

Choose a reason for hiding this comment

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

Main should be on 3.0, no? Either way I would make this change separately.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@reta reta Jul 26, 2022

Choose a reason for hiding this comment

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

Thanks @dblock , I think for most plugin main is kept in sync with next OpenSearch release (it seems like job-scheduler has not released 2.1.0.0)

Copy link
Member

Choose a reason for hiding this comment

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

dblock
dblock previously approved these changes Jul 26, 2022
@reta reta force-pushed the issue-207 branch 2 times, most recently from 708aa0c to 9702bd9 Compare August 15, 2022 13:41
dblock
dblock previously approved these changes Aug 31, 2022
@dblock dblock mentioned this pull request Aug 31, 2022
1 task
@prudhvigodithi
Copy link
Member

prudhvigodithi commented Aug 31, 2022

Hey @reta thanks for PR, I noticed there is change in few lines with gradle wrapper gradlew for 7.5.1, assuming this should be fine?
Thank you

@reta
Copy link
Contributor Author

reta commented Aug 31, 2022

Hey @reta thanks for PR, I noticed there is change in few lines with gradle wrapper gradlew for 7.5.1, assuming this should be fine?
Thank you

Thanks @prudhvigodithi to be fair, I have not seen issues with the wrapper scripts, we could update at some point, may be with Gradle 8?

VachaShah
VachaShah previously approved these changes Aug 31, 2022
@saratvemulapalli
Copy link
Member

@reta thanks for the change. Looks like tests are failing, could you take a look?

@reta
Copy link
Contributor Author

reta commented Aug 31, 2022

@reta thanks for the change. Looks like tests are failing, could you take a look?

@saratvemulapalli those are flaky ones :(


Suite: Test class org.opensearch.jobscheduler.spi.utils.LockServiceIT
  1> [2022-08-31T20:38:34,310][INFO ][o.o.j.s.u.LockServiceIT  ] [testRenewLock] before test
  2> أغس 31, 2022 8:38:41 م com.carrotsearch.randomizedtesting.RandomizedRunner$QueueUncaughtExceptionsHandler uncaughtException
  2> WARNING: Uncaught exception in thread: Thread[opensearch[external_0][transport_worker][T#1],5,TGRP-LockServiceIT]
  2> java.lang.AssertionError: Failed to release lock.
  2> 	at __randomizedtesting.SeedInfo.seed([54A0208AAE2953EB]:0)
  2> 	at org.junit.Assert.fail(Assert.java:89)
  2> 	at org.junit.Assert.assertTrue(Assert.java:42)
  2> 	at org.opensearch.jobscheduler.spi.utils.LockServiceIT.lambda$testRenewLock$69(LockServiceIT.java:494)
  2> 	at org.opensearch.action.ActionListener$1.onResponse(ActionListener.java:80)
  2> 	at org.opensearch.jobscheduler.spi.utils.LockService.lambda$release$10(LockService.java:286)
  2> 	at org.opensearch.action.ActionListener$1.onResponse(ActionListener.java:80)
  2> 	at org.opensearch.jobscheduler.spi.utils.LockService.lambda$updateLock$5(LockService.java:208)
  2> 	at org.opensearch.action.ActionListener$1.onFailure(ActionListener.java:88)
  2> 	at org.opensearch.action.support.TransportAction$1.onFailure(TransportAction.java:12

Tracked as #56

Signed-off-by: Andriy Redko <[email protected]>
@reta reta dismissed stale reviews from saratvemulapalli, VachaShah, and dblock via 4453c04 August 31, 2022 18:25
@reta reta force-pushed the issue-207 branch 2 times, most recently from 4453c04 to 2bc54d9 Compare August 31, 2022 18:26
Signed-off-by: Andriy Redko <[email protected]>
@@ -7,7 +7,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.3.0-SNAPSHOT")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@reta
Copy link
Contributor Author

reta commented Aug 31, 2022

The WhiteSource Security Check should be fixed with new 2.3.0-SNAPSHOTs (see please #208 (comment)).

@dblock
Copy link
Member

dblock commented Aug 31, 2022

@saratvemulapalli care to ack? Let’s backport this to 2.x and increment main to 3.0 next (I’ll do it if I don’t see someone else on it)

@dblock
Copy link
Member

dblock commented Aug 31, 2022

@reta if you want to bump it to 3.0 on main now that’s cool with me

@saratvemulapalli saratvemulapalli merged commit df154b8 into opensearch-project:main Aug 31, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 31, 2022
* Update to Gradle 7.5

Signed-off-by: Andriy Redko <[email protected]>

* Fixing Gradle build warnings

Signed-off-by: Andriy Redko <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit df154b8)
@reta
Copy link
Contributor Author

reta commented Aug 31, 2022

@reta if you want to bump it to 3.0 on main now that’s cool with me

I will do that shortly, thanks @dblock !

@reta reta mentioned this pull request Aug 31, 2022
5 tasks
dblock pushed a commit that referenced this pull request Sep 1, 2022
* Update to Gradle 7.5

Signed-off-by: Andriy Redko <[email protected]>

* Fixing Gradle build warnings

Signed-off-by: Andriy Redko <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit df154b8)
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
saratvemulapalli pushed a commit that referenced this pull request Sep 1, 2022
* Update to Gradle 7.5

Signed-off-by: Andriy Redko <[email protected]>

* Fixing Gradle build warnings

Signed-off-by: Andriy Redko <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit df154b8)
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
Co-authored-by: Andriy Redko <[email protected]>
wuychn pushed a commit to ochprince/job-scheduler that referenced this pull request Mar 16, 2023
* Update to Gradle 7.5

Signed-off-by: Andriy Redko <[email protected]>

* Fixing Gradle build warnings

Signed-off-by: Andriy Redko <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit df154b8)
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
Co-authored-by: Andriy Redko <[email protected]>
prudhvigodithi pushed a commit to prudhvigodithi/job-scheduler that referenced this pull request May 9, 2023
* Update to Gradle 7.5

Signed-off-by: Andriy Redko <[email protected]>

* Fixing Gradle build warnings

Signed-off-by: Andriy Redko <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit df154b8)
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
Co-authored-by: Andriy Redko <[email protected]>
Signed-off-by: Prudhvi Godithi <[email protected]>
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.

[FEATURE] Update to Gradle 7.5
6 participants