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.

Sign up for GitHub

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

Jump to bottom

[Backport 2.x] Switch from buildSrc/version.properties to Gradle version catalog (gradle/libs.versions.toml) to enable dependabot to perform automated upgrades on common libs (#16284) #16508

Merged
merged 6 commits into from
Oct 28, 2024
Merged

[Backport 2.x] Switch from buildSrc/version.properties to Gradle version catalog (gradle/libs.versions.toml) to enable dependabot to perform automated upgrades on common libs (#16284) #16508

merged 6 commits into from
Oct 28, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Oct 28, 2024

Backport of #16284 to 2.x

@cwperks
Switch from buildSrc/version.properties to Gradle version catalog (…
5b857c6 
…`gradle/libs.versions.toml`) to enable dependabot to perform automated upgrades on common libs (opensearch-project#16284)

* WIP on lib toml

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* SpotlessApply

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unnecessary lines

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Specify time when dependabot runs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Refer to version from libs.versions.toml

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use version

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Specify version catalog

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Call .get()

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Define version catalog

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use libraries

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Downgrade purposefully

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add mavenCentral

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Try w/o libraries section

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* reinstate

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove version.properties

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update syntax

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Change back to weekly

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add grpc

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Get relative to project root. Relative path not working on windows bc windows had gradle wrapper path

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add minimal version.properties with only opensearch version to accommodate external references

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* singularize version.properties

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Get rootDir

Signed-off-by: Craig Perkins <craig5008@gmail.com>

* Fix issue loading snapshot

Signed-off-by: Craig Perkins <craig5008@gmail.com>

* Limit logic to generating version.properties file within buildSrc

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused exports

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add import

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused code

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove mavenCentral from publication section

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update reactor-netty version

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Only keep versions section in toml

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Replaces versions catalog TOML parsing with Gradle's VersionCatalogsExtension

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Update bundled_jdk

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update bytebuddy and mockito

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
(cherry picked from commit af7a067)
@cwperks cwperks mentioned this pull request Oct 28, 2024
Merged
3 tasks
@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for 5b857c6: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@cwperks
Update os version in libs.versions.toml
6b29bab 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for 6b29bab: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@cwperks
tdigest 3.2
adc4728 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Oct 28, 2024

@dblock Can you check if #3634 was ever backported?

@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for adc4728: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@cwperks
Copy link
Member Author

cwperks commented Oct 28, 2024

opened an issue for the failing test: #16513

@reta
Merge branch '2.x' into backport-16284-to-2.x
de44ed8 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for de44ed8: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta
Update libs.versions.toml
704ea11 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the backport-16284-to-2.x branch from 45aced6 to 704ea11 Compare October 28, 2024 20:32
@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for 704ea11: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta
Update libs.versions.toml
59f434b 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the backport-16284-to-2.x branch from e7d7ba2 to 59f434b Compare October 28, 2024 21:39
@reta
Copy link
Collaborator

reta commented Oct 28, 2024

@cwperks should be all set now, the 2.x JDK version was not correct (should be 21)

@cwperks
Copy link
Member Author

cwperks commented Oct 28, 2024

@cwperks should be all set now, the 2.x JDK version was not correct (should be 21)

Thank you @reta. My bad for not just generating the toml file based on the version.properties in the 2.x line.

@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for 59f434b: SUCCESS

@reta reta merged commit 037c3ea into opensearch-project:2.x Oct 28, 2024
36 of 37 checks passed
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Oct 29, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrross andrross andrross approved these changes

@reta reta reta approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cwperks @reta @andrross