From 93888f306d010434bec7d00f8f379f1ce4abd205 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 15:34:21 +0200
Subject: [PATCH] Squashed 'src/module_anc/' changes from 8f732f9..ab8db90
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ab8db90 Update dependency.xml
3c167ff Ajout de la dépendance au schema cadastre
d374201 Update dependency.xml
80ef848 Update dependency.xml
b05764f Update dependency.xml
54d83af Update dependency.xml
12a17e1 Change dependencies model
a18be2f Chamge dependencies model

git-subtree-dir: src/module_anc
git-subtree-split: ab8db901058d10576d55f9972f1980d1928fbf11
---
 .../_install => _install}/dependency.xml      | 61 +++++++++++--------
 module/_install/dependency.xml                | 20 ------
 2 files changed, 34 insertions(+), 47 deletions(-)
 rename {web_service/_install => _install}/dependency.xml (61%)
 delete mode 100755 module/_install/dependency.xml

diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 61%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
index b9dc841e..7c9fc2f8 100755
--- a/web_service/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,27 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS ANC -->
-<installer>
-	<schema>
-		<name>s_anc</name>
-		<version>2018.02.00</version>
-		<dependenciesCollection>
-			<dependency>
-				<nature>schema</nature>
-				<name>s_vitis</name>
-				<version>2018.03.00</version>
-				<object>vas</object>
-			</dependency>
-			<dependency>
-				<name>postgis</name>
-				<version>2.0</version>
-				<nature>extern-pre</nature>
-			</dependency>
-		</dependenciesCollection>
-	</schema>
-	<dependenciesCollection>
-		<dependency>
-			<nature>vas</nature>
-			<version>2018.03.00</version>
-		</dependency>
-	</dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS ANC -->
+<installer>
+	<schema>
+		<name>s_anc</name>
+		<dependenciesCollection>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_vitis</name>
+				<object>vitis</object>
+			</dependency>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_cadastre</name>
+				<object>module_cadastreV2</object>
+			</dependency>
+			<dependency>
+				<name>postgis</name>
+				<version>2.0</version>
+				<nature>extern-pre</nature>
+			</dependency>
+		</dependenciesCollection>
+	</schema>
+	<dependenciesCollection>
+		<dependency>
+			<nature>framework</nature>
+			<name>vitis</name>
+		</dependency>
+		<dependency>
+			<nature>modules</nature>
+			<name>module_vmap</name>
+		</dependency>
+	</dependenciesCollection>
+</installer>
diff --git a/module/_install/dependency.xml b/module/_install/dependency.xml
deleted file mode 100755
index 889d6d3c..00000000
--- a/module/_install/dependency.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Module vMap -->
-<installer>
-	<dependenciesCollection>
-		<dependency>
-			<nature>core</nature>
-			<version>2018.03.00</version>
-		</dependency>
-		<dependency>
-			<nature>web_services</nature>
-			<name>vmap</name>
-			<version>2018.02.00</version>
-		</dependency>
-		<dependency>
-			<nature>web_services</nature>
-			<name>anc</name>
-			<version>2018.02.00</version>
-		</dependency>
-	</dependenciesCollection>
-</installer>
-- 
GitLab