Manually fix merge conflicts

.github/labeler-config.yaml

@@ -1,15 +1,7 @@
-# Add 'melodic' label if any files in melodic/ folder are changed by a PR
-melodic:
-  - melodic/*
-
 # Add 'noetic' label if any files in noetic/ folder are changed by a PR
 noetic:
   - noetic/*
 
-# Add 'foxy' label if any files in foxy/ folder are changed by a PR
-foxy:
-  - foxy/*
-
 # Add 'humble' label if any files in humble/ folder are changed by a PR
 humble:
   - humble/*
@@ -35,10 +27,12 @@ end-of-life:
   - jade/*
   - kinetic/*
   - lunar/*
+  - melodic/*
   # ROS 2
   - ardent/*
   - bouncy/*
   - crystal/*
   - dashing/*
   - eloquent/*
+  - foxy/*
   - galactic/*

.github/workflows/stale_labeler.yaml

@@ -0,0 +1,19 @@
+name: 'Label inactive PRs as stale'
+
+on:
+  schedule:
+    - cron: '0 11 * * *'  # runs at 11am UTC every day => early morning in US
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8  # https://github.com/marketplace/actions/close-stale-issues
+        with:
+          stale-pr-label: 'stale'
+          stale-pr-message: "This PR hasn't been activity in 14 days. If you are still are interested in getting it merged please provide an update. Otherwise it will likely be closed by a rosdistro maintainer following our [contributing policy](https://github.com/ros/rosdistro/blob/master/CONTRIBUTING.md). It's been labeled \"stale\" for visibility to the maintainers. If this label isn't appropriate, you can ask a maintainer to remove the label and add the 'persistent' label."
+          days-before-pr-stale: 14
+          days-before-pr-close: -1     # don't close PRs automatically
+          days-before-issue-stale: -1  # don't label issues as stale
+          days-before-issue-close: -1  # don't close issues automatically
+          exempt-pr-labels: 'persistent'

REVIEW_GUIDELINES.md

@@ -70,3 +70,43 @@ There are a few different types of pull requests that are opened against this re
 1.  Changes to the rosdistro code. These pull requests change any of the scripts or tests that are housed in the rosdistro repositories.  They will be reviewed as any other code change in the ROS ecosystem.
 
 1.  Miscellaneous. Any other pull requests adding or modifying documentation, or anything else will be reviewed as any other code change in the ROS ecosystem.
+
+Reviewer utilities
+------------------
+
+### New package review checklist
+
+You can copy-paste the below into your review comment when reviewing a new package addition into rosdistro.
+
+- [ ] At least one of the following must be present
+  - [ ] Top level license file:
+  - [ ] Per package license files:
+- [ ] License is [OSI-approved](https://opensource.org/licenses):
+- [ ] License correctly listed in package.xmls
+- [ ] Public source repo:
+- [ ] Source repository contains ROS packages
+- [ ] Each package meets [REP-144](https://www.ros.org/reps/rep-0144.html) naming conventions
+
+<details><summary>Package name details</summary>
+
+```console
+$ find . -name "package.xml" -exec grep --color=auto -e "<name>" "{}" ";"
+<OUTPUT HERE>
+```
+</details>
+
+<details><summary>License details</summary>
+
+```console
+$ find . -name "package.xml" -exec grep --color=auto -e "<license>" "{}" "+"
+<OUTPUT HERE>
+```
+</details>
+
+### pip keys standard disclaimer
+
+You can copy-paste the following as a comment when reviewing a new rosdistro key using `pip` (even if you are approving!)
+
+Standard pip disclaimer: ROS packages that depend on `pip` keys cannot be released into a ROS distribution.
+They can only be depended on by from-source builds.
+Because of this, system packages are highly preferred to pip packages.

foxy/distribution.yaml

@@ -63,7 +63,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/ament_cmake-release.git
-      version: 0.9.11-1
+      version: 0.9.12-1
     source:
       test_pull_requests: true
       type: git
@@ -1760,7 +1760,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/gps_umd-release.git
-      version: 1.0.8-1
+      version: 1.0.9-1
     source:
       test_pull_requests: true
       type: git
@@ -2908,8 +2908,8 @@ repositories:
       - tile_map
       tags:
         release: release/foxy/{package}/{version}
-      url: https://github.com/swri-robotics-gbp/mapviz-release.git
-      version: 2.1.0-1
+      url: https://github.com/ros2-gbp/mapviz-release.git
+      version: 2.2.1-1
     source:
       test_pull_requests: true
       type: git
@@ -2935,9 +2935,10 @@ repositories:
     doc:
       type: git
       url: https://github.com/swri-robotics/marti_common.git
-      version: dashing-devel
+      version: ros2-devel
     release:
       packages:
+      - swri_cli_tools
       - swri_console_util
       - swri_dbw_interface
       - swri_geometry_util
@@ -2953,18 +2954,18 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/marti_common-release.git
-      version: 3.5.1-1
+      version: 3.5.2-3
     source:
       test_pull_requests: true
       type: git
       url: https://github.com/swri-robotics/marti_common.git
-      version: dashing-devel
+      version: ros2-devel
     status: developed
   marti_messages:
     doc:
       type: git
       url: https://github.com/swri-robotics/marti_messages.git
-      version: dashing-devel
+      version: ros2-devel
     release:
       packages:
       - marti_can_msgs
@@ -2979,12 +2980,12 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/marti_messages-release.git
-      version: 1.4.1-1
+      version: 1.4.1-2
     source:
       test_pull_requests: true
       type: git
       url: https://github.com/swri-robotics/marti_messages.git
-      version: dashing-devel
+      version: ros2-devel
     status: developed
   mavlink:
     doc:
@@ -3046,7 +3047,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/ros2_message_filters-release.git
-      version: 3.2.5-1
+      version: 3.2.7-1
     source:
       test_pull_requests: true
       type: git
@@ -4742,7 +4743,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rclcpp-release.git
-      version: 2.4.2-1
+      version: 2.4.3-1
     source:
       test_abi: true
       test_pull_requests: true
@@ -4759,7 +4760,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rclpy-release.git
-      version: 1.0.12-1
+      version: 1.0.13-1
     source:
       test_pull_requests: true
       type: git
@@ -5214,7 +5215,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rmw_fastrtps-release.git
-      version: 1.3.1-1
+      version: 1.3.2-1
     source:
       test_abi: true
       test_pull_requests: true
@@ -5336,7 +5337,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/ros1_bridge-release.git
-      version: 0.9.6-1
+      version: 0.9.7-1
     source:
       test_commits: false
       type: git
@@ -5705,7 +5706,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rosbag2-release.git
-      version: 0.3.10-1
+      version: 0.3.11-1
     source:
       test_abi: true
       test_pull_requests: true
@@ -5809,7 +5810,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rosidl-release.git
-      version: 1.3.0-1
+      version: 1.3.1-1
     source:
       test_abi: true
       test_pull_requests: true
@@ -5911,7 +5912,7 @@ repositories:
       tags:
         release: release/foxy/{package}/{version}
       url: https://github.com/ros2-gbp/rosidl_typesupport-release.git
-      version: 1.0.2-1
+      version: 1.0.3-1
     source:
       test_pull_requests: true
       type: git
@@ -7589,7 +7590,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros-drivers/urg_node_msgs.git
-      version: master
+      version: iron
     release:
       tags:
         release: release/foxy/{package}/{version}