From 0a4264c26ac2e8f9c782dc10624a7735740c0925 Mon Sep 17 00:00:00 2001
From: sgalland <stephane.galland@utbm.fr>
Date: Wed, 23 Oct 2013 20:49:23 +0200
Subject: [PATCH] Remove the auto-update of the Android manifest from Maven.
 This feature cannot be used when the project is deployed.

---
 neteditor-androidpanel/pom.xml        | 7 ++++---
 neteditor-fsm/fsm-droideditor/pom.xml | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/neteditor-androidpanel/pom.xml b/neteditor-androidpanel/pom.xml
index a10d05e..ba6a38e 100644
--- a/neteditor-androidpanel/pom.xml
+++ b/neteditor-androidpanel/pom.xml
@@ -81,8 +81,9 @@
 					</emulator>
 				</configuration>
 				<extensions>true</extensions>
-				<!-- Update the Manifest according to currenty Maven configuration -->
-				<executions>
+				<!-- Update the Manifest according to currenty Maven configuration.
+				     This configuration does not work on the CLI when deploying. -->
+				<!--<executions>
 					<execution>
 						<id>update-manifest</id>
 						<phase>process-resources</phase>
@@ -95,7 +96,7 @@
 							</manifest>
 						</configuration>
 					</execution>
-				</executions>
+				</executions>-->
 			</plugin>
 		</plugins>
 	</build>
diff --git a/neteditor-fsm/fsm-droideditor/pom.xml b/neteditor-fsm/fsm-droideditor/pom.xml
index a9f9574..1901530 100644
--- a/neteditor-fsm/fsm-droideditor/pom.xml
+++ b/neteditor-fsm/fsm-droideditor/pom.xml
@@ -84,8 +84,9 @@
 					</emulator>
 				</configuration>
 				<extensions>true</extensions>
-				<!-- Update the Manifest according to currenty Maven configuration -->
-				<executions>
+				<!-- Update the Manifest according to currenty Maven configuration.
+				     This configuration does not work on the CLI when deploying. -->
+				<!--<executions>
 					<execution>
 						<id>update-manifest</id>
 						<phase>process-resources</phase>
@@ -98,7 +99,7 @@
 							</manifest>
 						</configuration>
 					</execution>
-				</executions>
+				</executions>-->
 			</plugin>
 		</plugins>
 	</build>