From 3e8e51687f59c74146697af96621da583c0d962e Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Mon, 3 Jun 2019 16:55:16 +0200
Subject: [PATCH] Use next_version branches
---
.gitmodules | 20 ++++++++++----------
conf/_install/dependency.xml | 12 ++++++------
install.sh | 2 +-
src/module_anc | 2 +-
src/module_cadastre | 2 +-
src/module_cadastreV2 | 2 +-
src/module_vm4ms | 2 +-
src/module_vmap | 2 +-
src/vitis | 2 +-
utils | 2 +-
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 2611c3e4..f77a02a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,11 @@
+[submodule "utils"]
+ path = utils
+ url = git@gitlab.veremes.net:Development/vitis_apps/sources/utils.git
+ branch = submodules
[submodule "src/vitis"]
path = src/vitis
url = git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git
- branch = app_vmap
+ branch = next_app_vmap
[submodule "src/closure"]
path = src/closure
url = git@gitlab.veremes.net:Development/vitis_apps/sources/closure.git
@@ -9,24 +13,20 @@
[submodule "src/module_vmap"]
path = src/module_vmap
url = git@gitlab.veremes.net:Development/vitis_apps/sources/module_vmap.git
- branch = app_vmap
+ branch = next_app_vmap
[submodule "src/module_vm4ms"]
path = src/module_vm4ms
url = git@gitlab.veremes.net:Development/vitis_apps/sources/module_vm4ms.git
- branch = app_vmap
+ branch = next_app_vmap
[submodule "src/module_anc"]
path = src/module_anc
url = git@gitlab.veremes.net:Development/vitis_apps/sources/module_anc.git
- branch = app_vmap
+ branch = next_app_vmap
[submodule "src/module_cadastreV2"]
path = src/module_cadastreV2
url = git@gitlab.veremes.net:Development/vitis_apps/sources/module_cadastreV2.git
- branch = app_vmap
+ branch = next_app_vmap
[submodule "src/module_cadastre"]
path = src/module_cadastre
url = git@gitlab.veremes.net:Development/vitis_apps/sources/module_cadastre.git
- branch = app_vmap
-[submodule "utils"]
- path = utils
- url = git@gitlab.veremes.net:Development/vitis_apps/sources/utils.git
- branch = master
+ branch = next_app_vmap
diff --git a/conf/_install/dependency.xml b/conf/_install/dependency.xml
index 14366ebb..43b51ea0 100755
--- a/conf/_install/dependency.xml
+++ b/conf/_install/dependency.xml
@@ -5,32 +5,32 @@
<dependency>
<nature>framework</nature>
<name>vitis</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
<dependency>
<nature>modules</nature>
<name>module_vmap</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
<dependency>
<nature>modules</nature>
<name>module_vm4ms</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
<dependency>
<nature>modules</nature>
<name>module_anc</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
<dependency>
<nature>modules</nature>
<name>module_cadastreV2</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
<dependency>
<nature>modules</nature>
<name>module_cadastre</name>
- <version>app_vmap</version>
+ <version>next_app_vmap</version>
</dependency>
</dependenciesCollection>
</installer>
diff --git a/install.sh b/install.sh
index cb6c49f8..4cd39703 100755
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,7 @@ if [ `whoami` == "root" ]; then
else
# Ajoute utils
- git submodule add -f -b master "git@gitlab.veremes.net:Development/vitis_apps/sources/utils.git" utils
+ git submodule add -f -b submodules "git@gitlab.veremes.net:Development/vitis_apps/sources/utils.git" utils
cd utils/
./init_submodules.sh
diff --git a/src/module_anc b/src/module_anc
index 0cf52e6f..d1bf1627 160000
--- a/src/module_anc
+++ b/src/module_anc
@@ -1 +1 @@
-Subproject commit 0cf52e6f1db024aa73b3cb78fec9837d8ea5b19d
+Subproject commit d1bf16276628a616e62f28b6b5ecbad4b89eec36
diff --git a/src/module_cadastre b/src/module_cadastre
index 339e591d..e762055c 160000
--- a/src/module_cadastre
+++ b/src/module_cadastre
@@ -1 +1 @@
-Subproject commit 339e591dc7f291df00e30931751aa0d09e7542eb
+Subproject commit e762055c44509cabad060e38f1f1a277d3c6a8cb
diff --git a/src/module_cadastreV2 b/src/module_cadastreV2
index 9e50b388..156653f0 160000
--- a/src/module_cadastreV2
+++ b/src/module_cadastreV2
@@ -1 +1 @@
-Subproject commit 9e50b388bb25ff2373811b4a57e01acd3e62dc66
+Subproject commit 156653f0bda78ef7dd75e4e0a11fd503896b9182
diff --git a/src/module_vm4ms b/src/module_vm4ms
index ce794d0e..8fa9259f 160000
--- a/src/module_vm4ms
+++ b/src/module_vm4ms
@@ -1 +1 @@
-Subproject commit ce794d0edd707b54b0a8d218457a39c52d0a6289
+Subproject commit 8fa9259f2cade1af85c162d1744bc695d362fb20
diff --git a/src/module_vmap b/src/module_vmap
index eb3b92e2..9b483509 160000
--- a/src/module_vmap
+++ b/src/module_vmap
@@ -1 +1 @@
-Subproject commit eb3b92e29d3f549495cd3623298aa14d204ab133
+Subproject commit 9b48350988367e6c4d0844f6d57c73c51b9c0f4f
diff --git a/src/vitis b/src/vitis
index c4f93254..65153208 160000
--- a/src/vitis
+++ b/src/vitis
@@ -1 +1 @@
-Subproject commit c4f932544ed052c98afe4440316e089a98566355
+Subproject commit 65153208ecc5b8773616966521b64568507c7d03
diff --git a/utils b/utils
index 1b645a46..3ec5bd1d 160000
--- a/utils
+++ b/utils
@@ -1 +1 @@
-Subproject commit 1b645a46d270cd5a81d5a00013214be09847fbcd
+Subproject commit 3ec5bd1d572cf6b592d13cf0fb330dbb80705ce3
--
GitLab