Bump gz-cmake and others in jetty

.github/ci/packages.apt

@@ -1,8 +1,8 @@
-libgz-cmake4-dev
-libgz-math8-dev
-libgz-msgs11-dev
+libgz-cmake5-dev
+libgz-math9-dev
+libgz-msgs12-dev
 libgz-tools2-dev
-libgz-utils3-cli-dev
+libgz-utils4-cli-dev
 libprotobuf-dev
 libprotoc-dev
 libsqlite3-dev
@@ -13,5 +13,5 @@ python3-dev
 python3-psutil
 python3-pybind11
 python3-pytest
-python3-gz-msgs11
+python3-gz-msgs12
 uuid-dev

CMakeLists.txt

@@ -9,8 +9,7 @@ project(gz-transport VERSION 15.0.0)
 # Find gz-cmake
 #============================================================================
 # If you get an error at this line, you need to install gz-cmake
-find_package(gz-cmake4 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
+find_package(gz-cmake REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -106,13 +105,11 @@ endif()
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
-set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
+gz_find_package(gz-utils REQUIRED COMPONENTS cli)
 
 #--------------------------------------
 # Find gz-msgs
-gz_find_package(gz-msgs11 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
+gz_find_package(gz-msgs REQUIRED)
 
 #--------------------------------------
 # Find ifaddrs

MODULE.bazel

@@ -21,18 +21,18 @@ bazel_dep(name = "gz-msgs")
 
 archive_override(
     module_name = "gz-math",
-    strip_prefix = "gz-math-gz-math8",
-    urls = ["https://github.com/gazebosim/gz-math/archive/refs/heads/gz-math8.tar.gz"],
+    strip_prefix = "gz-math-main",
+    urls = ["https://github.com/gazebosim/gz-math/archive/refs/heads/main.tar.gz"],
 )
 
 archive_override(
     module_name = "gz-utils",
-    strip_prefix = "gz-utils-gz-utils3",
-    urls = ["https://github.com/gazebosim/gz-utils/archive/refs/heads/gz-utils3.tar.gz"],
+    strip_prefix = "gz-utils-main",
+    urls = ["https://github.com/gazebosim/gz-utils/archive/refs/heads/main.tar.gz"],
 )
 
 archive_override(
     module_name = "gz-msgs",
-    strip_prefix = "gz-msgs-gz-msgs11",
-    urls = ["https://github.com/gazebosim/gz-msgs/archive/refs/heads/gz-msgs11.tar.gz"],
+    strip_prefix = "gz-msgs-main",
+    urls = ["https://github.com/gazebosim/gz-msgs/archive/refs/heads/main.tar.gz"],
 )

docker/Dockerfile

@@ -36,17 +36,17 @@ RUN /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo
  && /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -' \
  && apt-get update \
  && apt-get install -y \
-    libgz-cmake4-dev \
-    libgz-math8-dev \
-    libgz-msgs11-dev \
-    libgz-utils3-cli-dev \
+    libgz-cmake5-dev \
+    libgz-math9-dev \
+    libgz-msgs12-dev \
+    libgz-utils4-cli-dev \
     libgflags-dev \
  && apt-get clean
 
 USER ubuntu
 WORKDIR /tmp
 # Gazebo transport
-RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport14
+RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport15
 RUN cd gz-transport \
  && mkdir build \
  && cd build \

package.xml

@@ -10,12 +10,12 @@
 
   <buildtool_depend>cmake</buildtool_depend>
 
-  <build_depend>gz-cmake4</build_depend>
+  <build_depend>gz-cmake</build_depend>
 
-  <depend>gz-math8</depend>
-  <depend>gz-msgs11</depend>
+  <depend>gz-math</depend>
+  <depend>gz-msgs</depend>
   <depend>gz-tools2</depend>
-  <depend>gz-utils3</depend>
+  <depend>gz-utils</depend>
   <depend>libsqlite3-dev</depend>
   <depend>libzmq3-dev</depend>
   <depend>pkg-config</depend>

parameters/src/CMakeLists.txt

@@ -8,7 +8,7 @@ gz_add_component(
 
 target_link_libraries(${param_lib_target}
   PUBLIC
-    gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER})
+    gz-utils::gz-utils)
 
 # Unit tests
 gz_build_tests(

python/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 # Detect if we are doing a standalone build of the bindings, using an external gz-transport
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-  find_package(gz-cmake4 4.1.0 REQUIRED)
+  find_package(gz-cmake REQUIRED)
   gz_get_package_xml_version(${CMAKE_SOURCE_DIR}/../package.xml PACKAGE_XML)
   project(gz-transport-python VERSION ${PACKAGE_XML_VERSION})
   find_package(gz-transport REQUIRED)

python/examples/data_race_with_mutex.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs.vector3d_pb2 import Vector3d
 from gz.transport import Node
 
 from threading import Lock

python/examples/data_race_without_mutex.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs.vector3d_pb2 import Vector3d
 from gz.transport import Node
 
 import time

python/examples/publisher.py

@@ -14,8 +14,8 @@
 #
 
 #! [complete]
-from gz.msgs11.stringmsg_pb2 import StringMsg
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs.stringmsg_pb2 import StringMsg
+from gz.msgs.vector3d_pb2 import Vector3d
 from gz.transport import Node
 
 import time

python/examples/requester.py

@@ -14,7 +14,7 @@
 #
 
 #! [complete]
-from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs.stringmsg_pb2 import StringMsg
 from gz.transport import Node
 
 def main():

python/examples/subscriber.py

@@ -14,8 +14,8 @@
 #
 
 #! [complete]
-from gz.msgs11.stringmsg_pb2 import StringMsg
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs.stringmsg_pb2 import StringMsg
+from gz.msgs.vector3d_pb2 import Vector3d
 from gz.transport import Node
 
 import time

python/src/__init__.py

@@ -22,7 +22,7 @@
 # The "ProtoMsg" TypeVar represents an actual msg of a protobuf type.
 # On the other hand, the "ProtoMsgType" TypeVar represents the protobuf type.
 # For example, let's take the following code:
-#   from gz.msgs11.stringmsg_pb2 import StringMsg
+#   from gz.msgs.stringmsg_pb2 import StringMsg
 #   proto_msg = StringMsg()
 # The variable `proto_msg` would be the expected input for a "ProtoMsg"
 # type argument and `StringMsg` would be the expected input for a

python/test/options_TEST.py

@@ -1,4 +1,4 @@
-from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs.stringmsg_pb2 import StringMsg
 from gz.transport import Node, AdvertiseMessageOptions, SubscribeOptions, NodeOptions
 
 import unittest

python/test/pubSub_TEST.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs11.stringmsg_pb2 import StringMsg
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs.stringmsg_pb2 import StringMsg
+from gz.msgs.vector3d_pb2 import Vector3d
 from gz.transport import Node, AdvertiseMessageOptions, SubscribeOptions, TopicStatistics
 
 from threading import Lock

python/test/requester_TEST.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs11.int32_pb2 import Int32
-from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs.int32_pb2 import Int32
+from gz.msgs.stringmsg_pb2 import StringMsg
 from gz.transport import Node
 
 import os

src/CMakeLists.txt

@@ -8,8 +8,8 @@ gz_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
 # Link the libraries that we always need.
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
-    gz-msgs${GZ_MSGS_VER}::gz-msgs${GZ_MSGS_VER}
+    gz-utils::gz-utils
+    gz-msgs::gz-msgs
     CPPZMQ::CPPZMQ
   PRIVATE
     ${ZeroMQ_TARGET}

src/cmd/CMakeLists.txt

@@ -23,7 +23,7 @@ set(topic_executable gz-transport-topic)
 add_executable(${topic_executable} topic_main.cc)
 target_link_libraries(${topic_executable}
   gz
-  gz-utils${GZ_UTILS_VER}::cli
+  gz-utils::cli
   ${PROJECT_LIBRARY_TARGET_NAME}
 )
 install(TARGETS ${topic_executable} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/)
@@ -33,7 +33,7 @@ set(service_executable gz-transport-service)
 add_executable(${service_executable} service_main.cc)
 target_link_libraries(${service_executable}
   gz
-  gz-utils${GZ_UTILS_VER}::cli
+  gz-utils::cli
   ${PROJECT_LIBRARY_TARGET_NAME}
 )
 install(TARGETS ${service_executable} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/)
@@ -43,7 +43,7 @@ gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}
   TEST_LIST test_list
   LIB_DEPS
     gz
-    gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
+    gz-utils::gz-utils
     ${EXTRA_TEST_LIB_DEPS} test_config)
 
 foreach(test ${test_list})

tutorials/02_installation.md

@@ -93,7 +93,7 @@ sudo apt-get remove libgz-transport.*-dev
 
 Install prerequisites. A clean Ubuntu system will need:
 ```
-sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libgz-msgs11-dev libgz-utils3-cli-dev
+sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libgz-msgs12-dev libgz-utils4-cli-dev
 ```
 
 ### macOS

tutorials/06_python_support.md

@@ -44,15 +44,15 @@ folder and open it with your favorite editor:
 ### Walkthrough
 
 ```{.py}
-    from gz.msgs11.stringmsg_pb2 import StringMsg
-    from gz.msgs11.vector3d_pb2 import Vector3d
+    from gz.msgs.stringmsg_pb2 import StringMsg
+    from gz.msgs.vector3d_pb2 import Vector3d
     from gz.transport import Node
 ```
 
 The library `gz.transport` contains all the Gazebo Transport elements that can be
 used in Python. The final API we will use is contained inside the class `Node`.
 
-The lines `from gz.msgs11.stringmsg_pb2 import StringMsg` and `from gz.msgs11.vector3d_pb2 import Vector3d`
+The lines `from gz.msgs.stringmsg_pb2 import StringMsg` and `from gz.msgs.vector3d_pb2 import Vector3d`
 include the generated protobuf code that we are going to use for our messages.
 We are going to publish two types of messages: `StringMsg` and `Vector3d` protobuf
 messages.
@@ -109,8 +109,8 @@ file into the `gz_transport_tutorial` folder and open it with your favorite edit
 ### Walkthrough
 
 ```{.py}
-    from gz.msgs11.stringmsg_pb2 import StringMsg
-    from gz.msgs11.vector3d_pb2 import Vector3d
+    from gz.msgs.stringmsg_pb2 import StringMsg
+    from gz.msgs.vector3d_pb2 import Vector3d
     from gz.transport import Node
 ```
 
@@ -276,7 +276,7 @@ of messages published per topic.
 We can declare the throttling option using the following code :
 
 ```{.py}
-    from gz.msgs11.stringmsg_pb2 import StringMsg
+    from gz.msgs.stringmsg_pb2 import StringMsg
     from gz.transport import Node, AdvertiseMessageOptions
 
     # Create a transport node and advertise a topic with throttling enabled.
@@ -320,7 +320,7 @@ second from that particular topic.
 We can declare the throttling option using the following code :
 
 ```{.py}
-    from gz.msgs11.stringmsg_pb2 import StringMsg
+    from gz.msgs.stringmsg_pb2 import StringMsg
     from gz.transport import Node, SubscribeOptions
 
     def stringmsg_cb(msg: StringMsg):
@@ -399,7 +399,7 @@ file into the `gz_transport_tutorial` folder and open it with your favorite edit
 ### Walkthrough
 
 ```{.py}
-    from gz.msgs11.stringmsg_pb2 import StringMsg
+    from gz.msgs.stringmsg_pb2 import StringMsg
     from gz.transport import Node
 ```