NOJIRA: For Windows builds, replaced 'mvn.bat' exec in Ant files to 'mvn' for compat...

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/build.xml
index cc31cc06102d7fd4829d5ac61d9eb4ef8a9cc6d0..b8d2e30036eb43487fa5804bafbe200e890b7046 100644 (file)
--- 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 de90188f997bb7827e4ed4b1e6118dfc2b6165da..9de96e195d659ffeb42e83c19fd23434856109d3 100644 (file)
--- 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 a910107017143efa827ffefbb1a5646847501a10..7c6064957c084f77cd4a7a99101beb8521843996 100644 (file)
--- 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 8fe8c2e59db3f6f0249cd2b425eb61b2ba86d1c8..0209d156106aacc154782cc6a43590a8e3903290 100644 (file)
--- 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 72135dba5919f44787a97debb7810286430bfb8e..3fac120358f98e393fa0e68480665464fae6320e 100644 (file)
--- 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 e8e53b41fadc792b6cc283510c766dcf3be9c97b..2d09e851a21e6195e96badaa4ba769ff41d7e402 100644 (file)
--- 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 e8b0d728c9ad8d69ac25f3c9b86e6cfff2c201f7..c6d35c13cbe537baf23f2849fbf7e2376c4e912b 100644 (file)
--- 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 62850ac7362efbfd279114c91901ea0b1505ce23..24d2bbffe1bce6c31eb10731904562d295f7d5bd 100644 (file)
--- 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 d8c32c28be5fe664ffa4f98c32896ae453c686bb..a12c44face091b0552fd58a27186c4ee6324f538 100644 (file)
--- 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 4b1fc69ebb7cbaab503503bc66b1cfaf73792bc7..5a016c1e7d8788cd44cff04b1b91a2f1eac338e7 100644 (file)
--- 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>