Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/docker/ddsrouter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/. && \
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reusable-workflow.yml
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down Expand Up @@ -79,7 +79,6 @@ jobs:
os:
- ubuntu-22.04
- ubuntu-24.04
- windows-2019
- windows-2022

steps:
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# eProsima DDS Router

<a href="http://www.eprosima.com"><img src="https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcSd0PDlVz1U_7MgdTe0FRIWD0Jc9_YH-gGi0ZpLkr-qgCI6ZEoJZ5GBqQ" align="left" hspace="8" vspace="2" width="100" height="100" ></a>
> [!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)
Expand All @@ -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/)

<a href="http://www.eprosima.com"><img src="resources/images/eprosima_logo.svg" alt="eProsima" width="100"></a>

*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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION_MAJOR 2
VERSION_MINOR 2
VERSION_MINOR 3
VERSION_PATCH 0
6 changes: 3 additions & 3 deletions ddsrouter.repos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ddsrouter_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>
*eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios.
</description>
Expand Down
2 changes: 1 addition & 1 deletion ddsrouter_test/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>
*eprosima DDS Router* tests.
</description>
Expand Down
2 changes: 1 addition & 1 deletion ddsrouter_yaml/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>
*eprosima DDS Router* C++ library to communicate isolated DDS networks between each other. Use in isolated machines an WAN scenarios.
</description>
Expand Down
2 changes: 1 addition & 1 deletion docs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>
*eprosima DDS Router* Documentation built with sphinx and deployed in ReadTheDocs.
</description>
Expand Down
4 changes: 2 additions & 2 deletions docs/rst/developer_manual/installation/sources/linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/eProsima/DDS-Pipe>`_
Expand Down
4 changes: 2 additions & 2 deletions docs/rst/developer_manual/installation/sources/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,15 @@ Local installation
cd <path\to\user\workspace>\DDS-Router
mkdir build\cmake_utils
cd build\cmake_utils
cmake <path\to\user\workspace>\DDS-Router\src\dev-utils\cmake_utils -DCMAKE_INSTALL_PREFIX=<path\to\user\workspace>\DDS-Router\install ^
cmake <path\to\user\workspace>\DDS-Router\src\dev_utils\cmake_utils -DCMAKE_INSTALL_PREFIX=<path\to\user\workspace>\DDS-Router\install ^
-DCMAKE_PREFIX_PATH=<path\to\user\workspace>\DDS-Router\install
cmake --build . --config Release --target install

# C++ Utils
cd <path\to\user\workspace>\DDS-Router
mkdir build\cpp_utils
cd build\cpp_utils
cmake <path\to\user\workspace>\DDS-Router\src\dev-utils\cpp_utils -DCMAKE_INSTALL_PREFIX=<path\to\user\workspace>\DDS-Router\install ^
cmake <path\to\user\workspace>\DDS-Router\src\dev_utils\cpp_utils -DCMAKE_INSTALL_PREFIX=<path\to\user\workspace>\DDS-Router\install ^
-DCMAKE_PREFIX_PATH=<path\to\user\workspace>\DDS-Router\install
cmake --build . --config Release --target install

Expand Down
11 changes: 1 addition & 10 deletions docs/rst/notes/forthcoming_version.rst
Original file line number Diff line number Diff line change
@@ -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.
41 changes: 31 additions & 10 deletions docs/rst/notes/notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <router_specs_logging>` in a DDS topic.
* New :ref:`Monitor <user_manual_configuration_specs_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 <router_specs_logging>`.
* 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**:

Expand All @@ -32,25 +52,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.1.2 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.1.2>`_
- `v2.2.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0>`_
- `v2.2.8 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.8>`_
* - Fast DDS
- `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_
- `v2.13.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.13.1>`_
- `v2.14.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.0>`_
- `v2.14.7 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.7>`_
* - Dev Utils
- `eProsima/dev-utils <https://github.com/eProsima/dev-utils>`_
- `v0.5.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.5.0>`_
- `v0.6.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.6.0>`_
- `v0.7.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.7.0>`_
* - DDS Pipe
- `eProsima/DDS-Pipe <https://github.com/eProsima/DDS-Pipe.git>`_
- `v0.3.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.3.0>`__
- `v0.4.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.4.0>`__
- `v0.5.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/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
Expand Down
41 changes: 41 additions & 0 deletions docs/rst/notes/previous_versions/v2.2.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Version v2.2.0
==============

This release includes the following **Features**:

* Publish the :ref:`Logs <router_specs_logging>` in a DDS topic.
* New :ref:`Monitor <user_manual_configuration_specs_monitor>` module.

This release includes the following **Configuration features**:

* New ``logging`` configuration option to configure the DDS Router :ref:`internal logs <router_specs_logging>`.

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.1.2 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.1.2>`_
- `v2.2.0 <https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.0>`_
* - Fast DDS
- `eProsima/Fast-DDS <https://github.com/eProsima/Fast-DDS>`_
- `v2.13.1 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.13.1>`_
- `v2.14.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.14.0>`_
* - Dev Utils
- `eProsima/dev-utils <https://github.com/eProsima/dev-utils>`_
- `v0.5.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.5.0>`_
- `v0.6.0 <https://github.com/eProsima/dev-utils/releases/tag/v0.6.0>`_
* - DDS Pipe
- `eProsima/DDS-Pipe <https://github.com/eProsima/DDS-Pipe.git>`_
- `v0.3.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.3.0>`__
- `v0.4.0 <https://github.com/eProsima/DDS-Pipe/releases/tag/v0.4.0>`__
1 change: 1 addition & 0 deletions docs/rst/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ allowlisting
Asio
blackbox
blocklist
bugfixes
Chocolatey
CMake
colcon
Expand Down
5 changes: 5 additions & 0 deletions resources/images/eprosima_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tools/ddsrouter_tool/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>
*eprosima DDS Router* Application to execute a DDS Router from a YAML configuration file.
</description>
Expand Down
2 changes: 1 addition & 1 deletion tools/ddsrouter_yaml_validator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.2.0</version>
<version>2.3.0</version>
<description>Tool used for validating DDS-Router configuration files</description>
<maintainer email="raul@eprosima.com">Raúl Sánchez-Mateos</maintainer>
<maintainer email="javierparis@eprosima.com">Javier París</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion tools/ddsrouter_yaml_validator/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading