From c9945453bf9def0063e40ad9265ce7b41bdb0767 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Tue, 11 Oct 2022 12:27:16 +0200
Subject: [PATCH 1/8] add variants

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0159f12..c1bae26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.0-SO-FINDO-9587-SNAPSHOT</version>
+  <version>1.8.0-SO-variants-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 

From bd4caa06f61ec6bca842caeb39b4153cebc36dda Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Tue, 11 Oct 2022 12:31:51 +0200
Subject: [PATCH 2/8] reintroduce variants

---
 src/main/resources/findologic_20.xsd | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index fdeeb86..be4fe5d 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -53,6 +53,29 @@
             <xs:element type="bonusesType" name="bonuses" minOccurs="0" maxOccurs="1"/>
             <xs:element type="sortsType" name="sorts" minOccurs="0" maxOccurs="1"/>
             <xs:element type="visibilitiesType" name="visibilities" minOccurs="0" maxOccurs="1"/>
+            <xs:element type="variantsType" name="variants" minOccurs="0" maxOccurs="1"/>
+        </xs:all>
+        <xs:attribute type="nonEmptyString" name="id" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="variantsType">
+        <xs:sequence>
+            <xs:element type="variantType" name="variant" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="variantType">
+        <xs:all>
+            <!-- Mandatory -->
+            <xs:element type="allOrdernumbersType" name="allOrdernumbers" minOccurs="1" maxOccurs="1"/>
+            <xs:element type="namesType" name="names" minOccurs="1" maxOccurs="1"/>
+            <xs:element type="pricesType" name="prices" minOccurs="1" maxOccurs="1"/>
+            <xs:element type="allAttributesType" name="allAttributes" minOccurs="1" maxOccurs="1"/>
+            <!-- Optional -->
+            <xs:element type="groupsType" name="groups" minOccurs="0" maxOccurs="1"/>
+            <xs:element type="allPropertiesType" name="allProperties" minOccurs="0" maxOccurs="1"/>
+            <xs:element type="overriddenPricesType" name="overriddenPrices" minOccurs="0" maxOccurs="1"/>
+            <xs:element type="visibilitiesType" name="visibilities" minOccurs="0" maxOccurs="1"/>
         </xs:all>
         <xs:attribute type="nonEmptyString" name="id" use="required"/>
     </xs:complexType>

From e1acd71c893ba3df48286aff9cb11ff88d876487 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Wed, 12 Oct 2022 10:52:19 +0200
Subject: [PATCH 3/8] adapt optional elements

---
 src/main/resources/findologic_20.xsd | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index be4fe5d..d954089 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -68,10 +68,10 @@
         <xs:all>
             <!-- Mandatory -->
             <xs:element type="allOrdernumbersType" name="allOrdernumbers" minOccurs="1" maxOccurs="1"/>
-            <xs:element type="namesType" name="names" minOccurs="1" maxOccurs="1"/>
-            <xs:element type="pricesType" name="prices" minOccurs="1" maxOccurs="1"/>
-            <xs:element type="allAttributesType" name="allAttributes" minOccurs="1" maxOccurs="1"/>
+            <xs:element type="variantsAttributesType" name="allAttributes" minOccurs="1" maxOccurs="1"/>
             <!-- Optional -->
+            <xs:element type="namesType" name="names" minOccurs="0" maxOccurs="1"/>
+            <xs:element type="pricesType" name="prices" minOccurs="0" maxOccurs="1"/>
             <xs:element type="groupsType" name="groups" minOccurs="0" maxOccurs="1"/>
             <xs:element type="allPropertiesType" name="allProperties" minOccurs="0" maxOccurs="1"/>
             <xs:element type="overriddenPricesType" name="overriddenPrices" minOccurs="0" maxOccurs="1"/>
@@ -156,6 +156,17 @@
             </xs:element>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="variantsAttributesType">
+        <xs:sequence>
+            <xs:element name="attributes" maxOccurs="unbounded" minOccurs="1">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element type="keyValuesPair" name="attribute" maxOccurs="unbounded" minOccurs="1"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
 
     <!-- URLs -->
     <xs:complexType name="urlsType">
@@ -335,7 +346,7 @@
 
     <xs:complexType name="overriddenPricesType">
         <xs:sequence>
-            <xs:element name="overriddenPrice" minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="overriddenPrice" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:simpleContent>
                         <xs:extension base="xs:decimal">

From fe41e4904a0b3180bf7e137893a856608fd521e9 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Wed, 12 Oct 2022 14:57:00 +0200
Subject: [PATCH 4/8] allow relative paths for url

---
 pom.xml                              |  2 +-
 src/main/resources/findologic_20.xsd | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d73ac5..a04a5c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0-SO-variants-SNAPSHOT</version>
+  <version>1.8.0-SO-variants-dev2-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 </project>
diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index 7225383..4fd0a2e 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -75,7 +75,6 @@
             <xs:element type="groupsType" name="groups" minOccurs="0" maxOccurs="1"/>
             <xs:element type="allPropertiesType" name="allProperties" minOccurs="0" maxOccurs="1"/>
             <xs:element type="overriddenPricesType" name="overriddenPrices" minOccurs="0" maxOccurs="1"/>
