Merge branch 'main' into hotfix/21890

eProsima · Oct 15, 2024 · 874e502 · 874e502
2 parents dbe900a + ef0d9aa
commit 874e502
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 39 deletions.
diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 VERSION_MAJOR 3
-VERSION_MINOR 0
+VERSION_MINOR 1
 VERSION_PATCH 0
diff --git a/ddsrouter_core/package.xml b/ddsrouter_core/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_core</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>
      *eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios.
   </description>

diff --git a/ddsrouter_test/package.xml b/ddsrouter_test/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_test</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>
      *eprosima DDS Router* tests.
   </description>

diff --git a/ddsrouter_yaml/package.xml b/ddsrouter_yaml/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_yaml</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>
      *eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios.
   </description>

diff --git a/docs/package.xml b/docs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_docs</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>
      *eprosima DDS Router* Documentation built with sphinx and deployed in ReadTheDocs.
   </description>

diff --git a/docs/rst/notes/notes.rst b/docs/rst/notes/notes.rst
@@ -5,32 +5,9 @@
 .. .. include:: forthcoming_version.rst
 
 ##############
-Version v3.0.0
+Version v3.1.0
 ##############
 
-This release includes the following **Features**:
-
-* Add support for Fast DDS v3.
-* Remove ``publish-type`` tag from :ref:`user_manual_configuration_specs_monitor` configuration.
-* Remove ``DiscoveryServerConnectionAdress``.
-
-This release includes the following **Bugfixes**:
-
-* Reset cache changes before returning them to the pool.
-
-This release includes the following **Configuration features**:
-
-* Change the default value of :ref:`user_manual_user_interface_log_filter_argument` to ``DDSROUTER``.
-* Change the default value of :ref:`user_manual_user_interface_log_verbosity_argument` to ``error``.
-
-This release includes the following **CI improvements**:
-
-* Upgrade to Ubuntu Noble (24.04).
-* Remove Ubuntu Focal (20.04) from the CI.
-* Limit permissions and include missing certificates in security tests.
-* Add stress tests.
-* Reduce the list of flaky Docker tests.
-
 This release includes the following **Dependencies Update**:
 
 .. list-table::
@@ -46,25 +23,26 @@ This release includes the following **Dependencies Update**:
         - `v1.3.1 <https://github.com/eProsima/foonathan_memory_vendor/releases/tag/v1.3.1>`_
     *   - Fast CDR
         - `eProsima/Fast-CDR <https://github.com/eProsima/Fast-CDR>`_
-        - `v2.2.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0>`_
         - `v2.2.4 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.4>`_
+        - `v2.2.5 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.5>`_
     *   - Fast DDS
         - `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_
-        - `v2.14.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.0>`_
         - `v3.0.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.0.1>`_
+        - `v3.1.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.1.0>`_
     *   - Dev Utils
         - `eProsima/dev-utils <https://github.com/eProsima/dev-utils>`_
-        - `v0.6.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.6.0>`_
         - `v1.0.0 <https://github.com/eProsima/dev-utils/releases/tag/v1.0.0>`_
+        - `v1.1.0 <https://github.com/eProsima/dev-utils/releases/tag/v1.1.0>`__
     *   - DDS Pipe
         - `eProsima/DDS-Pipe <https://github.com/eProsima/DDS-Pipe.git>`_
-        - `v0.4.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.4.0>`__
         - `v1.0.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v1.0.0>`__
+        - `v1.1.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v1.1.0>`__
 
 #################
 Previous Versions
 #################
 
+.. include:: previous_versions/v3.0.0.rst
 .. include:: previous_versions/v2.2.0.rst
 .. include:: previous_versions/v2.1.0.rst
 .. include:: previous_versions/v2.0.0.rst

diff --git a/docs/rst/notes/previous_versions/v2.0.0.rst b/docs/rst/notes/previous_versions/v2.0.0.rst
@@ -51,7 +51,7 @@ This release includes the following **Dependencies Update**:
     *   - Fast CDR
         - `eProsima/Fast-CDR <https://github.com/eProsima/Fast-CDR>`_
         - `v1.0.27 <https://github.com/eProsima/Fast-CDR/releases/tag/v1.0.27>`_
