Garden EOL (backport #662)

.github/CODEOWNERS

@@ -1,4 +1,9 @@
 # More info:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
+<<<<<<< HEAD
 *                     @chapulina
+=======
+*                     @adityapande-1995
+*                     @ahcorde
+>>>>>>> 63b651a (Garden EOL (#662))

.github/workflows/build-and-test.sh

@@ -10,6 +10,7 @@ export ROS_PYTHON_VERSION=3
 apt update -qq
 apt install -qq -y lsb-release wget curl build-essential
 
+<<<<<<< HEAD
 if [ "$GZ_VERSION" == "garden" ]; then
   echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list
   wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
@@ -27,14 +28,23 @@ elif [ "$GZ_VERSION" == "harmonic" ]; then
 fi
 
 # Fortress comes through rosdep for Focal and Jammy
+=======
+echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list
+wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
+>>>>>>> 63b651a (Garden EOL (#662))
 
 # Dependencies.
 echo "deb http://packages.ros.org/ros2-testing/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-testing.list
 curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
 apt-get update -qq
+<<<<<<< HEAD
 apt-get install -y $GZ_DEPS \
                        python3-colcon-common-extensions \
                        python3-rosdep
+=======
+apt-get install -y python3-colcon-common-extensions \
+                   python3-rosdep
+>>>>>>> 63b651a (Garden EOL (#662))
 
 rosdep init
 rosdep update

.github/workflows/ros2-ci.yml

@@ -10,6 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+<<<<<<< HEAD
           - docker-image: "ubuntu:22.04"
             gz-version: "fortress"
             ros-distro: "humble"
@@ -19,6 +20,11 @@ jobs:
           - docker-image: "ubuntu:22.04"
             gz-version: "harmonic"
             ros-distro: "humble"
+=======
+          - docker-image: "ubuntu:24.04"
+            gz-version: "harmonic"
+            ros-distro: "rolling"
+>>>>>>> 63b651a (Garden EOL (#662))
     container:
       image: ${{ matrix.docker-image }}
     steps:
@@ -30,9 +36,12 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.docker-image }}
           GZ_VERSION: ${{ matrix.gz-version  }}
           ROS_DISTRO: ${{ matrix.ros-distro }}
+<<<<<<< HEAD
       - name: Build sdformat_urdf from source
         uses: actions/checkout@v4
         if: ${{ matrix.gz-version  }} == "garden"
         with:
           repository: ros/sdformat_urdf
           ref: humble
+=======
+>>>>>>> 63b651a (Garden EOL (#662))

.github/workflows/triage.yml

@@ -10,10 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add ticket to inbox
+<<<<<<< HEAD
         uses: technote-space/create-project-card-action@v1
         with:
           PROJECT: Core development
           COLUMN: Inbox
           GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
           CHECK_ORG_PROJECT: true
+=======
+        uses: actions/[email protected]
+        with:
+          project-url: https://github.com/orgs/gazebosim/projects/7
+          github-token: ${{ secrets.TRIAGE_TOKEN }}
+>>>>>>> 63b651a (Garden EOL (#662))
 

README.md

@@ -3,6 +3,7 @@
 ROS 2 version | Gazebo version | Branch | Binaries hosted at
 -- | -- | -- | --
 Foxy | Citadel | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | https://packages.ros.org
+<<<<<<< HEAD
 Foxy | Edifice | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | only from source
 Galactic | Edifice | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | https://packages.ros.org
 Galactic | Fortress | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | only from source
@@ -19,6 +20,27 @@ Rolling | Harmonic | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | onl
 For information on ROS 2 and Gazebo compatibility, refer to the [melodic branch README](https://github.com/gazebosim/ros_gz/tree/melodic)
 
 > Please [ticket an issue](https://github.com/gazebosim/ros_gz/issues/) if you'd like support to be added for some combination.
+=======
+Foxy | Edifice | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | only from source [^2]
+Galactic | Edifice | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | https://packages.ros.org [^2]
+Galactic | Fortress | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | only from source
+Humble | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | https://packages.ros.org
+Humble | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/latest/ros_installation#gazebo-garden-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1] [^2]
+Humble | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/harmonic/ros_installation#-gazebo-harmonic-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1]
+Iron | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | https://packages.ros.org
+Iron | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source [^2]
+Iron | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source
+Jazzy | Garden | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source [^2]
+Jazzy | Harmonic | [jazzy](https://github.com/gazebosim/ros_gz/tree/jazzy) | https://packages.ros.org
+Rolling | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | https://packages.ros.org
+Rolling | Garden | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source [^2]
+Rolling | Harmonic | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source
+
+[^1]: Binaries for these pairings are provided from the packages.osrfoundation.org repository. Refer to https://gazebosim.org/docs/latest/ros_installation for installation instructions.
+[^2]: Note that the Gazebo version on this row has reached end-of-life.
+
+For information on ROS(1) and Gazebo compatibility, refer to the [noetic branch README](https://github.com/gazebosim/ros_gz/tree/noetic)
+>>>>>>> 63b651a (Garden EOL (#662))
 
 [Details about the renaming process](README_RENAME.md) from `ign` to `gz` .
 
@@ -55,11 +77,19 @@ This repository holds packages that provide integration between
 
 ## Install
 
+<<<<<<< HEAD
 This branch supports ROS Humble. See above for other ROS versions.
 
 ### Binaries
 
 Humble binaries are available for Fortress.
+=======
+This branch supports ROS Rolling. See above for other ROS versions.
+
+### Binaries
+
+Rolling binaries are available for Fortress.
+>>>>>>> 63b651a (Garden EOL (#662))
 They are hosted at https://packages.ros.org.
 
 1. Add https://packages.ros.org
@@ -70,30 +100,50 @@ They are hosted at https://packages.ros.org.
 
 1. Install `ros_gz`
 
+<<<<<<< HEAD
         sudo apt install ros-humble-ros-gz
+=======
+        sudo apt install ros-rolling-ros-gz
+>>>>>>> 63b651a (Garden EOL (#662))
 
 ### From source
 
 #### ROS
 
 Be sure you've installed
+<<<<<<< HEAD
 [ROS Humble](https://docs.ros.org/en/humble/Installation.html)
+=======
+[ROS Rolling](https://docs.ros.org/en/rolling/index.html)
+>>>>>>> 63b651a (Garden EOL (#662))
 (at least ROS-Base). More ROS dependencies will be installed below.
 
 #### Gazebo
 
+<<<<<<< HEAD
 Install either [Edifice, Fortress, or Garden](https://gazebosim.org/docs).
+=======
+Install either [Fortress, Harmonic or Ionic](https://gazebosim.org/docs).
+>>>>>>> 63b651a (Garden EOL (#662))
 
 Set the `GZ_VERSION` environment variable to the Gazebo version you'd
 like to compile against. For example:
 
+<<<<<<< HEAD
     export GZ_VERSION=edifice # IMPORTANT: Replace with correct version
+=======
+    export GZ_VERSION=harmonic # IMPORTANT: Replace with correct version
+>>>>>>> 63b651a (Garden EOL (#662))
 
 > You only need to set this variable when compiling, not when running.
 
 #### Compile ros_gz
 
+<<<<<<< HEAD
 The following steps are for Linux and OSX.
+=======
+The following steps are for Linux and macOS.
+>>>>>>> 63b651a (Garden EOL (#662))
 
 1. Create a colcon workspace:
 
@@ -103,14 +153,22 @@ The following steps are for Linux and OSX.
     cd ~/ws/src
 
     # Download needed software
+<<<<<<< HEAD
     git clone https://github.com/gazebosim/ros_gz.git -b humble
+=======
+    git clone https://github.com/gazebosim/ros_gz.git -b ros2
+>>>>>>> 63b651a (Garden EOL (#662))
     ```
 
 1. Install dependencies (this may also install Gazebo):
 
     ```
     cd ~/ws
+<<<<<<< HEAD
     rosdep install -r --from-paths src -i -y --rosdistro humble
+=======
+    rosdep install -r --from-paths src -i -y --rosdistro rolling
+>>>>>>> 63b651a (Garden EOL (#662))
     ```
 
     > 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).
@@ -130,6 +188,7 @@ The following steps are for Linux and OSX.
   > try building with `colcon build --parallel-workers=1 --executor sequential`. You might also have to set `export MAKEFLAGS="-j 1"` before running `colcon build` to limit
   > the number of processors used to build a single package.
 
+<<<<<<< HEAD
     If `colcon build` fails with [this issue](https://github.com/gazebosim/ros_gz/issues/401)
 
     ```
@@ -146,6 +205,8 @@ The following steps are for Linux and OSX.
     colcon build
     ```
 
+=======
+>>>>>>> 63b651a (Garden EOL (#662))
 ## ROSCon 2022
 
 [![](img/video_img.png)](https://vimeo.com/showcase/9954564/video/767127300)

README_RENAME.md

@@ -7,7 +7,11 @@ This allows users to do either of these and get equivalent behavior:
 
 ```bash
 ros2 run ros_gz parameter_bridge [...]
+<<<<<<< HEAD
 ros2 run ros_ign parameter_bridge [...]  # Will emit deprecation warning
+=======
+ros2 run ros_gz parameter_bridge [...]  # Will emit deprecation warning
+>>>>>>> 63b651a (Garden EOL (#662))
 ```
 
 Additionally, installed files like launch files, message interfaces etc. are **duplicated** versions of the ones in `ros_gz` (but renamed as appropriate), and point to `ros_gz` dependencies as well (e.g. launch files pointing to `ros_gz` nodes.)

ros_gz/CHANGELOG.rst

@@ -2,6 +2,7 @@
 Changelog for package ros_gz
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< HEAD
 0.244.16 (2024-07-22)
 ---------------------
 
@@ -19,6 +20,63 @@ Changelog for package ros_gz
 
 0.244.11 (2023-05-23)
 ---------------------
+=======
+2.1.2 (2024-10-31)
+------------------
+
+2.1.1 (2024-10-14)
+------------------
+
+2.1.0 (2024-09-12)
+------------------
+
+2.0.1 (2024-08-29)
+------------------
+
+2.0.0 (2024-07-22)
+------------------
+
+1.0.1 (2024-07-03)
+------------------
+* Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
+* 0.244.14
+* Changelog
+* 0.244.13
+* Changelog
+* 0.244.12
+* Changelog
+* 0.246.0
+* Update changelogs
+* Port: humble to ros2 (`#386 <https://github.com/gazebosim/ros_gz//issues/386>`_)
+* Merge branch 'humble' into mjcarroll/humble_to_ros2
+* Update maintainers (`#376 <https://github.com/gazebosim/ros_gz//issues/376>`_)
+* Humble ➡️ ROS2 (`#323 <https://github.com/gazebosim/ros_gz//issues/323>`_)
+  Humble ➡️ ROS2
+* Merge branch 'humble' into ports/humble_to_ros2
+* 0.245.0
+* Changelog
+* 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, Jose Luis Rivero, Michael Carroll, ahcorde
+
+1.0.0 (2024-04-24)
+------------------
+
+0.246.0 (2023-08-31)
+--------------------
+* Port: humble to ros2 (`#386 <https://github.com/gazebosim/ros_gz/issues/386>`_)
+* Update maintainers (`#376 <https://github.com/gazebosim/ros_gz/issues/376>`_)
+* Humble ➡️ ROS2 (`#323 <https://github.com/gazebosim/ros_gz/issues/323>`_)
+* Contributors: Aditya Pande, Alejandro Hernández Cordero, Michael Carroll, ahcorde
+
+0.245.0 (2022-10-12)
+--------------------
+* 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: Alejandro Hernández Cordero, ahcorde
+>>>>>>> 63b651a (Garden EOL (#662))
 
 0.244.10 (2023-05-03)
 ---------------------

ros_gz/package.xml

@@ -4,11 +4,22 @@
   <!-- TODO: Make this a metapackage, see
        https://github.com/ros2/ros2/issues/408 -->
   <name>ros_gz</name>
+<<<<<<< HEAD
   <version>0.244.16</version>
   <description>Meta-package containing interfaces for using ROS 2 with <a href="https://gazebosim.org">Gazebo</a> simulation.</description>
   <maintainer email="[email protected]">Louise Poubel</maintainer>
   <license>Apache 2.0</license>
 
+=======
+  <version>2.1.2</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>
+  <license>Apache 2.0</license>
+
+  <author>Louise Poubel</author>
+
+>>>>>>> 63b651a (Garden EOL (#662))
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <exec_depend>ros_gz_bridge</exec_depend>