Fix dependencies of controller_manager (#2836)

(cherry picked from commit 432ecad)

# Conflicts:
#	controller_manager/CMakeLists.txt
#	controller_manager/package.xml

Author: christophfroehlich

controller_manager/CMakeLists.txt

@@ -6,6 +6,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 endif()
 
 set(THIS_PACKAGE_INCLUDE_DEPENDS
+<<<<<<< HEAD
     ament_index_cpp
     controller_interface
     controller_manager_msgs
@@ -14,6 +15,20 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
     rclcpp
     realtime_tools
     std_msgs
+=======
+  controller_interface
+  controller_manager_msgs
+  diagnostic_updater
+  fmt
+  generate_parameter_library
+  hardware_interface
+  libstatistics_collector
+  lifecycle_msgs
+  pluginlib
+  rclcpp
+  realtime_tools
+  std_msgs
+>>>>>>> 432ecad (Fix dependencies of controller_manager (#2836))
 )
 
 find_package(ament_cmake REQUIRED)

controller_manager/package.xml

@@ -16,29 +16,46 @@
   <depend>backward_ros</depend>
   <depend>controller_interface</depend>
   <depend>controller_manager_msgs</depend>
+<<<<<<< HEAD
+=======
+  <depend>diagnostic_updater</depend>
+  <depend>fmt</depend>
+  <depend>generate_parameter_library</depend>
+>>>>>>> 432ecad (Fix dependencies of controller_manager (#2836))
   <depend>hardware_interface</depend>
-  <depend>launch</depend>
-  <depend>launch_ros</depend>
+  <depend>libstatistics_collector</depend>
+  <depend>lifecycle_msgs</depend>
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
-  <depend>rcpputils</depend>
   <depend>realtime_tools</depend>
-  <depend>ros2_control_test_assets</depend>
-  <depend>ros2param</depend>
-  <depend>ros2run</depend>
   <depend>std_msgs</depend>
+<<<<<<< HEAD
+=======
+
+  <exec_depend>launch_ros</exec_depend>
+  <exec_depend>launch_testing_ros</exec_depend>
+  <exec_depend>launch</exec_depend>
+  <exec_depend>python3-filelock</exec_depend>
+  <exec_depend>python3-yaml</exec_depend>
+  <exec_depend>rcl_interfaces</exec_depend>
+  <exec_depend>rclpy</exec_depend>
+  <exec_depend>ros2param</exec_depend>
+  <exec_depend>sensor_msgs</exec_depend>
+>>>>>>> 432ecad (Fix dependencies of controller_manager (#2836))
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_cmake_pytest</test_depend>
+  <test_depend>example_interfaces</test_depend>
   <test_depend>hardware_interface_testing</test_depend>
-  <test_depend>launch_testing_ros</test_depend>
   <test_depend>launch_testing</test_depend>
-  <test_depend>launch</test_depend>
   <test_depend>python3-coverage</test_depend>
-  <test_depend>rclpy</test_depend>
   <test_depend>robot_state_publisher</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
+<<<<<<< HEAD
   <test_depend>sensor_msgs</test_depend>
+=======
+  <test_depend>ros2pkg</test_depend>
+>>>>>>> 432ecad (Fix dependencies of controller_manager (#2836))
 
   <export>
     <build_type>ament_cmake</build_type>