Imported upstream version '1.0.6' of 'upstream'

.github/workflows/ros2-ci.yml

@@ -12,7 +12,7 @@ jobs:
         include:
           - docker-image: "ubuntu:24.04"
             gz-version: "harmonic"
-            ros-distro: "rolling"
+            ros-distro: "jazzy"
     container:
       image: ${{ matrix.docker-image }}
     steps:

README.md

@@ -59,7 +59,7 @@ This repository holds packages that provide integration between
 
 ## Install
 
-This branch supports ROS Rolling. See above for other ROS versions.
+This branch supports ROS Jazzy. See above for other ROS versions.
 
 ### Binaries
 
@@ -74,19 +74,19 @@ They are hosted at https://packages.ros.org.
 
 1. Install `ros_gz`
 
-        sudo apt install ros-rolling-ros-gz
+        sudo apt install ros-jazzy-ros-gz
 
 ### From source
 
 #### ROS
 
 Be sure you've installed
-[ROS Rolling](https://docs.ros.org/en/rolling/index.html)
+[ROS Jazzy](https://docs.ros.org/en/jazzy/Installation.html)
 (at least ROS-Base). More ROS dependencies will be installed below.
 
 #### Gazebo
 
-Install either [Fortress, Garden, or Harmonic](https://gazebosim.org/docs).
+Install either [Garden or Harmonic](https://gazebosim.org/docs).
 
 Set the `GZ_VERSION` environment variable to the Gazebo version you'd
 like to compile against. For example:
@@ -107,14 +107,14 @@ The following steps are for Linux and OSX.
     cd ~/ws/src
 
     # Download needed software
-    git clone https://github.com/gazebosim/ros_gz.git -b ros2
+    git clone https://github.com/gazebosim/ros_gz.git -b jazzy
     ```
 
 1. Install dependencies (this may also install Gazebo):
 
     ```
     cd ~/ws
-    rosdep install -r --from-paths src -i -y --rosdistro rolling
+    rosdep install -r --from-paths src -i -y --rosdistro jazzy
     ```
 
     > If `rosdep` fails to install Gazebo libraries and you have not installed them before, please follow [Gazebo installation instructions](https://gazebosim.org/docs/latest/install).

ros_gz/CHANGELOG.rst

@@ -2,22 +2,19 @@
 Changelog for package ros_gz
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.1.2 (2024-10-31)
+1.0.6 (2024-10-31)
 ------------------
 
-2.1.1 (2024-10-14)
+1.0.5 (2024-10-14)
 ------------------
 
-2.1.0 (2024-09-12)
+1.0.4 (2024-08-29)
 ------------------
 
-2.0.1 (2024-08-29)
+1.0.3 (2024-07-22)
 ------------------
 
-2.0.0 (2024-07-22)
-------------------
-
-1.0.1 (2024-07-03)
+1.0.2 (2024-07-03)
 ------------------
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
 * 0.244.14

ros_gz/package.xml

@@ -4,7 +4,7 @@
   <!-- TODO: Make this a metapackage, see
        https://github.com/ros2/ros2/issues/408 -->
   <name>ros_gz</name>
-  <version>2.1.2</version>
+  <version>1.0.6</version>
   <description>Meta-package containing interfaces for using ROS 2 with <a href="https://gazebosim.org">Gazebo</a> simulation.</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

ros_gz_bridge/CHANGELOG.rst

@@ -2,46 +2,51 @@
 Changelog for package ros_gz_bridge
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.1.2 (2024-10-31)
+1.0.6 (2024-10-31)
 ------------------
+* Extra parameter to start a container (`#616 <https://github.com/gazebosim/ros_gz/issues/616>`_) (`#618 <https://github.com/gazebosim/ros_gz/issues/618>`_)
+  (cherry picked from commit 8115ccaaedea718841367eb64e500e13df392fd7)
+  Co-authored-by: Carlos Agüero <[email protected]>
+* Contributors: mergify[bot]
 
-2.1.1 (2024-10-14)
-------------------
-* Extra parameter to start a container (`#616 <https://github.com/gazebosim/ros_gz/issues/616>`_)
-* adds deadline and liveliness QoSPolicyKinds to qos_overriding_options (`#609 <https://github.com/gazebosim/ros_gz/issues/609>`_)
-  Co-authored-by: nora <[email protected]>
-* Contributors: Carlos Agüero, norakon
-
-2.1.0 (2024-09-12)
-------------------
-* Remove default_value for required arguments (`#602 <https://github.com/gazebosim/ros_gz//issues/602>`_)
-  * Remove default_value for config_file
-* Fix errors with name of bridge not being given (`#600 <https://github.com/gazebosim/ros_gz//issues/600>`_)
-  * Add argument bridge_name to fix errors
-* Use optional parameters in actions (`#601 <https://github.com/gazebosim/ros_gz//issues/601>`_)
-* Contributors: Amronos, Carlos Agüero
-
-2.0.1 (2024-08-29)
-------------------
-* Stamp all outgoing headers with the wall time if parameter override_timestamps_with_wall_time is set to true (`#562 <https://github.com/gazebosim/ros_gz/issues/562>`_)
-* Contributors: Rein Appeldoorn
-
-2.0.0 (2024-07-22)
+1.0.5 (2024-10-14)
 ------------------
+* Merge pull request `#607 <https://github.com/gazebosim/ros_gz/issues/607>`_ from Amronos/ros2-jazzy-backport
+* Fix changelogs and versions
+* adds deadline and liveliness QoSPolicyKinds to qos_overriding_options (`#609 <https://github.com/gazebosim/ros_gz/issues/609>`_) (`#613 <https://github.com/gazebosim/ros_gz/issues/613>`_)
+* Remove default_value for required arguments (`#602 <https://github.com/gazebosim/ros_gz/issues/602>`_)
+* Fix errors with name of bridge not being given (`#600 <https://github.com/gazebosim/ros_gz/issues/600>`_)
+* Use optional parameters in actions (`#601 <https://github.com/gazebosim/ros_gz/issues/601>`_)
 * Making use_composition true by default (`#578 <https://github.com/gazebosim/ros_gz/issues/578>`_)
-* Contributors: Addisu Z. Taddese
-
-1.0.1 (2024-07-03)
+* Use `ignoreLocalMessages` in the bridge (`#559 <https://github.com/gazebosim/ros_gz/issues/559>`_)
+* Update launch files with name parameter (`#556 <https://github.com/gazebosim/ros_gz/issues/556>`_)
+* Ensure the same container is used for the bridge and gz_server (`#553 <https://github.com/gazebosim/ros_gz/issues/553>`_)
+* Launch ros_gz_bridge from xml (`#550 <https://github.com/gazebosim/ros_gz/issues/550>`_)
+* Launch gzserver and the bridge as composable nodes (`#528 <https://github.com/gazebosim/ros_gz/issues/528>`_)
+* adds deadline and liveliness QoSPolicyKinds to qos_overriding_options (`#609 <https://github.com/gazebosim/ros_gz/issues/609>`_) (`#613 <https://github.com/gazebosim/ros_gz/issues/613>`_)
+* Contributors: Aarav Gupta, Addisu Z. Taddese, Alejandro Hernández Cordero, Amronos, Carlos Agüero, mergify[bot]
+
+1.0.4 (2024-08-29)
 ------------------
-* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
-* Merge pull request `#571 <https://github.com/gazebosim/ros_gz//issues/571>`_ from azeey/jazzy_to_ros2
-  Merge jazzy ➡️  ros2
-* Merge branch 'ros2' into jazzy_to_ros2
-* Use memcpy instead of std::copy when bridging images (`#565 <https://github.com/gazebosim/ros_gz//issues/565>`_)
+* feat: `override_timestamps_with_wall_time` parameter (backport `#562 <https://github.com/gazebosim/ros_gz/issues/562>`_) (`#584 <https://github.com/gazebosim/ros_gz/issues/584>`_)
+  Co-authored-by: Rein Appeldoorn <[email protected]>
+* Use memcpy instead of std::copy when bridging images (`#565 <https://github.com/gazebosim/ros_gz/issues/565>`_) (`#585 <https://github.com/gazebosim/ros_gz/issues/585>`_)
   While testing ros <-> gz communication using the bridge I noticed that the bridge was talking quite a bit of time copying images from Gazebo to ROS. I found that the std::copy operation that we're doing is substantially slower than the memcpy alternative. I think that in principle this shouldn't happen but the numbers are quite clear. Perhaps std::copy is doing something that doesn't use cache effectively
   ---------
   Co-authored-by: Jose Luis Rivero <[email protected]>
-* Merge jazzy into ros2
+  (cherry picked from commit a781b78852112246245c05481db6335388d4f736)
+  Co-authored-by: Carlos Agüero <[email protected]>
+* Contributors: mergify[bot]
+
+1.0.3 (2024-07-22)
+------------------
+* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz/issues/573>`_) (`#574 <https://github.com/gazebosim/ros_gz/issues/574>`_)
+  (cherry picked from commit f9afb69d1163633dd978024bb7271a28cf7b551a)
+  Co-authored-by: Victor T. Noppeney <[email protected]>
+* Contributors: mergify[bot]
+
+1.0.2 (2024-07-03)
+------------------
 * Merge pull request `#569 <https://github.com/gazebosim/ros_gz//issues/569>`_ from azeey/iron_to_jazzy
   Merge iron ➡️  jazzy
 * Merge iron into jazzy
@@ -54,22 +59,6 @@ Changelog for package ros_gz_bridge
 * Merge pull request `#564 <https://github.com/gazebosim/ros_gz//issues/564>`_ from azeey/humble_to_iron
   Humble ➡️ Iron
 * Merge humble -> iron
-* Use `ignoreLocalMessages` in the bridge (`#559 <https://github.com/gazebosim/ros_gz//issues/559>`_)
-  * Ignore local messages
-* Update launch files with name parameter (`#556 <https://github.com/gazebosim/ros_gz//issues/556>`_)
-  * Name is required.
-* Ensure the same container is used for the bridge and gz_server (`#553 <https://github.com/gazebosim/ros_gz//issues/553>`_)
-  This also adds a required `name` parameter for the bridge so that
-  multiple different bridges can be created without name collision
-* Launch ros_gz_bridge from xml (`#550 <https://github.com/gazebosim/ros_gz//issues/550>`_)
-  * Add gzserver with ability to load an SDF file or string
-* Launch gzserver and the bridge as composable nodes (`#528 <https://github.com/gazebosim/ros_gz//issues/528>`_)
-  * Add gzserver with ability to load an SDF file or string
-* Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
-  Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
-  * Message and bridge for MaterialColor.
-  This allows bridging MaterialColor from ROS to GZ and is
-  important for allowing simulation users to create status lights.
 * populate imu covariances when converting (`#375 <https://github.com/gazebosim/ros_gz//issues/375>`_) (`#540 <https://github.com/gazebosim/ros_gz//issues/540>`_)
   Co-authored-by: El Jawad Alaa <[email protected]>
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
@@ -159,7 +148,7 @@ Changelog for package ros_gz_bridge
   * Update CMakeLists and package.xml for garden
   * Complete garden gz renaming
   * Drop fortress CI
-* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, Carlos Agüero, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Victor T. Noppeney, Yadu, ahcorde, wittenator, ymd-stella
+* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Yadu, ahcorde, wittenator, ymd-stella
 
 1.0.0 (2024-04-24)
 ------------------

ros_gz_bridge/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>ros_gz_bridge</name>
-  <version>2.1.2</version>
+  <version>1.0.6</version>
   <description>Bridge communication between ROS and Gazebo Transport</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

ros_gz_image/CHANGELOG.rst

@@ -2,26 +2,20 @@
 Changelog for package ros1_ign_image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.1.2 (2024-10-31)
+1.0.6 (2024-10-31)
 ------------------
 
-2.1.1 (2024-10-14)
+1.0.5 (2024-10-14)
 ------------------
 
-2.1.0 (2024-09-12)
+1.0.4 (2024-08-29)
 ------------------
 
-2.0.1 (2024-08-29)
+1.0.3 (2024-07-22)
 ------------------
 
-2.0.0 (2024-07-22)
+1.0.2 (2024-07-03)
 ------------------
-
-1.0.1 (2024-07-03)
-------------------
-* Merge pull request `#571 <https://github.com/gazebosim/ros_gz//issues/571>`_ from azeey/jazzy_to_ros2
-  Merge jazzy ➡️  ros2
-* Merge jazzy into ros2
 * Merge pull request `#569 <https://github.com/gazebosim/ros_gz//issues/569>`_ from azeey/iron_to_jazzy
   Merge iron ➡️  jazzy
 * Merge iron into jazzy

ros_gz_image/package.xml

@@ -1,6 +1,6 @@
 <package format="3">
   <name>ros_gz_image</name>
-  <version>2.1.2</version>
+  <version>1.0.6</version>
   <description>Image utilities for Gazebo simulation with ROS.</description>
   <license>Apache 2.0</license>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

ros_gz_interfaces/CHANGELOG.rst

@@ -2,35 +2,30 @@
 Changelog for package ros_gz_interfaces
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.1.2 (2024-10-31)
+1.0.6 (2024-10-31)
 ------------------
 
-2.1.1 (2024-10-14)
+1.0.5 (2024-10-14)
 ------------------
 
-2.1.0 (2024-09-12)
+1.0.4 (2024-08-29)
 ------------------
 
-2.0.1 (2024-08-29)
+1.0.3 (2024-07-22)
 ------------------
+* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz/issues/573>`_) (`#574 <https://github.com/gazebosim/ros_gz/issues/574>`_)
+  (cherry picked from commit f9afb69d1163633dd978024bb7271a28cf7b551a)
+  Co-authored-by: Victor T. Noppeney <[email protected]>
+* Contributors: mergify[bot]
 
-2.0.0 (2024-07-22)
+1.0.2 (2024-07-03)
 ------------------
-
-1.0.1 (2024-07-03)
-------------------
-* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
 * Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
   Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
   * Message and bridge for MaterialColor.
   This allows bridging MaterialColor from ROS to GZ and is
   important for allowing simulation users to create status lights.
   (cherry picked from commit 78dc4823121f085594e6028a93f1e571eb04f58b)
-* Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
-  Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
-  * Message and bridge for MaterialColor.
-  This allows bridging MaterialColor from ROS to GZ and is
-  important for allowing simulation users to create status lights.
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
 * 0.244.14
 * Changelog
@@ -62,7 +57,7 @@ Changelog for package ros_gz_interfaces
 * humble to ros2 (`#311 <https://github.com/gazebosim/ros_gz//issues/311>`_)
   Co-authored-by: Michael Carroll <[email protected]>
 * Merge remote-tracking branch 'origin/humble' into ahcorde/humble_to_ros2
-* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Benjamin Perseghetti, Jose Luis Rivero, Michael Carroll, Victor T. Noppeney, ahcorde
+* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Benjamin Perseghetti, Jose Luis Rivero, Michael Carroll, ahcorde
 
 1.0.0 (2024-04-24)
 ------------------

ros_gz_interfaces/package.xml

@@ -1,6 +1,6 @@
 <package format="3">
   <name>ros_gz_interfaces</name>
-  <version>2.1.2</version>
+  <version>1.0.6</version>
   <description>Message and service data structures for interacting with Gazebo from ROS2.</description>
   <license>Apache 2.0</license>
   <author>Louise Poubel</author>