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

Convert transport-reactor-netty4 to use gradle version catalog #17233

Merged
merged 17 commits into from
Feb 6, 2025
Merged

Convert transport-reactor-netty4 to use gradle version catalog #17233

merged 17 commits into from
Feb 6, 2025
+45 −20

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Feb 3, 2025

Description

This PR is a continuation of work to move more modules to use the gradle version catalog as a central store for versions of dependencies. The advantage of using a gradle version catalog over the previous buildSrc/version.properties is that dependabot is able to monitor the catalog and create automated dependency update PRs.

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

@cwperks
Move transport-nio and transport-reactor-netty4 to use gradle version…
657efe1 
… catalog

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks changed the title Move transport-nio and transport-reactor-netty4 to use gradle version catalog Convert transport-nio and transport-reactor-netty4 to use gradle version catalog Feb 3, 2025
@cwperks
Add to CHANGELOG
9964fb8 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 3, 2025

❕ Gradle check result for 9964fb8: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@codecov Codecov
Copy link

codecov bot commented Feb 3, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.38%. Comparing base (8325812) to head (62ba7f3).
Report is 7 commits behind head on main.

Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #17233      +/-   ##
============================================
+ Coverage     72.31%   72.38%   +0.06%     
+ Complexity    65549    65523      -26     
============================================
  Files          5295     5291       -4     
  Lines        304965   304432     -533     
  Branches      44291    44207      -84     
============================================
- Hits         220536   220359     -177     
+ Misses        66376    66063     -313     
+ Partials      18053    18010      -43

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cwperks
test dependabot
321a513 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Monitor root dir
ed30248 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Add separate repositories section for dependency resolution
4044c22 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
reta
reta reviewed Feb 5, 2025
View reviewed changes
build.gradle Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

✅ Gradle check result for 4044c22: SUCCESS

@cwperks cwperks changed the title Convert transport-nio and transport-reactor-netty4 to use gradle version catalog Convert transport-reactor-netty4 to use gradle version catalog Feb 5, 2025
@cwperks
Update CHANGELOG entry
be2a351 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Remove files from transport-nio
76cc55d 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
reta
reta reviewed Feb 5, 2025
View reviewed changes
gradle/libs.versions.toml Outdated Show resolved Hide resolved
reta
reta reviewed Feb 5, 2025
View reviewed changes
gradle/libs.versions.toml Outdated Show resolved Hide resolved
@cwperks
Hyphenate the dependency
373fa5e 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@reta reta added the backport 2.x Backport to 2.x branch label Feb 5, 2025
@reta
Copy link
Collaborator

reta commented Feb 5, 2025

Sorry @cwperks , why we target 3.0 only? Catalogs are backported back to 2.x, we should be good to backport, right?

@cwperks
Copy link
Member Author

cwperks commented Feb 5, 2025

Sorry @cwperks , why we target 3.0 only? Catalogs are backported back to 2.x, we should be good to backport, right?

yes, but isn't 2.19 the last 2.x release? I was getting into the habit of putting it into the 3.0 CHANGELOG now but I can move it.

@reta
Copy link
Collaborator

reta commented Feb 5, 2025

Sorry @cwperks , why we target 3.0 only? Catalogs are backported back to 2.x, we should be good to backport, right?

yes, but isn't 2.19 the last 2.x release? I was getting into the habit of putting it into the 3.0 CHANGELOG now but I can move it.

I think we would still be doing at least patch releases and bugfixes (the same we've been doing with 1.3), so the changes would have to be backported to 2.19, more diverging these branches become - more difficult it is going to be to maintain them.

@cwperks
Switch CHANGELOG
62ba7f3 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Feb 5, 2025

Got it, switched the CHANGELOG entry to put it in the 2.x CHANGELOG.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

❕ Gradle check result for 62ba7f3: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@cwperks cwperks merged commit 8089b61 into opensearch-project:main Feb 6, 2025
30 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 6, 2025
@github-actions
Convert transport-reactor-netty4 to use gradle version catalog (#17233)
acbe61b 
* Move transport-nio and transport-reactor-netty4 to use gradle version catalog

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

* Add to CHANGELOG

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

* test dependabot

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

* Monitor root dir

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

* Reference version catalog in settings.gradle

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

* Add mavenCentral

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

* Remove section from settings.gradle

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

* Test 2 repositories sections

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

* Add separate repositories section for dependency resolution

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

* Remove top-level repositories

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

* Revert changes in dependabot.yml

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

* Update CHANGELOG entry

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

* Remove files from transport-nio

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

* Hyphenate the dependency

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

* Switch CHANGELOG

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

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 8089b61)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Feb 6, 2025
Merged
reta pushed a commit that referenced this pull request Feb 6, 2025
@opensearch-trigger-bot @github-actions
Convert transport-reactor-netty4 to use gradle version catalog (#17233)…
bc04657 
… (#17276)

* Move transport-nio and transport-reactor-netty4 to use gradle version catalog



* Add to CHANGELOG



* test dependabot



* Monitor root dir



* Reference version catalog in settings.gradle



* Add mavenCentral



* Remove section from settings.gradle



* Test 2 repositories sections



* Add separate repositories section for dependency resolution



* Remove top-level repositories



* Revert changes in dependabot.yml



* Update CHANGELOG entry



* Remove files from transport-nio



* Hyphenate the dependency



* Switch CHANGELOG



---------


(cherry picked from commit 8089b61)

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Feb 6, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reta reta reta approved these changes

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

@andrross andrross Awaiting requested review from andrross andrross 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

@jed326 jed326 Awaiting requested review from jed326

@peternied peternied Awaiting requested review from peternied

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Milestone
No milestone
Development

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