Rollback diff w.r.t. master

Author: roncapat

.github/workflows/ci.yaml

@@ -28,7 +28,6 @@ jobs:
         rosdep update
         rosdep install --from-paths ./ -i -y --rosdistro rolling \
           --ignore-src
-        apt-get upgrade -q -y --with-new-pkgs ros-rolling-rcl
     - name: Build project
       id: build
       run: |
@@ -47,7 +46,7 @@ jobs:
     container:
       image: osrf/ros:rolling-desktop
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup colcon workspace
       id: configure
       run: |
@@ -65,7 +64,6 @@ jobs:
         rosdep update
         rosdep install --from-paths ./ -i -y --rosdistro rolling \
           --ignore-src
-        apt-get upgrade -q -y --with-new-pkgs ros-rolling-rcl
     - name: Build project
       id: build
       run: |

gazebo_ros2_control/CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.0)
 project(gazebo_ros2_control)
 
 find_package(ament_cmake REQUIRED)
-find_package(service_msgs REQUIRED)
 find_package(angles REQUIRED)
 find_package(controller_manager REQUIRED)
 find_package(gazebo_dev REQUIRED)
@@ -31,7 +30,6 @@ add_library(${PROJECT_NAME} SHARED
 )
 ament_target_dependencies(${PROJECT_NAME}
   angles
-  service_msgs
   controller_manager
   gazebo_dev
   gazebo_ros
@@ -64,8 +62,18 @@ ament_export_include_directories(
   include
 )
 
-ament_export_dependencies(ament_cmake)
-ament_export_dependencies(rclcpp)
+ament_export_dependencies(
+  ament_cmake
+  angles
+  controller_manager
+  gazebo_dev
+  gazebo_ros
+  hardware_interface
+  pluginlib
+  rclcpp
+  yaml_cpp_vendor
+)
+
 ament_export_libraries(
   ${PROJECT_NAME}
   gazebo_hardware_plugins

gazebo_ros2_control/package.xml

@@ -19,7 +19,6 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <depend>angles</depend>
-  <depend>service_msgs</depend>
   <depend>gazebo_dev</depend>
   <depend>gazebo_ros</depend>
   <depend>controller_manager</depend>