Skip to content

[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
reta merged 6 commits intoopensearch-project:2.xfrom
cwperks:backport-16284-to-2.x
Oct 28, 2024

Conversation

@cwperks
Copy link
Copy Markdown
Member

@cwperks cwperks commented Oct 28, 2024

Backport of #16284 to 2.x

…`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)
@github-actions
Copy link
Copy Markdown
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?

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions
Copy link
Copy Markdown
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?

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

cwperks commented Oct 28, 2024

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

@github-actions
Copy link
Copy Markdown
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
Copy Markdown
Member Author

cwperks commented Oct 28, 2024

opened an issue for the failing test: #16513

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Copy Markdown
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?

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
Copy link
Copy Markdown
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?

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
Copy Markdown
Contributor

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
Copy Markdown
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
Copy link
Copy Markdown
Contributor

✅ Gradle check result for 59f434b: SUCCESS

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