Update upstream.repos

Author: mosfet80

.github/upstream.repos

@@ -7,14 +7,6 @@ repositories:
     type: git
     url: https://github.com/moveit/moveit_visual_tools
     version: ros2
-  rosparam_shortcuts:
-    type: git
-    url: https://github.com/PickNikRobotics/rosparam_shortcuts
-    version: ros2
-  rviz_visual_tools:
-    type: git
-    url: https://github.com/PickNikRobotics/rviz_visual_tools.git
-    version: ros2
   # Remove ros2_kortex when rolling binaries are available.
   ros2_kortex:
     type: git
@@ -30,3 +22,19 @@ repositories:
     type: git
     url: https://github.com/tylerjw/serial.git
     version: ros2
+  rviz_visual_tools:
+    type: git
+    url: https://github.com/PickNikRobotics/rviz_visual_tools.git
+    version: ros2
+  moveit2:
+    type: git
+    url: https://github.com/moveit/moveit2
+    version: main
+  moveit_resources:
+    type: git
+    url: https://github.com/moveit/moveit_resources
+    version: ros2
+  moveit_msgs:
+    type: git
+    url: https://github.com/moveit/moveit_msgs
+    version: ros2