-            <xs:element type="visibilitiesType" name="visibilities" minOccurs="0" maxOccurs="1"/>
         </xs:all>
         <xs:attribute type="nonEmptyString" name="id" use="required"/>
     </xs:complexType>
@@ -174,7 +173,7 @@
             <xs:element name="url" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="httpURI">
+                        <xs:extension base="nonEmptyString">
                             <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -356,7 +355,7 @@
             <xs:element name="bonus" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="xs:decimal">
+                        <xs:extension base="bonusRangeType">
                             <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -365,6 +364,12 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:simpleType name="bonusRangeType">
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="-0.9"/>
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:complexType name="sortsType">
         <xs:sequence>
             <xs:element name="sort" minOccurs="0" maxOccurs="unbounded">

From 350113125042b8cfd47548f824e17084bde009fc Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Thu, 13 Oct 2022 09:37:18 +0200
Subject: [PATCH 5/8] allow absolute paths for url

---
 pom.xml                              | 2 +-
 src/main/resources/findologic_20.xsd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a04a5c6..8f54ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0-SO-variants-dev2-SNAPSHOT</version>
+  <version>1.8.0-SO-variants-dev3-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 </project>
diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index 4fd0a2e..7fbc888 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -173,7 +173,7 @@
             <xs:element name="url" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:simpleContent>
-                        <xs:extension base="nonEmptyString">
+                        <xs:extension base="httpURI">
                             <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
                         </xs:extension>
                     </xs:simpleContent>
@@ -228,7 +228,7 @@
     <!-- Simple type variations -->
     <xs:simpleType name="httpURI">
         <xs:restriction base="xs:anyURI">
-            <xs:pattern value="http[s]?://.*"/>
+            <xs:pattern value="(http[s]?:/)?/.*"/>
         </xs:restriction>
     </xs:simpleType>
 

From 7e19648d7c65c0d005c801e3aaf110b3fa1291a1 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Tue, 18 Oct 2022 09:39:10 +0200
Subject: [PATCH 6/8] simplify price type

---
 pom.xml                              |  2 +-
 src/main/resources/findologic_20.xsd | 28 ++++++++++------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index b995dfa..b948f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-FINDO-9595-SO-dev1-SNAPSHOT</version>
+  <version>2.1.0-FINDO-9595-SO-dev2-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 </project>
diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index 6d9c011..469a5a1 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -186,18 +186,18 @@
     <!-- Prices -->
     <xs:complexType name="pricesType">
         <xs:sequence>
-            <xs:element name="price" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:simpleContent>
-                        <xs:extension base="xs:decimal">
-                            <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
-                        </xs:extension>
-                    </xs:simpleContent>
-                </xs:complexType>
-            </xs:element>
+            <xs:element type="basePriceType" name="price" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="basePriceType">
+        <xs:simpleContent>
+            <xs:extension base="xs:decimal">
+                <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
     <!-- Ordernumber -->
     <xs:complexType name="allOrdernumbersType">
         <xs:sequence>
@@ -332,15 +332,7 @@
 
     <xs:complexType name="overriddenPricesType">
         <xs:sequence>
-            <xs:element name="overriddenPrice" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:simpleContent>
-                        <xs:extension base="xs:decimal">
-                            <xs:attribute type="nonEmptyString" name="usergroup" use="optional"/>
-                        </xs:extension>
-                    </xs:simpleContent>
-                </xs:complexType>
-            </xs:element>
+            <xs:element type="basePriceType" name="overriddenPrice" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 

From f95bf1f7f052a00c022cb797369a3417ce639605 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Wed, 19 Oct 2022 11:56:49 +0200
Subject: [PATCH 7/8] variants tag can be empty

---
 pom.xml                              | 2 +-
 src/main/resources/findologic_20.xsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b948f7a..2ac940c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-FINDO-9595-SO-dev2-SNAPSHOT</version>
+  <version>2.1.0-FINDO-9595-SO-dev3-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 </project>
diff --git a/src/main/resources/findologic_20.xsd b/src/main/resources/findologic_20.xsd
index 469a5a1..376ae6c 100644
--- a/src/main/resources/findologic_20.xsd
+++ b/src/main/resources/findologic_20.xsd
@@ -54,7 +54,7 @@
 
     <xs:complexType name="variantsType">
         <xs:sequence>
-            <xs:element type="variantType" name="variant" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element type="variantType" name="variant" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 

From 53442b9017de81d0f9f9b8a673729fab851925e2 Mon Sep 17 00:00:00 2001
From: Stefan Obermayer <s.obermayer@findologic.com>
Date: Wed, 19 Oct 2022 16:14:37 +0200
Subject: [PATCH 8/8] pin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ac940c..f51ed9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-FINDO-9595-SO-dev3-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
 </project>