From cbb257b19e3ca2f597eaaffc8c5898d9f1d78427 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Mon, 18 Mar 2024 17:50:39 -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                       | 55 +++++++++++++++++++++++++++++++
 2 files changed, 75 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 0000000000..5b5c6d8856
--- /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 0000000000..dd92b566c2
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>gz-sim</name>
+  <version>8.2.0</version>
+  <description>Gazebo Sim : A Robotic Simulator</description>
+  <maintainer email="mjcarroll@intrinsic.ai">Michael Carroll</maintainer>
+  <license>Apache License 2.0</license>
+  <url type="website">https://github.com/gazebosim/gz-sim</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <depend>benchmark</depend>
+  <depend>glut</depend>
+  <depend>gz-cmake3</depend>
+  <depend>gz-common5</depend>
+  <depend>gz-fuel-tools9</depend>
+  <depend>gz-gui8</depend>
+  <depend>gz-math7</depend>
+  <depend>gz-msgs10</depend>
+  <depend>gz-physics7</depend>
+  <depend>gz-plugin2</depend>
+  <depend>gz-rendering8</depend>
+  <depend>gz-sensors8</depend>
+  <depend>gz-tools2</depend>
+  <depend>gz-transport13</depend>
+  <depend>gz-utils2</depend>
+  <depend>libfreeimage-dev</depend>
+  <depend>libglew-dev</depend>
+  <depend>libxi-dev</depend>
+  <depend>libxmu-dev</depend>
+  <depend>protobuf-dev</depend>
+  <depend>pybind11-dev</depend>
+  <depend>python3-distutils</depend>
+  <depend>qml-module-qt-labs-folderlistmodel</depend>
+  <depend>qml-module-qt-labs-settings</depend>
+  <depend>qml-module-qtgraphicaleffects</depend>
+  <depend>qml-module-qtquick-controls2</depend>
+  <depend>qml-module-qtquick-controls</depend>
+  <depend>qml-module-qtquick-dialogs</depend>
+  <depend>qml-module-qtquick-layouts</depend>
+  <depend>qml-module-qtquick2</depend>
+  <depend>qtbase5-dev</depend>
+  <depend>qtdeclarative5-dev</depend>
+  <depend>sdformat14</depend>
+  <depend>tinyxml2</depend>
+  <depend>uuid</depend>
+
+  <test_depend>xvfb</test_depend>
+  <test_depend>python3-pytest</test_depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>

From 1b3977df3bc3b13f8b71fb6ce9efef661929cb89 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Mon, 18 Mar 2024 17:54:26 -0500
Subject: [PATCH 2/3] Fix package name to include version number

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

diff --git a/package.xml b/package.xml
index dd92b566c2..de4a83c16c 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-sim</name>
+  <name>gz-sim8</name>
   <version>8.2.0</version>
   <description>Gazebo Sim : A Robotic Simulator</description>
   <maintainer email="mjcarroll@intrinsic.ai">Michael Carroll</maintainer>

From 09cfb440ae77b500de185347c7233f34c6ff430d Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Thu, 11 Apr 2024 12:53:45 -0500
Subject: [PATCH 3/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 5b5c6d8856..4bd4a9aa0b 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 de4a83c16c..4c4ef248d4 100644
--- a/package.xml
+++ b/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>gz-sim8</name>
-  <version>8.2.0</version>
+  <version>8.3.0</version>
   <description>Gazebo Sim : A Robotic Simulator</description>
   <maintainer email="mjcarroll@intrinsic.ai">Michael Carroll</maintainer>
   <license>Apache License 2.0</license>