Skip to content

Commit 90a7b44

Browse files
authored
Merge branch 'rolling' into ahcorde/rolling/resolute
2 parents 22cb446 + 9144a59 commit 90a7b44

7 files changed

Lines changed: 15 additions & 4 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ repos:
136136
exclude: CHANGELOG\.rst|\.(svg|pyc)$
137137

138138
- repo: https://github.com/python-jsonschema/check-jsonschema
139-
rev: 0.37.1
139+
rev: 0.37.2
140140
hooks:
141141
- id: check-github-workflows
142142
args: ["--verbose"]

gz_ros2_control/CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package ign_ros2_control
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.0 (2026-05-13)
6+
------------------
7+
58
3.0.7 (2026-04-15)
69
------------------
710
* Fix race condition in RM initialization (restore 2000 ms wait) (`#809 <https://github.com/ros-controls/gz_ros2_control/issues/809>`_)

gz_ros2_control/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>gz_ros2_control</name>
4-
<version>3.0.7</version>
4+
<version>4.0.0</version>
55
<description>Gazebo ros2_control package allows to control simulated robots using ros2_control framework.</description>
66
<maintainer email="alejandro@openrobotics.com">Alejandro Hernández</maintainer>
77
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>

gz_ros2_control_demos/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package ign_ros2_control_demos
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.0 (2026-05-13)
6+
------------------
7+
* Fix controller dependencies (`#837 <https://github.com/ros-controls/gz_ros2_control/issues/837>`_)
8+
* Contributors: Christoph Fröhlich
9+
510
3.0.7 (2026-04-15)
611
------------------
712
* Add missing tests for pendulum and gripper (position and effort) (`#814 <https://github.com/ros-controls/gz_ros2_control/issues/814>`_)

gz_ros2_control_demos/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>gz_ros2_control_demos</name>
4-
<version>3.0.7</version>
4+
<version>4.0.0</version>
55
<description>gz_ros2_control_demos</description>
66

77
<maintainer email="ahcorde@osrfoundation.org">Alejandro Hernandez</maintainer>

gz_ros2_control_tests/CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package gz_ros2_control_tests
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
4.0.0 (2026-05-13)
6+
------------------
7+
58
3.0.7 (2026-04-15)
69
------------------
710
* Add missing tests for pendulum and gripper (position and effort) (`#814 <https://github.com/ros-controls/gz_ros2_control/issues/814>`_)

gz_ros2_control_tests/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>gz_ros2_control_tests</name>
5-
<version>3.0.7</version>
5+
<version>4.0.0</version>
66
<description>Gazebo ros2 control tests</description>
77
<maintainer email="alejandro@openrobotics.org">Alejandro Hernández</maintainer>
88
<license>Apache License 2.0</license>

0 commit comments

Comments
 (0)