eProsima · mergify · Feb 2, 2026
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -19,7 +19,11 @@
     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.
 -->
+<<<<<<< HEAD
 <!-- @Mergifyio backport 3.3.x 3.2.x 2.14.x -->
+=======
+<!-- @Mergifyio backport 3.4.x 3.2.x 2.14.x -->
+>>>>>>> 145ca57 (Updates after 3.3.1 EOL (#1195))
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->

diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
@@ -0,0 +1,63 @@
+name: Fast DDS Docs Ubuntu CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  nightly-ubuntu-ci-master:
+    uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@master
+    with:
+      # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
+      # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
+      os-version: 'ubuntu-24.04'
+      label: 'nightly-ubuntu-ci-master'
+      fastdds-docs-branch: 'master'
+      fastdds-branch: 'master'
+      fastdds-python-branch: 'main'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-3_4_x:
+    uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.4.x
+    with:
+      # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
+      # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
+      os-version: 'ubuntu-24.04'
+      label: 'nightly-ubuntu-ci-3.4.x'
+      fastdds-docs-branch: '3.4.x'
+      fastdds-branch: '3.4.x'
+      fastdds-python-branch: '2.4.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-3_2_x:
+    uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.2.x
+    with:
+      # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
+      # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
+      os-version: 'ubuntu-24.04'
+      label: 'nightly-ubuntu-ci-3.2.x'
+      fastdds-docs-branch: '3.2.x'
+      fastdds-branch: '3.2.x'
+      fastdds-python-branch: '2.2.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-2_14_x:
+    uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
+    with:
+      # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
+      # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
+      os-version: 'ubuntu-22.04'
+      label: '-nightly-ubuntu-ci-2.14.x'
+      fastdds-docs-branch: '2.14.x'
+      fastdds-branch: '2.14.x'
+      fastdds-python-branch: '1.4.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/docs/notes/previous_versions/previous_versions.rst b/docs/notes/previous_versions/previous_versions.rst
@@ -1,6 +1,12 @@
 Previous end-of-life versions
 =============================
 
+Version 3.3 (EOL)
+-----------------
+
+.. include:: v3.3.1.rst
+.. include:: v3.3.0.rst
+
 Version 3.1 (EOL)
 -----------------
 

diff --git a/docs/notes/previous_versions/supported_versions.rst b/docs/notes/previous_versions/supported_versions.rst
@@ -10,11 +10,6 @@ Version 3.4
 .. include:: v3.4.1.rst
 .. include:: v3.4.0.rst
 
-Version 3.3
------------
-
-.. include:: v3.3.0.rst
-
 Version 3.2
 -----------
 

diff --git a/docs/notes/previous_versions/v3.3.0.rst b/docs/notes/previous_versions/v3.3.0.rst
@@ -1,5 +1,5 @@
-`Version 3.3.0 <https://fast-dds.docs.eprosima.com/en/v3.3.0/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 3.3.0 (EOL) <https://fast-dds.docs.eprosima.com/en/v3.3.0/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This minor release includes the following **features**:
 

diff --git a/docs/notes/previous_versions/v3.3.1.rst b/docs/notes/previous_versions/v3.3.1.rst
@@ -0,0 +1,88 @@
+`Version 3.3.1 (EOL) <https://fast-dds.docs.eprosima.com/en/v3.3.1/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This patch release includes the following **critical fixes**:
+
+#. Fix `CVE-2025-62599 <https://www.cve.org/CVERecord?id=CVE-2025-62599>`_
+#. Fix `CVE-2025-62600 <https://www.cve.org/CVERecord?id=CVE-2025-62600>`_
+#. Fix `CVE-2025-62601 <https://www.cve.org/CVERecord?id=CVE-2025-62601>`_
+#. Fix `CVE-2025-62602 <https://www.cve.org/CVERecord?id=CVE-2025-62602>`_
+#. Fix `CVE-2025-62603 <https://www.cve.org/CVERecord?id=CVE-2025-62603>`_
+#. Fix `CVE-2025-64098 <https://www.cve.org/CVERecord?id=CVE-2025-64098>`_
+#. Fix `CVE-2025-62799 <https://www.cve.org/CVERecord?id=CVE-2025-62799>`_
+#. Fix `CVE-2025-64438 <https://www.cve.org/CVERecord?id=CVE-2025-64438>`_
+#. Fix `CVE-2025-65016 <https://www.cve.org/CVERecord?id=CVE-2025-65016>`_
+#. Fix `CVE-2026-22590 <https://www.cve.org/CVERecord?id=CVE-2026-22590>`_
+
+This patch release includes the following **improvements**:
+
+#. Update ``3.3.x`` to be a supported branch
+#. Avoid setting thread affinity of 0 in Mac
+#. Update Fast CDR version
+#. Improve signal handling in RPC example
+#. Change ``non_blocking_send`` threshold to ``sendBufferSize``
+#. Avoid sending duplicated ``ACKs`` in ``DataSharing``
+#. Use binary search in ``find_change_nts``
+#. Guard ``gnu::optimize`` with ``defined(__GNUC__)``
+#. Apply ``uncrustify``
+#. Do not export discovery server as ``cmake`` target
+#. Send ``heartbeat`` when ``wait_for_all_acked`` is called
+#. Update ``RELEASE_SUPPORT`` with release ``3.2.3``
+#. Protect ``DataReaderInstance`` alive_writers attribute
+#. Avoid casting ``GUID_t`` into ``InstanceHandle_t``
+#. Support aliases in Content Filtered Topic
+#. Allow empty partition list to match against ``*``
+#. Release change while authentication fails
+#. Improve latency tests
+#. Improvements in message receiver
+#. Improvements on ``compute_key`` generated code
+#. Protect ``PDPStatelessWriter`` attributes
+#. Verify Safe DDS signature
+#. Improve Open SSL includes
+#. Regenerate types with Fast DDS Gen ``v4.1.1``
+#. Allow to send empty payloads in dispose/unregister operations
+#. Reset irrelevant sequence numbers interval in proxy readers
+
+
+This patch release includes the following **fixes**:
+
+#. Fix socket buffer size handling
+#. Fix latency & throughput tests names
+#. Return sample notifying changes on instance state
+#. Fix doxygen documentation for ``iHandle2GUID``
+#. Set different content filter signatures for each requester
+#. Fix doxygen to avoid errors in python bindings
+#. Fix topic argument in Discovery Server example
+#. Add missing field to ``xsd``
+#. Fix duplicated transport when using specific XML with CLI
+#. Remote writers considered volatile by default
+#. Solve TCP disconnect while incomplete read deadlock
+#. Remove residual generated files
+#. Handle maximum deadline misses case
+#. Improve some tests
+#. Replace ``logWarning`` with ``EPROSIMA_LOG_WARNING`` in ``RTCPHeader.h``
+#. Avoid ``PROJECT_SOURCE_DIR`` and ``make_unique`` when building blackbox tests
+#. Fix ``GAP`` messages are not sent when there is no Reader requesting the ``DATA``
+#. Fix usage of invalid iterator in ``DynamicDataImpl::deserialize()``
+#. Fix build in ``GCC 15``
+
+
+This patch release includes the following **ci management updates**:
+
+#. Add ``--quiet`` to git submodule invocations
+#. Update fallback branches to use environment variables
+#. Split Mac CI build and testing phases
+#. Add missing IDL to code generator script
+#. Remove residual generated files
+#. Allow CI to run tests with manual dispatch
+#. Free disk space in CI runners
+#. Upgrade to ``macOS Sequoia``
+#. Single line for ``ctest_args`` in Mac CI
+#. Upgrade Linters CI runner image to ``ubuntu-24.04``
+
+
+.. important::
+
+    When upgrading to version 3.3.1 it is **highly recommended** to regenerate generated source from IDL files
+    using at least `Fast DDS-Gen v4.1.1 <https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.1.1>`_.
+    But it is advisable to regenerate them using the latest patch version of ``Fast DDS-Gen v4.1.x``.
diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst
@@ -27,6 +27,7 @@ The following table shows the currently supported versions of Fast DDS and their
       - Release date
       - End of Standard Support date
       - EOL date
+<<<<<<< HEAD
     * - 3.4
       - `3.4.x <https://github.com/eProsima/Fast-DDS/tree/3.4.x>`__
       - `v3.4.2 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.4.2>`__
@@ -39,6 +40,20 @@ The following table shows the currently supported versions of Fast DDS and their
       - July 2025
       - January 2026
       - January 2026
+=======
+    * - 3.5
+      - `3.5.x <https://github.com/eProsima/Fast-DDS/tree/3.5.x>`__
+      - Not yet released
+      - March 2026
+      - March 2027 (*)
+      - March 2027 (*)
+    * - 3.4
+      - `3.4.x <https://github.com/eProsima/Fast-DDS/tree/3.4.x>`__
+      - `v3.4.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.4.1>`__
+      - October 2025
+      - April 2026
+      - April 2026
+>>>>>>> 145ca57 (Updates after 3.3.1 EOL (#1195))
     * - 3.2
       - `3.2.x <https://github.com/eProsima/Fast-DDS/tree/3.2.x>`__ (LTS)
       - `v3.2.3 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.2.3>`__
@@ -153,62 +168,6 @@ The following table shows the minimum version required of the Fast DDS build sys
               - **───**
               - Tier 3: QCC (over GCC 8.3)
 
-    .. tab-item:: 3.3.x
-        :sync: 3.3.x
-
-        .. list-table::
-
-            * - **CMake**
-              - 3.20
-
-        .. list-table::
-            :header-rows: 1
-
-            * - OS \ Architecture
-              - amd64
-              - amd32
-              - arm64
-            * - Ubuntu Noble (24.04)
-              - Tier 3: GCC 13.2
-              - **───**
-              - Tier 3: GCC 13.2
-            * - Ubuntu Jammy (22.04)
-              - Tier 1: GCC 11.4 |br|
-                Tier 3: Clang 15
-              - **───**
-              - Tier 1: GCC 11.4 |br|
-                Tier 3: Clang 15
-            * - MacOS Sequoia (15)
-              - Tier 1: Clang 16
-              - **───**
-              - **───**
-            * - Windows 10
-              - Tier 1: MSVC v142 (Visual Studio 2019) |br|
-                Tier 3: MSVC v141 (Visual Studio 2017)
-              - Tier 3: MSVC v142 (Visual Studio 2019) |br|
-                Tier 3: MSVC v141 (Visual Studio 2017)
-              - **───**
-            * - Windows 11
-              - Tier 3: MSVC v143 (Visual Studio 2022)
-              - Tier 3: MSVC v143 (Visual Studio 2022)
-              - **───**
-            * - Debian Buster (10)
-              - Tier 3: GCC 8
-              - **───**
-              - Tier 3: GCC 8
-            * - Android 12
-              - Tier 3: SDK 31
-              - **───**
-              - Tier 3: SDK 31
-            * - Android 13
-              - Tier 3: SDK 33
-              - **───**
-              - Tier 3: SDK 33
-            * - QNX 7.1
-              - Tier 3: QCC (over GCC 8.3)
-              - **───**
-              - Tier 3: QCC (over GCC 8.3)
-
     .. tab-item:: 3.2.x
         :sync: 3.2.x
 
@@ -392,25 +351,6 @@ The following table shows the corresponding versions of the Fast DDS library dep
             * - `OpenSSL <https://github.com/openssl/openssl>`__
               - `v3.1.1 <https://github.com/openssl/openssl/releases/tag/openssl-3.1.1>`__
 
-    .. tab-item:: 3.3.x
-        :sync: 3.3.x
-
-        .. list-table::
-            :header-rows: 1
-
-            * - Product
-              - Related version
-            * - `Fast CDR <https://github.com/eProsima/Fast-CDR/>`__
-              - `v2.3.2 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.2>`__
-            * - `Foonathan Memory Vendor <https://github.com/eProsima/foonathan_memory_vendor/>`__
-              - `v1.3.1 <https://github.com/eProsima/foonathan_memory_vendor/releases/tag/v1.3.1>`__
-            * - `Asio <https://github.com/chriskohlhoff/asio>`__
-              - `v1.34.2 <https://github.com/chriskohlhoff/asio/tree/asio-1-34-2>`__
-            * - `TinyXML2 <https://github.com/leethomason/tinyxml2>`__
-              - `v6.0.0 <https://github.com/leethomason/tinyxml2/tree/6.0.0>`__
-            * - `OpenSSL <https://github.com/openssl/openssl>`__
-              - `v3.1.1 <https://github.com/openssl/openssl/releases/tag/openssl-3.1.1>`__
-
     .. tab-item:: 3.2.x
         :sync: 3.2.x
 
@@ -503,25 +443,6 @@ Fast DDS as the core middleware.
             * - `Discovery Server <https://github.com/eProsima/Discovery-Server/>`__
               - `v2.2.0 <https://github.com/eProsima/Discovery-Server/releases/tag/v2.2.0>`__
 
-    .. tab-item:: 3.3.x
-        :sync: 3.3.x
-
-        .. list-table::
-            :header-rows: 1
-
-            * - Product
-              - Related version
-            * - `Fast DDS Gen <https://github.com/eProsima/Fast-DDS-Gen/>`__
-              - `v4.1.0 <https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.1.0>`__
-            * - `Fast DDS Gen - IDL parser <https://github.com/eProsima/IDL-Parser/>`__
-              - `v4.1.0 <https://github.com/eProsima/IDL-Parser/releases/tag/v4.1.0>`__
-            * - `Fast DDS python <https://github.com/eProsima/Fast-DDS-python/>`__
-              - `v2.3.0 <https://github.com/eProsima/Fast-DDS-python/releases/tag/v2.3.0>`__
-            * - `Shapes Demo <https://github.com/eProsima/ShapesDemo/>`__
-              - `v3.3.0 <https://github.com/eProsima/ShapesDemo/releases/tag/v3.3.0>`__
-            * - `Discovery Server <https://github.com/eProsima/Discovery-Server/>`__
-              - `v2.1.0 <https://github.com/eProsima/Discovery-Server/releases/tag/v2.1.0>`__
-
     .. tab-item:: 3.2.x
         :sync: 3.2.x