Remove UUID dependency.

That is, this field should be a GID, not a UUID (even though they happen to be the same length). Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Jan 25, 2023 · b8d7674 · b8d7674
1 parent 99e30a9
commit b8d7674
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/service_msgs/CMakeLists.txt b/service_msgs/CMakeLists.txt
@@ -15,15 +15,14 @@ find_package(builtin_interfaces REQUIRED)
 # Depend on "core" generators instead of "default" generators
 # because ROS actions depend on this package
 find_package(rosidl_core_generators REQUIRED)
-find_package(unique_identifier_msgs REQUIRED)
 
 set(msg_files
   "msg/ServiceEventInfo.msg"
 )
 
 rosidl_generate_interfaces(${PROJECT_NAME}
   ${msg_files}
-  DEPENDENCIES builtin_interfaces unique_identifier_msgs
+  DEPENDENCIES builtin_interfaces
   ADD_LINTER_TESTS
 )
 

diff --git a/service_msgs/QUALITY_DECLARATION.md b/service_msgs/QUALITY_DECLARATION.md
@@ -90,8 +90,7 @@ The nightly test can be found at [here](http://build.ros2.org/view/Rpr/job/Rpr__
 
 `service_msgs` has the following runtime ROS dependencies, which are at **Quality Level 1**:
 * `builtin_interfaces`: [QUALITY DECLARATION](../builtin_interfaces/QUALITY_DECLARATION.md)
-* `rosidl_core_runtime`: [QUALITY DECLARATION](https://github.com/ros2/rosidl_core/tree/master/rosidl_core_runtime/QUALITY_DECLARATION.md)
-* `unique_identifier_msgs`: [QUALITY DECLARATION](https://github.com/ros2/unique_identifier_msgs/tree/master/QUALITY_DECLARATION.md)
+* `rosidl_core_runtime`: [QUALITY DECLARATION](https://github.com/ros2/rosidl_core/tree/rolling/rosidl_core_runtime/QUALITY_DECLARATION.md)
 
 It has several "buildtool" dependencies, which do not affect the resulting quality of the package, because they do not contribute to the public library API.
 

diff --git a/service_msgs/README.md b/service_msgs/README.md
@@ -15,4 +15,4 @@ This is part of the Service Introspection feature of ROS 2 (see [REP 2012](https
 
 ## Quality Declaration
 
-This package claims to be in the **Quality Level 1** category, see the [Quality Declaration](QUALITY_DECLARATION.md) for more details.
+See the [Quality Declaration](QUALITY_DECLARATION.md) for more details.
diff --git a/service_msgs/msg/ServiceEventInfo.msg b/service_msgs/msg/ServiceEventInfo.msg
@@ -10,8 +10,11 @@ uint8 event_type
 builtin_interfaces/Time stamp
 
 # Unique identifier for the client that sent the service request
-# Note, this is only unique for the current session
-unique_identifier_msgs/UUID client_id
+# Note, this is only unique for the current session.
+# The size here has to match the size of rmw_dds_common/msg/Gid,
+# but unfortunately we cannot use that message directly due to a
+# circular dependency.
+char[16] client_gid
 
 # Sequence number for the request
 # Combined with the client ID, this creates a unique ID for the service transaction

diff --git a/service_msgs/package.xml b/service_msgs/package.xml
@@ -15,7 +15,6 @@
   <buildtool_depend>rosidl_core_generators</buildtool_depend>
 
   <depend>builtin_interfaces</depend>
-  <depend>unique_identifier_msgs</depend>
 
   <exec_depend>rosidl_core_runtime</exec_depend>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ This is part of the Service Introspection feature of ROS 2 (see [REP 2012](https

		## Quality Declaration

		This package claims to be in the Quality Level 1 category, see the [Quality Declaration](QUALITY_DECLARATION.md) for more details.
		See the [Quality Declaration](QUALITY_DECLARATION.md) for more details.