eProsima · mergify · Jun 6, 2025
diff --git a/docs/notes/previous_versions/previous_versions.rst b/docs/notes/previous_versions/previous_versions.rst
@@ -16,6 +16,18 @@ Version 2.11 (EOL)
 .. include:: v2.11.1.rst
 .. include:: v2.11.0.rst
 
+Version 2.10 (EOL)
+------------------
+
+.. include:: v2.10.7.rst
+.. include:: v2.10.6.rst
+.. include:: v2.10.5.rst
+.. include:: v2.10.4.rst
+.. include:: v2.10.3.rst
+.. include:: v2.10.2.rst
+.. include:: v2.10.1.rst
+.. include:: v2.10.0.rst
+
 Version 2.9 (EOL)
 -----------------
 

diff --git a/docs/notes/previous_versions/supported_versions.rst b/docs/notes/previous_versions/supported_versions.rst
@@ -10,6 +10,7 @@ Version 2.14
 .. include:: v2.14.1.rst
 .. include:: v2.14.0.rst
 
+<<<<<<< HEAD
 Version 2.13
 ------------
 
@@ -30,6 +31,8 @@ Version 2.10
 .. include:: v2.10.1.rst
 .. include:: v2.10.0.rst
 
+=======
+>>>>>>> ed85538 (Add notes from 2.10.7 and move 2.10.x to EOL versions (#1082))
 Version 2.6 (maintenance)
 -------------------------
 

diff --git a/docs/notes/previous_versions/v2.10.0.rst b/docs/notes/previous_versions/v2.10.0.rst
@@ -1,5 +1,5 @@
-`Version 2.10.0 <https://fast-dds.docs.eprosima.com/en/v2.10.0/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 2.10.0 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.0/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This minor release includes several new features, improvements and bugfixes.
 

diff --git a/docs/notes/previous_versions/v2.10.1.rst b/docs/notes/previous_versions/v2.10.1.rst
@@ -1,5 +1,5 @@
-`Version 2.10.1 <https://fast-dds.docs.eprosima.com/en/v2.10.1/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 2.10.1 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.1/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This release includes the following **feature** in an ABI compatible way:
 

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

diff --git a/docs/notes/previous_versions/v2.10.3.rst b/docs/notes/previous_versions/v2.10.3.rst
@@ -1,5 +1,5 @@
-`Version 2.10.3 <https://fast-dds.docs.eprosima.com/en/v2.10.3/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 2.10.3 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.3/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This release includes the following **features** in an ABI compatible manner:
 

diff --git a/docs/notes/previous_versions/v2.10.4.rst b/docs/notes/previous_versions/v2.10.4.rst
@@ -1,5 +1,5 @@
-`Version 2.10.4 <https://fast-dds.docs.eprosima.com/en/v2.10.4/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 2.10.4 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.4/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This release includes the following **features** in an ABI compatible manner:
 

diff --git a/docs/notes/previous_versions/v2.10.5.rst b/docs/notes/previous_versions/v2.10.5.rst
@@ -1,5 +1,5 @@
-`Version 2.10.5 <https://fast-dds.docs.eprosima.com/en/v2.10.5/index.html>`_
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`Version 2.10.5 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.5/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This release includes the following **features** in an ABI compatible manner:
 

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

diff --git a/docs/notes/previous_versions/v2.10.7.rst b/docs/notes/previous_versions/v2.10.7.rst
@@ -0,0 +1,51 @@
+`Version 2.10.7 (EOL) <https://fast-dds.docs.eprosima.com/en/v2.10.7/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This release includes the following **fixes**:
+
+#. Fix `CVE-2025-24807 <https://www.cve.org/CVERecord?id=CVE-2025-24807>`_
+#. Release ``participant_stateless`` secure builtin writer history change when authentication has finished
+#. Improve ``OpenSSL`` lifecycle handling
+#. Fix comparison in ``is_update_allowed``
+#. Arithmetic overflow in fragment size calculations
+#. Fix ``-Werror=template-id-cdtor``
+#. Fix double-locking issue in ``DataSharingListener``
+#. Improve ``PDPClient`` initialization
+#. Fix unique network flows with TCP transports
+#. Decouple transport receivers creation using unique network flows
+#. Fix EDP reliability timings
+#. Fix ``several_writers_on_unack_sample_removed`` flaky test
+#. Reliable volatile change dropped when all history acked
+#. Create initial connection for TCP initial peers
+#. Filter interested readers on PDP writer
+#. Fix cleanup race condition with exclusive and shared lock files
+#. Fix TCP discovery server locators translation
+#. Use correct algorithm strings on ``PermissionsToken`` and ``IdentityToken``
+#. Fix potential deadlock between ``StatefulWriter`` and ``FlowController``
+#. Fix log category name macro collision in ``MacOS``
+#. Unacknowledged sample removed in KeepAll mode
+#. Fix assertion on ``OutputTrafficManager``
+
+This release includes the following **improvements**:
+
+#. Log any errors before ``cancel_init``
+#. Improve ``max_allocations`` calculation on SHM transport
+#. New property to select preferred key agreement algorithm
+#. Update reception timestamp when it is added to the instance
+#. Improve Blackbox TCP tests suite
+#. Handle socket buffer size setting when system's maximum exceeded
+#. Address some compilation warnings with GCC latest
+#. Refactor builtin writers & readers creation
+#. Update sqlite from 3.36.0 to 3.47.2
+#. Regenerate code with Fast DDS Gen v2.5.3
+
+Github CI management:
+
+#. Force Asio thirdparty in MacOS CI
+#. Get correct Fast CDR related branch in CI
+#. Update submodules when cloning Fast DDS on CI
+
+.. note::
+  If you are upgrading from a version older than 1.7.0, it is **required** to regenerate generated source from IDL
+  files using *fastddsgen*.
+  If you are upgrading from any older version, regenerating the code is *highly recommended*.
diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst
@@ -12,6 +12,51 @@ together with Fast DDS.
 This section provides information about the required dependencies for building Fast DDS, as well as about the versions
 of the eProsima software products related to Fast DDS.
 
+<<<<<<< HEAD
+=======
+.. _currently_supported_versions:
+
+Currently supported versions
+----------------------------
+The following table shows the currently supported versions of Fast DDS and their corresponding release and EOL dates.
+
+.. list-table::
+    :header-rows: 1
+
+    * - Version
+      - Version Branch
+      - Latest Release
+      - Release date
+      - End of Standard Support date
+      - EOL date
+    * - 3.2
+      - `3.2.x <https://github.com/eProsima/Fast-DDS/tree/3.2.x>`__ (LTS)
+      - `v3.2.2 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.2.2>`__
+      - March 2025
+      - March 2026 (*)
+      - March 2026 (*)
+    * - 3.1
+      - `3.1.x <https://github.com/eProsima/Fast-DDS/tree/3.1.x>`__
+      - `v3.2.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.1.2>`__
+      - October 2024
+      - April 2025
+      - April 2025
+    * - 2.14
+      - `2.14.x <https://github.com/eProsima/Fast-DDS/tree/2.14.x>`__
+      - `v2.14.4 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.4>`__
+      - March 2024
+      - March 2025 (*)
+      - March 2025 (*)
+    * - 2.6 (maintenance)
+      - `2.6.x <https://github.com/eProsima/Fast-DDS/tree/2.6.x>`__
+      - `v2.6.10 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.6.10>`__
+      - March 2022
+      - July 2024
+      - May 2025
+
+(*): Support may be extended.
+
+>>>>>>> ed85538 (Add notes from 2.10.7 and move 2.10.x to EOL versions (#1082))
 .. _dependencies_compatibilities_platform_support:
 
 Platform support
@@ -104,6 +149,7 @@ The following table shows the minimum version required of the Fast DDS build sys
               - **───**
               - Tier 3: QCC (over GCC 8.3)
 
+<<<<<<< HEAD
     .. group-tab:: 2.13.x
 
         .. list-table::
@@ -209,6 +255,10 @@ The following table shows the minimum version required of the Fast DDS build sys
               - Tier 3: QCC (over GCC 8.3)
 
     .. group-tab:: 2.6.x (maintenance)
+=======
+    .. tab-item:: 2.6.x (maintenance)
+        :sync: 2.6.x
+>>>>>>> ed85538 (Add notes from 2.10.7 and move 2.10.x to EOL versions (#1082))
 
         .. list-table::
 
@@ -276,6 +326,7 @@ 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>`__
 
+<<<<<<< HEAD
     .. group-tab:: 2.13.x
 
         .. list-table::
@@ -313,6 +364,10 @@ The following table shows the corresponding versions of the Fast DDS library dep
               - `v3.1.1 <https://github.com/openssl/openssl/releases/tag/openssl-3.1.1>`__
 
     .. group-tab:: 2.6.x (maintenance)
+=======
+    .. tab-item:: 2.6.x (maintenance)
+        :sync: 2.6.x
+>>>>>>> ed85538 (Add notes from 2.10.7 and move 2.10.x to EOL versions (#1082))
 
         .. list-table::
             :header-rows: 1
@@ -364,6 +419,7 @@ Fast DDS as the core middleware.
             * - `Discovery Server <https://github.com/eProsima/Discovery-Server/>`__
               - `v1.2.2 <https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.2>`__
 
+<<<<<<< HEAD
     .. group-tab:: 2.13.x
 
         .. list-table::
@@ -401,6 +457,10 @@ Fast DDS as the core middleware.
               - `v1.2.1 <https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.1>`__
 
     .. group-tab:: 2.6.x (maintenance)
+=======
+    .. tab-item:: 2.6.x (maintenance)
+        :sync: 2.6.x
+>>>>>>> ed85538 (Add notes from 2.10.7 and move 2.10.x to EOL versions (#1082))
 
         .. list-table::
             :header-rows: 1