diff --git a/.github/docker/ddsrouter/Dockerfile b/.github/docker/ddsrouter/Dockerfile index fc5236f2d..35bad6d6f 100644 --- a/.github/docker/ddsrouter/Dockerfile +++ b/.github/docker/ddsrouter/Dockerfile @@ -59,7 +59,7 @@ RUN mkdir src && \ vcs import src < ddsrouter.repos && \ cd src/fastcdr && git checkout ${fastcdr_branch} && cd ../.. && \ cd src/fastdds && git checkout ${fastdds_branch} && cd ../.. && \ - cd src/dev-utils && git checkout ${devutils_branch} && cd ../.. && \ + cd src/dev_utils && git checkout ${devutils_branch} && cd ../.. && \ cd src/ddspipe && git checkout ${ddspipe_branch} && cd ../.. && \ cd src/ddsrouter && git checkout ${ddsrouter_branch} && cd ../.. && \ cp -r src/fastdds/examples/cpp/dds/BasicConfigurationExample src/. && \ diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index 6444314ca..fd93c4637 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -1,7 +1,7 @@ # Reusable workflow to run the following jobs: # # - multiplatform-tests -# - [ ubuntu-22.04 | ubuntu-24.04 | windows-2019 | windows-2022 ] +# - [ ubuntu-22.04 | ubuntu-24.04 | windows-2022 ] # - [ Debug | Release ] # - execute tests in different versions of ubuntu with different build types # @@ -79,7 +79,6 @@ jobs: os: - ubuntu-22.04 - ubuntu-24.04 - - windows-2019 - windows-2022 steps: diff --git a/README.md b/README.md index 54914b595..6c021e222 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # eProsima DDS Router - +> [!WARNING] +> **The `2.x` branch has reached its End-of-Life (EOL).** +> This version of *eProsima DDS Router* is no longer maintained and will receive no further releases, bugfixes or security updates. +> Please migrate to the [latest release](https://github.com/eProsima/DDS-Router/releases/latest), which is still compatible with applications running with *eProsima Fast DDS* v2. [![License](https://img.shields.io/github/license/eProsima/DDS-Router.svg)](https://opensource.org/licenses/Apache-2.0) [![Releases](https://img.shields.io/github/v/release/eProsima/DDS-Router?sort=semver)](https://github.com/eProsima/DDS-Router/releases) @@ -11,6 +14,8 @@ [![codecov](https://codecov.io/gh/eProsima/DDS-Router/branch/main/graph/badge.svg?token=6NA5PVA9QL)](https://codecov.io/gh/eProsima/DDS-Router) [![Documentation Status](https://readthedocs.org/projects/eprosima-dds-router/badge/?version=latest)](https://eprosima-dds-router.readthedocs.io/en/latest/) +eProsima + *eProsima DDS Router* is an end-user software application that enables the connection of distributed DDS networks. That is, DDS entities such as publishers and subscribers deployed in one geographic location and using a dedicated local network will be able to communicate with other DDS entities deployed in different geographic areas on their own diff --git a/VERSION b/VERSION index 01b468826..4bd6d94fe 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR 2 -VERSION_MINOR 2 +VERSION_MINOR 3 VERSION_PATCH 0 diff --git a/ddsrouter.repos b/ddsrouter.repos index 817496029..0d6bca714 100644 --- a/ddsrouter.repos +++ b/ddsrouter.repos @@ -6,12 +6,12 @@ repositories: fastcdr: type: git url: https://github.com/eProsima/Fast-CDR.git - version: 2.x + version: 2.2.x fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git - version: 2.x - dev-utils: + version: 2.14.x + dev_utils: type: git url: https://github.com/eProsima/dev-utils.git version: 0.x diff --git a/ddsrouter_core/package.xml b/ddsrouter_core/package.xml index 4f9b9c6e8..3245d4682 100644 --- a/ddsrouter_core/package.xml +++ b/ddsrouter_core/package.xml @@ -2,7 +2,7 @@ ddsrouter_core - 2.2.0 + 2.3.0 *eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios. diff --git a/ddsrouter_test/package.xml b/ddsrouter_test/package.xml index 5b7f921c3..40e22b2b3 100644 --- a/ddsrouter_test/package.xml +++ b/ddsrouter_test/package.xml @@ -2,7 +2,7 @@ ddsrouter_test - 2.2.0 + 2.3.0 *eprosima DDS Router* tests. diff --git a/ddsrouter_yaml/package.xml b/ddsrouter_yaml/package.xml index f6f71e7f4..bd236eb3c 100644 --- a/ddsrouter_yaml/package.xml +++ b/ddsrouter_yaml/package.xml @@ -2,7 +2,7 @@ ddsrouter_yaml - 2.2.0 + 2.3.0 *eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios. diff --git a/docs/package.xml b/docs/package.xml index b6e212a9e..45929415d 100644 --- a/docs/package.xml +++ b/docs/package.xml @@ -2,7 +2,7 @@ ddsrouter_docs - 2.2.0 + 2.3.0 *eprosima DDS Router* Documentation built with sphinx and deployed in ReadTheDocs. diff --git a/docs/rst/developer_manual/installation/sources/linux.rst b/docs/rst/developer_manual/installation/sources/linux.rst index 23c6833fb..245b1c816 100644 --- a/docs/rst/developer_manual/installation/sources/linux.rst +++ b/docs/rst/developer_manual/installation/sources/linux.rst @@ -307,14 +307,14 @@ Local installation cd ~/DDS-Router mkdir build/cmake_utils cd build/cmake_utils - cmake ~/DDS-Router/src/dev-utils/cmake_utils -DCMAKE_INSTALL_PREFIX=~/DDS-Router/install -DCMAKE_PREFIX_PATH=~/DDS-Router/install + cmake ~/DDS-Router/src/dev_utils/cmake_utils -DCMAKE_INSTALL_PREFIX=~/DDS-Router/install -DCMAKE_PREFIX_PATH=~/DDS-Router/install cmake --build . --target install # C++ Utils cd ~/DDS-Router mkdir build/cpp_utils cd build/cpp_utils - cmake ~/DDS-Router/src/dev-utils/cpp_utils -DCMAKE_INSTALL_PREFIX=~/DDS-Router/install -DCMAKE_PREFIX_PATH=~/DDS-Router/install + cmake ~/DDS-Router/src/dev_utils/cpp_utils -DCMAKE_INSTALL_PREFIX=~/DDS-Router/install -DCMAKE_PREFIX_PATH=~/DDS-Router/install cmake --build . --target install * `DDS Pipe `_ diff --git a/docs/rst/developer_manual/installation/sources/windows.rst b/docs/rst/developer_manual/installation/sources/windows.rst index df7563918..adf914b2a 100644 --- a/docs/rst/developer_manual/installation/sources/windows.rst +++ b/docs/rst/developer_manual/installation/sources/windows.rst @@ -351,7 +351,7 @@ Local installation cd \DDS-Router mkdir build\cmake_utils cd build\cmake_utils - cmake \DDS-Router\src\dev-utils\cmake_utils -DCMAKE_INSTALL_PREFIX=\DDS-Router\install ^ + cmake \DDS-Router\src\dev_utils\cmake_utils -DCMAKE_INSTALL_PREFIX=\DDS-Router\install ^ -DCMAKE_PREFIX_PATH=\DDS-Router\install cmake --build . --config Release --target install @@ -359,7 +359,7 @@ Local installation cd \DDS-Router mkdir build\cpp_utils cd build\cpp_utils - cmake \DDS-Router\src\dev-utils\cpp_utils -DCMAKE_INSTALL_PREFIX=\DDS-Router\install ^ + cmake \DDS-Router\src\dev_utils\cpp_utils -DCMAKE_INSTALL_PREFIX=\DDS-Router\install ^ -DCMAKE_PREFIX_PATH=\DDS-Router\install cmake --build . --config Release --target install diff --git a/docs/rst/notes/forthcoming_version.rst b/docs/rst/notes/forthcoming_version.rst index f66b3c5ff..676dcc54c 100644 --- a/docs/rst/notes/forthcoming_version.rst +++ b/docs/rst/notes/forthcoming_version.rst @@ -1,16 +1,7 @@ .. add orphan tag when new info added to this file -.. :orphan: +:orphan: ################### Forthcoming Version ################### - -This release includes the following **CI improvements**: - -* Upgrade to Ubuntu Noble (24.04). -* Remove Ubuntu Focal (20.04) from the CI. - -This release includes the following **Bugfixes**: - -* Reset cache changes before returning them to the pool. diff --git a/docs/rst/notes/notes.rst b/docs/rst/notes/notes.rst index 4f5fffa86..35ddb5533 100644 --- a/docs/rst/notes/notes.rst +++ b/docs/rst/notes/notes.rst @@ -2,20 +2,40 @@ .. _release_notes: -.. include:: forthcoming_version.rst +.. .. include:: forthcoming_version.rst ############## -Version v2.2.0 +Version v2.3.0 ############## -This release includes the following **Features**: +.. warning:: -* Publish the :ref:`Logs ` in a DDS topic. -* New :ref:`Monitor ` module. + This is the last release of the ``2.x`` series. + This branch has reached its End-of-Life (EOL) and will receive no further releases, bugfixes or security updates. + Users are encouraged to migrate to the latest stable version of |eddsrouter|. This release includes the following **Configuration features**: -* New ``logging`` configuration option to configure the DDS Router :ref:`internal logs `. +* Change the default ``logging`` filter and set the default verbosity to ``error``. + +This release includes the following **Bugfixes**: + +* Reset cache changes before returning them to the pool. +* Update the security certificates used in the tests. +* Fix the ``duplicate explicit target name`` warning in the documentation. + +This release includes the following **Testing improvements**: + +* New tests to stress the repeater mode. +* New tests to stress reliability. +* Limit the permissions and include the missing certificates in the security tests. + +This release includes the following **CI improvements**: + +* Upgrade to Ubuntu Noble (24.04). +* Remove Ubuntu Focal (20.04) from the CI. +* Support multiple versions of Fast DDS in the CI. +* Empty the XTSAN tests list. This release includes the following **Dependencies Update**: @@ -32,25 +52,26 @@ This release includes the following **Dependencies Update**: - `v1.3.1 `_ * - Fast CDR - `eProsima/Fast-CDR `_ - - `v2.1.2 `_ - `v2.2.0 `_ + - `v2.2.8 `_ * - Fast DDS - `eProsima/Fast-DDS `_ - - `v2.13.1 `_ - `v2.14.0 `_ + - `v2.14.7 `_ * - Dev Utils - `eProsima/dev-utils `_ - - `v0.5.0 `_ - `v0.6.0 `_ + - `v0.7.0 `_ * - DDS Pipe - `eProsima/DDS-Pipe `_ - - `v0.3.0 `__ - `v0.4.0 `__ + - `v0.5.0 `__ ################# Previous Versions ################# +.. include:: previous_versions/v2.2.0.rst .. include:: previous_versions/v2.1.0.rst .. include:: previous_versions/v2.0.0.rst .. include:: previous_versions/v1.2.0.rst diff --git a/docs/rst/notes/previous_versions/v2.2.0.rst b/docs/rst/notes/previous_versions/v2.2.0.rst new file mode 100644 index 000000000..1190739f2 --- /dev/null +++ b/docs/rst/notes/previous_versions/v2.2.0.rst @@ -0,0 +1,41 @@ +Version v2.2.0 +============== + +This release includes the following **Features**: + +* Publish the :ref:`Logs ` in a DDS topic. +* New :ref:`Monitor ` module. + +This release includes the following **Configuration features**: + +* New ``logging`` configuration option to configure the DDS Router :ref:`internal logs `. + +This release includes the following **Dependencies Update**: + +.. list-table:: + :header-rows: 1 + + * - + - Repository + - Old Version + - New Version + * - Foonathan Memory Vendor + - `eProsima/foonathan_memory_vendor `_ + - `v1.3.1 `_ + - `v1.3.1 `_ + * - Fast CDR + - `eProsima/Fast-CDR `_ + - `v2.1.2 `_ + - `v2.2.0 `_ + * - Fast DDS + - `eProsima/Fast-DDS `_ + - `v2.13.1 `_ + - `v2.14.0 `_ + * - Dev Utils + - `eProsima/dev-utils `_ + - `v0.5.0 `_ + - `v0.6.0 `_ + * - DDS Pipe + - `eProsima/DDS-Pipe `_ + - `v0.3.0 `__ + - `v0.4.0 `__ diff --git a/docs/rst/spelling_wordlist.txt b/docs/rst/spelling_wordlist.txt index a9b8f037a..b6b5eda36 100644 --- a/docs/rst/spelling_wordlist.txt +++ b/docs/rst/spelling_wordlist.txt @@ -3,6 +3,7 @@ allowlisting Asio blackbox blocklist +bugfixes Chocolatey CMake colcon diff --git a/resources/images/eprosima_logo.svg b/resources/images/eprosima_logo.svg new file mode 100644 index 000000000..447536324 --- /dev/null +++ b/resources/images/eprosima_logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/tools/ddsrouter_tool/package.xml b/tools/ddsrouter_tool/package.xml index 27b60bd5d..0a679c507 100644 --- a/tools/ddsrouter_tool/package.xml +++ b/tools/ddsrouter_tool/package.xml @@ -2,7 +2,7 @@ ddsrouter_tool - 2.2.0 + 2.3.0 *eprosima DDS Router* Application to execute a DDS Router from a YAML configuration file. diff --git a/tools/ddsrouter_yaml_validator/package.xml b/tools/ddsrouter_yaml_validator/package.xml index 976040d88..d34b7131e 100644 --- a/tools/ddsrouter_yaml_validator/package.xml +++ b/tools/ddsrouter_yaml_validator/package.xml @@ -2,7 +2,7 @@ ddsrouter_yaml_validator - 2.2.0 + 2.3.0 Tool used for validating DDS-Router configuration files Raúl Sánchez-Mateos Javier París diff --git a/tools/ddsrouter_yaml_validator/setup.py b/tools/ddsrouter_yaml_validator/setup.py index 30a938c32..12bb9647f 100644 --- a/tools/ddsrouter_yaml_validator/setup.py +++ b/tools/ddsrouter_yaml_validator/setup.py @@ -6,7 +6,7 @@ setup( name=package_name, - version='2.2.0', + version='2.3.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages',