From b80091391ef42f8b7434ddab5a2f562729f95925 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Mon, 18 Mar 2024 17:05:25 -0500
Subject: [PATCH 1/3] Add package.xml

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/workflows/package_xml.yml | 20 ++++++++++++++++++++
 package.xml                       | 27 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 .github/workflows/package_xml.yml
 create mode 100644 package.xml

diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
new file mode 100644
index 000000000..5b5c6d885
--- /dev/null
+++ b/.github/workflows/package_xml.yml
@@ -0,0 +1,20 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: package.xml and CMake versions match
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Check versions
+        run: |
+          echo "Extract version numbers and compare"
+          package_xml_version=$(sed -nE 's/\s*<version>([0-9.]*)<\/version>\s*/\1/p' package.xml)
+          echo "Version in package.xml: ${package_xml_version}"
+          cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt)
+          echo "Version in CMake: ${cmake_version}"
+          [ $package_xml_version = $cmake_version ]
diff --git a/package.xml b/package.xml
new file mode 100644
index 000000000..2763ed8cc
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package format="2">
+  <name>gz-physics7</name>
+  <version>7.1.0</version>
+  <description>Gazebo Physics : Physics classes and functions for robot applications</description>
+  <maintainer email="scpeters@openrobotics.org">Steve Peters</maintainer>
+  <license>Apache License 2.0</license>
+  <url type="website">https://github.com/gazebosim/gz-physics</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <build_depend>gz-cmake</build_depend>
+
+  <depend>benchmark</depend>
+  <depend>bullet</depend>
+  <depend>dartsim</depend>
+  <depend>eigen</depend>
+  <depend>gz-common5</depend>
+  <depend>gz-math7</depend>
+  <depend>gz-plugin2</depend>
+  <depend>gz-utils2</depend>
+  <depend>sdformat14</depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>

From 26da03e52fcb86682be45f0e836a0731a1de2881 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Wed, 10 Apr 2024 14:42:20 -0500
Subject: [PATCH 2/3] Update version

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/workflows/package_xml.yml | 13 ++-----------
 package.xml                       |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
index 5b5c6d885..4bd4a9aa0 100644
--- a/.github/workflows/package_xml.yml
+++ b/.github/workflows/package_xml.yml
@@ -6,15 +6,6 @@ on:
 jobs:
   package-xml:
     runs-on: ubuntu-latest
-    name: package.xml and CMake versions match
+    name: Validate package.xml
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Check versions
-        run: |
-          echo "Extract version numbers and compare"
-          package_xml_version=$(sed -nE 's/\s*<version>([0-9.]*)<\/version>\s*/\1/p' package.xml)
-          echo "Version in package.xml: ${package_xml_version}"
-          cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt)
-          echo "Version in CMake: ${cmake_version}"
-          [ $package_xml_version = $cmake_version ]
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
diff --git a/package.xml b/package.xml
index 2763ed8cc..6e3e06565 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>gz-physics7</name>
-  <version>7.1.0</version>
+  <version>7.2.0</version>
   <description>Gazebo Physics : Physics classes and functions for robot applications</description>
   <maintainer email="scpeters@openrobotics.org">Steve Peters</maintainer>
   <license>Apache License 2.0</license>

From df390df0f936bc5cacb5bfd15d52e49226763eb8 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Fri, 3 May 2024 13:23:43 -0500
Subject: [PATCH 3/3] Address reviewer feedback

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 package.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.xml b/package.xml
index 6e3e06565..964ebee39 100644
--- a/package.xml
+++ b/package.xml
@@ -9,11 +9,11 @@
 
   <buildtool_depend>cmake</buildtool_depend>
 
-  <build_depend>gz-cmake</build_depend>
+  <build_depend>gz-cmake3</build_depend>
 
   <depend>benchmark</depend>
   <depend>bullet</depend>
-  <depend>dartsim</depend>
+  <depend>DART</depend>
   <depend>eigen</depend>
   <depend>gz-common5</depend>
   <depend>gz-math7</depend>