From 8e6899baf6fa47c281d313330ec2a9c8717d231e Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 1 Oct 2024 16:19:14 +0200 Subject: [PATCH 1/4] Refs #21784. Bump version to 3.1.0 Signed-off-by: Miguel Company --- CMakeLists.txt | 2 +- package.xml | 2 +- src/cpp/rtps/messages/MessageReceiver.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c930e31b84f..2022f246096 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ endif() ############################################################################### # Project # ############################################################################### -project(fastdds VERSION "3.0.1" LANGUAGES C CXX) +project(fastdds VERSION "3.1.0" LANGUAGES C CXX) set(PROJECT_NAME_LARGE "Fast DDS") string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER) diff --git a/package.xml b/package.xml index 34d2777e4a3..c80c33dc857 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ fastdds - 3.0.1 + 3.1.0 *eprosima Fast DDS* is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. RTPS is also the wire interoperability protocol defined for the Data Distribution Service (DDS) standard. *eProsima Fast DDS* expose an API to access directly the RTPS protocol, giving the user full access to the protocol internals. diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp index 110e4ccb07b..3c221e512c6 100644 --- a/src/cpp/rtps/messages/MessageReceiver.cpp +++ b/src/cpp/rtps/messages/MessageReceiver.cpp @@ -867,7 +867,7 @@ bool MessageReceiver::proc_Submsg_Data( uint32_t next_pos = msg->pos + payload_size; if (msg->length >= next_pos && payload_size > 0) { - FASTDDS_TODO_BEFORE(3, 1, "Pass keyFlag in serializedPayload, and always pass input data upwards"); + FASTDDS_TODO_BEFORE(3, 2, "Pass keyFlag in serializedPayload, and always pass input data upwards"); if (dataFlag) { ch.serializedPayload.data = &msg->buffer[msg->pos]; From edd32069c6124691d46f479b277ff8b3b292e568 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 1 Oct 2024 16:20:50 +0200 Subject: [PATCH 2/4] Refs #21784. Update mirror workflow. Signed-off-by: Miguel Company --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 02a4c59cac0..56be2e17b1f 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '3.0.x' + - '3.1.x' - '3.x' steps: - name: Mirror action step From a09f6c14fe8530d0e4b34bbd2eeeadf5994ea9d6 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 1 Oct 2024 16:28:55 +0200 Subject: [PATCH 3/4] Refs #21784. Update PR template. Signed-off-by: Miguel Company --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index bbdb5bf1c82..bf0c492d5f5 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -21,7 +21,7 @@ In case of bug fixes, please provide the list of supported branches where this fix should be also merged. Please uncomment following line, adjusting the corresponding target branches for the backport. --> - +