-        - `v1.1.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.0>`_
+        - `v1.1.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.0>`__
     *   - Fast DDS
         - `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_
         - `v2.10.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.10.1>`_

diff --git a/docs/rst/notes/previous_versions/v2.1.0.rst b/docs/rst/notes/previous_versions/v2.1.0.rst
@@ -34,7 +34,7 @@ This release includes the following **Dependencies Update**:
         - `v1.3.1 <https://github.com/eProsima/foonathan_memory_vendor/releases/tag/v1.3.1>`_
     *   - Fast CDR
         - `eProsima/Fast-CDR <https://github.com/eProsima/Fast-CDR>`_
-        - `v1.1.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.0>`_
+        - `v1.1.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.0>`__
         - `v2.1.2 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.1.2>`_
     *   - Fast DDS
         - `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_

diff --git a/docs/rst/notes/previous_versions/v3.0.0.rst b/docs/rst/notes/previous_versions/v3.0.0.rst
@@ -0,0 +1,56 @@
+
+Version v3.0.0
+==============
+
+This release includes the following **Features**:
+
+* Add support for Fast DDS v3.
+* Remove ``publish-type`` tag from :ref:`user_manual_configuration_specs_monitor` configuration.
+* Remove ``DiscoveryServerConnectionAdress``.
+
+This release includes the following **Bugfixes**:
+
+* Reset cache changes before returning them to the pool.
+
+This release includes the following **Configuration features**:
+
+* Change the default value of :ref:`user_manual_user_interface_log_filter_argument` to ``DDSROUTER``.
+* Change the default value of :ref:`user_manual_user_interface_log_verbosity_argument` to ``error``.
+
+This release includes the following **CI improvements**:
+
+* Upgrade to Ubuntu Noble (24.04).
+* Remove Ubuntu Focal (20.04) from the CI.
+* Limit permissions and include missing certificates in security tests.
+* Add stress tests.
+* Reduce the list of flaky Docker tests.
+
+This release includes the following **Dependencies Update**:
+
+.. list-table::
+    :header-rows: 1
+
+    *   -
+        - Repository
+        - Old Version
+        - New Version
+    *   - Foonathan Memory Vendor
+        - `eProsima/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>`_
+        - `v1.3.1 <https://github.com/eProsima/foonathan_memory_vendor/releases/tag/v1.3.1>`_
+    *   - Fast CDR
+        - `eProsima/Fast-CDR <https://github.com/eProsima/Fast-CDR>`_
+        - `v2.2.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0>`_
+        - `v2.2.4 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.4>`_
+    *   - Fast DDS
+        - `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_
+        - `v2.14.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.0>`_
+        - `v3.0.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.0.1>`_
+    *   - Dev Utils
+        - `eProsima/dev-utils <https://github.com/eProsima/dev-utils>`_
+        - `v0.6.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.6.0>`_
+        - `v1.0.0 <https://github.com/eProsima/dev-utils/releases/tag/v1.0.0>`_
+    *   - DDS Pipe
+        - `eProsima/DDS-Pipe <https://github.com/eProsima/DDS-Pipe.git>`_
+        - `v0.4.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.4.0>`__
+        - `v1.0.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v1.0.0>`__
diff --git a/docs/rst/user_manual/configuration.rst b/docs/rst/user_manual/configuration.rst
@@ -32,7 +32,7 @@ This value allows users to keep using the same YAML file with an old configurati
 
         *   - version 4.0
             - ``v4.0``
-            - *v3.0.0*
+            - *v3.1.0*
 
 
 **The current configuration version is v5.0**.

diff --git a/tools/ddsrouter_tool/package.xml b/tools/ddsrouter_tool/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_tool</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>
      *eprosima DDS Router* Application to execute a DDS Router from a YAML configuration file.
   </description>

diff --git a/tools/ddsrouter_yaml_validator/package.xml b/tools/ddsrouter_yaml_validator/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ddsrouter_yaml_validator</name>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <description>Tool used for validating DDS-Router configuration files</description>
   <maintainer email="[email protected]">Raúl Sánchez-Mateos</maintainer>
   <maintainer email="[email protected]">Javier París</maintainer>

diff --git a/tools/ddsrouter_yaml_validator/setup.py b/tools/ddsrouter_yaml_validator/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name=package_name,
-    version='3.0.0',
+    version='3.1.0',
     packages=[package_name],
     data_files=[
         ('share/ament_index/resource_index/packages',