From 0aecccdb61be2f9e30bbc8f741e57a5f25f96138 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 18 Apr 2025 22:19:26 +0100
Subject: [PATCH 1/3] Maven Build: Validate Thing-type XML against schema

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 pom.xml                                   | 23 +++++++++++++++++++++++
 src/thing-type-xml-validation-catalog.xml |  6 ++++++
 2 files changed, 29 insertions(+)
 create mode 100644 src/thing-type-xml-validation-catalog.xml

diff --git a/pom.xml b/pom.xml
index 2a0797f5156bf..6f9f4986c3560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -641,6 +641,29 @@ Import-Package: \\
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <version>1.1.0</version>
+        <configuration>
+          <validationSets>
+            <validationSet>
+              <dir>src/main/resources/OH-INF/thing/</dir>
+              <systemId>https://openhab.org/schemas/thing-description-1.0.0.xsd</systemId>
+            </validationSet>
+          </validationSets>
+          <catalogs>
+            <catalog>${session.executionRootDirectory}/src/thing-type-xml-validation-catalog.xml</catalog>
+          </catalogs>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <extensions>
       <extension>
diff --git a/src/thing-type-xml-validation-catalog.xml b/src/thing-type-xml-validation-catalog.xml
new file mode 100644
index 0000000000000..91f46b5fd265d
--- /dev/null
+++ b/src/thing-type-xml-validation-catalog.xml
@@ -0,0 +1,6 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+	<public publicId="https://openhab.org/schemas/thing-description/v1.0.0"
+		uri="thing-description-schema.xsd"/>
+	<system systemId="https://openhab.org/schemas/thing-description-1.0.0.xsd"
+		uri="thing-description-schema.xsd"/>
+</catalog>

From 02b3afdd634af346a4fec2ba911a6245dae947c7 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 18 Apr 2025 22:33:34 +0100
Subject: [PATCH 2/3] spotless

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 src/thing-type-xml-validation-catalog.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/thing-type-xml-validation-catalog.xml b/src/thing-type-xml-validation-catalog.xml
index 91f46b5fd265d..694ec0ea2b476 100644
--- a/src/thing-type-xml-validation-catalog.xml
+++ b/src/thing-type-xml-validation-catalog.xml
@@ -1,6 +1,4 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-	<public publicId="https://openhab.org/schemas/thing-description/v1.0.0"
-		uri="thing-description-schema.xsd"/>
-	<system systemId="https://openhab.org/schemas/thing-description-1.0.0.xsd"
-		uri="thing-description-schema.xsd"/>
+	<public publicId="https://openhab.org/schemas/thing-description/v1.0.0" uri="thing-description-schema.xsd"/>
+	<system systemId="https://openhab.org/schemas/thing-description-1.0.0.xsd" uri="thing-description-schema.xsd"/>
 </catalog>

From aaabe6cc7459bbfc30f7e35244bc140cb0a3bc43 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 18 Apr 2025 22:56:41 +0100
Subject: [PATCH 3/3] fix path

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f9f4986c3560..0c1b9cc1d4598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -648,7 +648,8 @@ Import-Package: \\
         <configuration>
           <validationSets>
             <validationSet>
-              <dir>src/main/resources/OH-INF/thing/</dir>
+              <dir>${session.executionRootDirectory}</dir>
+              <includes>**/src/main/resources/OH-INF/thing/*.xml</includes>
               <systemId>https://openhab.org/schemas/thing-description-1.0.0.xsd</systemId>
             </validationSet>
           </validationSets>