From 61a139aeb242bac1f2d723f005e5b10c20698896 Mon Sep 17 00:00:00 2001
From: remillet <remillet@yahoo.com>
Date: Sat, 27 Jan 2018 19:05:53 -0800
Subject: [PATCH] NOJIRA: For Windows builds, replaced 'mvn.bat' exec in Ant
 files to 'mvn' for compat with Windows 10.

---
 .../nuxeo/nuxeo-platform-listener/botgarden/build.xml     | 4 ++--
 services/claim/3rdparty/build.xml                         | 8 ++++----
 services/claim/3rdparty/nuxeo-platform-cs-claim/build.xml | 8 ++++----
 services/claim/build.xml                                  | 8 ++++----
 services/pottag/3rdparty/build.xml                        | 8 ++++----
 .../pottag/3rdparty/nuxeo-platform-cs-pottag/build.xml    | 8 ++++----
 services/pottag/build.xml                                 | 8 ++++----
 services/propagation/3rdparty/build.xml                   | 8 ++++----
 .../3rdparty/nuxeo-platform-cs-propagation/build.xml      | 8 ++++----
 services/propagation/build.xml                            | 8 ++++----
 10 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml
index cc31cc061..b8d2e3003 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml
@@ -51,7 +51,7 @@
   <target name="package-windows" if="osfamily-windows">
     <exec executable="cmd" failonerror="true">
       <arg value="/c" />
-      <arg value="mvn.bat" />
+      <arg value="mvn" />
       <arg value="package" />
       <arg value="-Dmaven.test.skip=true" />
       <arg value="-f" />
@@ -76,7 +76,7 @@
   <target name="install-windows" if="osfamily-windows">
     <exec executable="cmd" failonerror="true">
       <arg value="/c" />
-      <arg value="mvn.bat" />
+      <arg value="mvn" />
       <arg value="install" />
       <arg value="-Dmaven.test.skip=true" />
       <arg value="-f" />
diff --git a/services/claim/3rdparty/build.xml b/services/claim/3rdparty/build.xml
index de90188f9..9de96e195 100644
--- a/services/claim/3rdparty/build.xml
+++ b/services/claim/3rdparty/build.xml
@@ -38,7 +38,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -63,7 +63,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -86,7 +86,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -102,7 +102,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/claim/3rdparty/nuxeo-platform-cs-claim/build.xml b/services/claim/3rdparty/nuxeo-platform-cs-claim/build.xml
index a91010701..7c6064957 100644
--- a/services/claim/3rdparty/nuxeo-platform-cs-claim/build.xml
+++ b/services/claim/3rdparty/nuxeo-platform-cs-claim/build.xml
@@ -48,7 +48,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -73,7 +73,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -96,7 +96,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -112,7 +112,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/claim/build.xml b/services/claim/build.xml
index 8fe8c2e59..0209d1561 100644
--- a/services/claim/build.xml
+++ b/services/claim/build.xml
@@ -35,7 +35,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -61,7 +61,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -84,7 +84,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -100,7 +100,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/pottag/3rdparty/build.xml b/services/pottag/3rdparty/build.xml
index 72135dba5..3fac12035 100644
--- a/services/pottag/3rdparty/build.xml
+++ b/services/pottag/3rdparty/build.xml
@@ -38,7 +38,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -63,7 +63,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -86,7 +86,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -102,7 +102,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/build.xml b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/build.xml
index e8e53b41f..2d09e851a 100644
--- a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/build.xml
+++ b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/build.xml
@@ -49,7 +49,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -74,7 +74,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -97,7 +97,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -113,7 +113,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/pottag/build.xml b/services/pottag/build.xml
index e8b0d728c..c6d35c13c 100644
--- a/services/pottag/build.xml
+++ b/services/pottag/build.xml
@@ -35,7 +35,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -61,7 +61,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -84,7 +84,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -100,7 +100,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/propagation/3rdparty/build.xml b/services/propagation/3rdparty/build.xml
index 62850ac73..24d2bbffe 100644
--- a/services/propagation/3rdparty/build.xml
+++ b/services/propagation/3rdparty/build.xml
@@ -38,7 +38,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -63,7 +63,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -86,7 +86,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -102,7 +102,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/build.xml b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/build.xml
index d8c32c28b..a12c44fac 100644
--- a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/build.xml
+++ b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/build.xml
@@ -49,7 +49,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -74,7 +74,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -97,7 +97,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -113,7 +113,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
diff --git a/services/propagation/build.xml b/services/propagation/build.xml
index 4b1fc69eb..5a016c1e7 100644
--- a/services/propagation/build.xml
+++ b/services/propagation/build.xml
@@ -35,7 +35,7 @@
     <target name="package-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -61,7 +61,7 @@
     <target name="install-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -84,7 +84,7 @@
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="clean" />
             <arg value="${mvn.opts}" />
         </exec>
@@ -100,7 +100,7 @@
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
-            <arg value="mvn.bat" />
+            <arg value="mvn" />
             <arg value="test" />
             <arg value="${mvn.opts}" />
         </exec>
-- 
2.47.3