Skip to content

[22970] Bump to asio 1.34.2 (backport #5896)#5902

Merged
MiguelCompany merged 2 commits into3.2.xfrom
mergify/bp/3.2.x/pr-5896
Jul 2, 2025
Merged

[22970] Bump to asio 1.34.2 (backport #5896)#5902
MiguelCompany merged 2 commits into3.2.xfrom
mergify/bp/3.2.x/pr-5896

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 25, 2025

Description

This PR bumps thirdparty asio module to 1.34.2 release and fixes deprecated API related to io_service, address_v4, address_v6 and tcp::resolver, avoiding build failures. Fixes:

@Mergifyio backport 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.
This is an automatic backport of pull request #5896 done by [Mergify](https://mergify.com).

@Carlosespicur @mergify
Bump to asio 1.34.2 (#5896)
d194c15 
* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit da0e9ed)

# Conflicts:
#	versions.md
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 25, 2025

Cherry-pick of da0e9ed has failed:

On branch mergify/bp/3.2.x/pr-5896
Your branch is up to date with 'origin/3.2.x'.

You are currently cherry-picking commit da0e9edb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CMakeLists.txt
	modified:   src/cpp/rtps/transport/TCPAcceptor.cpp
	modified:   src/cpp/rtps/transport/TCPAcceptor.h
	modified:   src/cpp/rtps/transport/TCPAcceptorBasic.cpp
	modified:   src/cpp/rtps/transport/TCPAcceptorBasic.h
	modified:   src/cpp/rtps/transport/TCPAcceptorSecure.cpp
	modified:   src/cpp/rtps/transport/TCPAcceptorSecure.h
	modified:   src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResourceBasic.h
	modified:   src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResourceSecure.h
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	modified:   src/cpp/rtps/transport/TCPv4Transport.cpp
	modified:   src/cpp/rtps/transport/TCPv6Transport.cpp
	modified:   src/cpp/rtps/transport/UDPChannelResource.h
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   src/cpp/rtps/transport/UDPv4Transport.cpp
	modified:   src/cpp/rtps/transport/UDPv6Transport.cpp
	modified:   src/cpp/rtps/transport/test_UDPv4Transport.cpp
	modified:   src/cpp/utils/IPLocator.cpp
	modified:   test/blackbox/common/UDPMessageSender.hpp
	modified:   test/unittest/transport/AsioHelpersTests.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp
	modified:   thirdparty/asio

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   versions.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 25, 2025
@mergify mergify bot mentioned this pull request Jun 25, 2025
Merged
11 tasks
@cferreiragonz cferreiragonz added this to the v3.2.3 milestone Jun 25, 2025
@MiguelCompany
Fix conflicts
99e9989 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jul 1, 2025
@MiguelCompany MiguelCompany self-requested a review July 1, 2025 15:50
@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 1, 2025
MiguelCompany
MiguelCompany approved these changes Jul 1, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany merged commit cd7ca97 into 3.2.x Jul 2, 2025
30 of 31 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.2.x/pr-5896 branch July 2, 2025 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees

No one assigned

Labels

ci-pending PR which CI is running

Projects

None yet

Milestone

v3.2.3 - Frozen ❄️

Development

Successfully merging this pull request may close these issues.

3 participants

@MiguelCompany @cferreiragonz @Carlosespicur