From cded9a992c0f7c3bb5f07c3b823b386061d2c852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oph=C3=A9lie=20Rogel?= <ophelie.rogel@gmail.com>
Date: Tue, 6 Sep 2022 10:54:41 +0200
Subject: [PATCH 1/4] adding typeOfControl attribute into control

---
 pom.xml                                     | 2 +-
 src/main/resources/xsd/LunaticModel.xsd     | 8 +++++++-
 src/main/resources/xsd/LunaticModelFlat.xsd | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97ff1bcd..e95dcdce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.13</version>
+	<version>2.2.14-rc</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>http://www.insee.fr</url>
diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
index af327c00..7a63ac51 100644
--- a/src/main/resources/xsd/LunaticModel.xsd
+++ b/src/main/resources/xsd/LunaticModel.xsd
@@ -537,7 +537,6 @@
             <xs:enumeration value="DETACHABLE"/>
         </xs:restriction>
     </xs:simpleType>
-
     <xs:complexType name="ControlType">
         <xs:sequence>
             <xs:element name="control" type="labelType"/>
@@ -545,6 +544,7 @@
             <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" />
+        <xs:attribute name="typeOfControl" type="ControlTypeOfControlEnum"/>
         <xs:attribute name="criticality" type="ControlCriticityEnum"/>
     </xs:complexType>
     <xs:simpleType name="ControlCriticityEnum">
@@ -554,6 +554,12 @@
             <xs:enumeration value="ERROR"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="ControlTypeOfControlEnum">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="FORMAT"/>
+            <xs:enumeration value="COHERENCE"/>
+        </xs:restriction>
+    </xs:simpleType>
     
     <xs:complexType name="CleaningType">
         <xs:sequence maxOccurs="unbounded">
diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
index 6cbeac98..49e51237 100644
--- a/src/main/resources/xsd/LunaticModelFlat.xsd
+++ b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -540,6 +540,7 @@
             <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" />
+        <xs:attribute name="typeOfControl" type="ControlTypeOfControlEnum"/>
         <xs:attribute name="criticality" type="ControlCriticityEnum"/>
     </xs:complexType>
     <xs:simpleType name="ControlCriticityEnum">
@@ -549,6 +550,12 @@
             <xs:enumeration value="ERROR"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="ControlTypeOfControlEnum">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="FORMAT"/>
+            <xs:enumeration value="COHERENCE"/>
+        </xs:restriction>
+    </xs:simpleType>
     
     <xs:complexType name="CleaningType">
         <xs:sequence maxOccurs="unbounded">

From 3597683fc23661ee00f9c692817d10ce1aaabbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oph=C3=A9lie=20Rogel?= <ophelie.rogel@gmail.com>
Date: Tue, 6 Sep 2022 11:08:04 +0200
Subject: [PATCH 2/4] renaming typeOfControl : COHERENCE -> CONSISTENCY

---
 src/main/resources/xsd/LunaticModel.xsd     | 2 +-
 src/main/resources/xsd/LunaticModelFlat.xsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
index 7a63ac51..5b4da2b6 100644
--- a/src/main/resources/xsd/LunaticModel.xsd
+++ b/src/main/resources/xsd/LunaticModel.xsd
@@ -557,7 +557,7 @@
     <xs:simpleType name="ControlTypeOfControlEnum">
         <xs:restriction base="xs:token">
             <xs:enumeration value="FORMAT"/>
-            <xs:enumeration value="COHERENCE"/>
+            <xs:enumeration value="CONSISTENCY"/>
         </xs:restriction>
     </xs:simpleType>
     
diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
index 49e51237..a490618a 100644
--- a/src/main/resources/xsd/LunaticModelFlat.xsd
+++ b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -553,7 +553,7 @@
     <xs:simpleType name="ControlTypeOfControlEnum">
         <xs:restriction base="xs:token">
             <xs:enumeration value="FORMAT"/>
-            <xs:enumeration value="COHERENCE"/>
+            <xs:enumeration value="CONSISTENCY"/>
         </xs:restriction>
     </xs:simpleType>
     

From 6d8b1b93a1e5527125842b48fbf91c40e31b9e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oph=C3=A9lie=20Bibonne?=
 <59668260+ORogel@users.noreply.github.com>
Date: Wed, 19 Oct 2022 12:36:20 +0200
Subject: [PATCH 3/4] upgrade version

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

diff --git a/pom.xml b/pom.xml
index e95dcdce..49b8c9c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.14-rc</version>
+	<version>2.3.0</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>http://www.insee.fr</url>

From afd0f1b420eb2953b3bcfb350019bcf5463872bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oph=C3=A9lie=20Bibonne?=
 <59668260+ORogel@users.noreply.github.com>
Date: Wed, 19 Oct 2022 12:57:23 +0200
Subject: [PATCH 4/4] upgrading version

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

diff --git a/pom.xml b/pom.xml
index 49b8c9c8..188ace79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.3.0</version>
+	<version>2.3.1</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>http://www.insee.fr</url>