From 9f7cd324d8717161bbfed98c116b29088639652b Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Thu, 31 Jul 2025 23:59:41 +0100
Subject: [PATCH 1/3] work in progress

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../schema/thing/thing-description-1.0.0.xsd             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
index a6c18b8cae1..d48175f7bb1 100644
--- a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
+++ b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
@@ -216,8 +216,9 @@
 
 	<xs:complexType name="tags">
 		<xs:sequence>
-			<xs:element name="tag" type="thing-description:semanticPropertyOrPointTag" minOccurs="1" maxOccurs="2"/>
+			<xs:element name="tag" type="xs:string" minOccurs="1" maxOccurs="2"/>
 		</xs:sequence>
+		<xs:assert test="count(tag[. = $semanticPointTag]) = 1 and count(tag[. = $semanticPropertyTag]) > 0"/>
 	</xs:complexType>
 
 	<xs:complexType name="state">
@@ -271,7 +272,7 @@
 		</xs:simpleContent>
 	</xs:complexType>
 
-	<xs:simpleType name="semanticPropertyOrPointTag">
+	<xs:simpleType name="semanticPropertyTag">
 		<xs:restriction base="xs:string">
 			<!-- Begin Allowed Semantic Property Tag Values -->
 			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
@@ -339,7 +340,11 @@
 			<xs:enumeration value="Water"/>
 			<xs:enumeration value="Wind"/>
 			<!-- End Allowed Semantic Property Tag Values -->
+		</xs:restriction>
+	</xs:simpleType>
 
+	<xs:simpleType name="semanticPointTag">
+		<xs:restriction base="xs:string">
 			<!-- Begin Allowed Semantic Point Tag Values -->
 			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
 			<xs:enumeration value="Alarm"/>

From 96a23c073ffe6b28701b7bce7d2f8c972c398d6a Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 1 Aug 2025 12:20:09 +0100
Subject: [PATCH 2/3] initial contribution

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../schema/thing/thing-description-1.0.0.xsd        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
index d48175f7bb1..123793f74be 100644
--- a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
+++ b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
@@ -2,7 +2,9 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:thing-description="https://openhab.org/schemas/thing-description/v1.0.0"
 	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
-	targetNamespace="https://openhab.org/schemas/thing-description/v1.0.0">
+	targetNamespace="https://openhab.org/schemas/thing-description/v1.0.0"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+	vc:minVersion="1.1">
 
 	<xs:import namespace="https://openhab.org/schemas/config-description/v1.0.0"
 		schemaLocation="https://openhab.org/schemas/config-description-1.0.0.xsd"/>
@@ -215,10 +217,11 @@
 	</xs:complexType>
 
 	<xs:complexType name="tags">
-		<xs:sequence>
-			<xs:element name="tag" type="xs:string" minOccurs="1" maxOccurs="2"/>
-		</xs:sequence>
-		<xs:assert test="count(tag[. = $semanticPointTag]) = 1 and count(tag[. = $semanticPropertyTag]) > 0"/>
+            <xs:element name="tag" minOccurs="1" maxOccurs="2">
+                <xs:alternative test="position() = 1" type="thing-description:semanticPointTag"/>
+                <xs:alternative test="position() = 2" type="thing-description:semanticPropertyTag"/>
+                <xs:alternative type="xs:error"/> <!-- If more than two tags are present -->
+            </xs:element>
 	</xs:complexType>
 
 	<xs:complexType name="state">

From 2b4ad5e80837334e9ed1f231469106b72aaefdd0 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 1 Aug 2025 12:57:54 +0100
Subject: [PATCH 3/3] use ai to improve

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../schema/thing/thing-description-1.0.0.xsd      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
index 123793f74be..3e5b808d0be 100644
--- a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
+++ b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
@@ -217,11 +217,16 @@
 	</xs:complexType>
 
 	<xs:complexType name="tags">
-            <xs:element name="tag" minOccurs="1" maxOccurs="2">
-                <xs:alternative test="position() = 1" type="thing-description:semanticPointTag"/>
-                <xs:alternative test="position() = 2" type="thing-description:semanticPropertyTag"/>
-                <xs:alternative type="xs:error"/> <!-- If more than two tags are present -->
-            </xs:element>
+		<xs:sequence>
+			<xs:element name="tag">
+				<xs:alternative test="position() = 1" type="thing-description:semanticPointTag"/>
+				<xs:alternative type="xs:error"/>
+			</xs:element>
+			<xs:element name="tag" minOccurs="0">
+				<xs:alternative test="position() = 2" type="thing-description:semanticPropertyTag"/>
+				<xs:alternative type="xs:error"/>
+			</xs:element>
+		</xs:sequence>
 	</xs:complexType>
 
 	<xs:complexType name="state">