Update to Gradle 7.5 #208

reta · 2022-07-25T17:58:57Z

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.

codecov-commenter · 2022-07-25T19:08:11Z

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.

dblock · 2022-07-26T20:54:12Z

build.gradle

@@ -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")


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

https://github.com/opensearch-project/job-scheduler/pull/206/files

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)~~

See opensearch-project/opensearch-plugins#142, I think it's happening, cc: @prudhvigodithi

prudhvigodithi · 2022-08-31T16:38:14Z

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 · 2022-08-31T16:59:08Z

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?

saratvemulapalli · 2022-08-31T17:01:27Z

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

reta · 2022-08-31T18:14:13Z

@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 · 2022-08-31T18:31:27Z

build.gradle

@@ -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")


Brings snakeyml update: https://github.com/opensearch-project/OpenSearch/blob/2.x/buildSrc/version.properties#L14

reta · 2022-08-31T18:57:18Z

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

dblock · 2022-08-31T21:12:51Z

@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 · 2022-08-31T21:13:40Z

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

* 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 · 2022-08-31T22:04:21Z

@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 !

* 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]>

* 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]>

* 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]>

reta requested a review from a team July 25, 2022 17:58

reta force-pushed the issue-207 branch from e9ca573 to bd21e6f Compare July 25, 2022 18:16

dblock reviewed Jul 26, 2022

View reviewed changes

dblock previously approved these changes Jul 26, 2022

View reviewed changes

reta dismissed dblock’s stale review via 708aa0c August 15, 2022 13:41

reta force-pushed the issue-207 branch 2 times, most recently from 708aa0c to 9702bd9 Compare August 15, 2022 13:41

dblock previously approved these changes Aug 31, 2022

View reviewed changes

dblock requested review from saratvemulapalli and VachaShah August 31, 2022 16:19

dblock mentioned this pull request Aug 31, 2022

Increment to 3.0.0-snapshot #206

Closed

1 task

VachaShah previously approved these changes Aug 31, 2022

View reviewed changes

saratvemulapalli previously approved these changes Aug 31, 2022

View reviewed changes

Update to Gradle 7.5

dd17001

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

reta dismissed stale reviews from saratvemulapalli, VachaShah, and dblock via 4453c04 August 31, 2022 18:25

reta force-pushed the issue-207 branch 2 times, most recently from 4453c04 to 2bc54d9 Compare August 31, 2022 18:26

Fixing Gradle build warnings

002e412

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

reta force-pushed the issue-207 branch from 2bc54d9 to 002e412 Compare August 31, 2022 18:30

reta commented Aug 31, 2022

View reviewed changes

dblock approved these changes Aug 31, 2022

View reviewed changes

dblock requested a review from saratvemulapalli August 31, 2022 21:12

saratvemulapalli approved these changes Aug 31, 2022

View reviewed changes

saratvemulapalli merged commit df154b8 into opensearch-project:main Aug 31, 2022

saratvemulapalli added the backport 2.x label Aug 31, 2022

opensearch-trigger-bot bot mentioned this pull request Aug 31, 2022

[Backport 2.x] Update to Gradle 7.5 #228

Merged

reta mentioned this pull request Aug 31, 2022

Move main to OpenSearch 3.0.0-SNAPSHOT #229

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Gradle 7.5 #208

Update to Gradle 7.5 #208

reta commented Jul 25, 2022

codecov-commenter commented Jul 25, 2022

dblock Jul 26, 2022

dblock Jul 26, 2022

reta Jul 26, 2022 •

edited

Loading

dblock Jul 26, 2022

prudhvigodithi commented Aug 31, 2022 •

edited

Loading

reta commented Aug 31, 2022 •

edited

Loading

saratvemulapalli commented Aug 31, 2022

reta commented Aug 31, 2022

reta Aug 31, 2022

reta commented Aug 31, 2022

dblock commented Aug 31, 2022

dblock commented Aug 31, 2022

reta commented Aug 31, 2022

Update to Gradle 7.5 #208

Update to Gradle 7.5 #208

Conversation

reta commented Jul 25, 2022

Description

Issues Resolved

Check List

codecov-commenter commented Jul 25, 2022

Codecov Report

dblock Jul 26, 2022

Choose a reason for hiding this comment

dblock Jul 26, 2022

Choose a reason for hiding this comment

reta Jul 26, 2022 • edited Loading

Choose a reason for hiding this comment

dblock Jul 26, 2022

Choose a reason for hiding this comment

prudhvigodithi commented Aug 31, 2022 • edited Loading

reta commented Aug 31, 2022 • edited Loading

saratvemulapalli commented Aug 31, 2022

reta commented Aug 31, 2022

reta Aug 31, 2022

Choose a reason for hiding this comment

reta commented Aug 31, 2022

dblock commented Aug 31, 2022

dblock commented Aug 31, 2022

reta commented Aug 31, 2022

reta Jul 26, 2022 •

edited

Loading

prudhvigodithi commented Aug 31, 2022 •

edited

Loading

reta commented Aug 31, 2022 •

edited

Loading