From 904d5a87babf1f081efbafbd7fc8bef7e1ad60c2 Mon Sep 17 00:00:00 2001
From: BoykoAlex <aboyko@pivotal.io>
Date: Mon, 31 Oct 2016 13:17:00 -0400
Subject: [PATCH] Regenerate maven wrapper for test project

---
 .../.mvn/wrapper/maven-wrapper.jar            | Bin 49502 -> 49519 bytes
 .../.mvn/wrapper/maven-wrapper.properties     |   2 +-
 .../custom-properties-boot-project/mvnw       |  25 ++++++++++--------
 .../custom-properties-boot-project/mvnw.cmd   |   9 ++++---
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
index 5fd4d5023f1463b5ba3970e33c460c1eb26d748d..c6feb8bb6f76f2553e266ff8bf8867105154237e 100644
GIT binary patch
delta 1017
zcmYk)eJs>*90%|_ocrM}52<ro5-SvQhbbJ&!+DsB8HPg0(?!kmw0TI`^uW}&^@kW&
zbd_*-UytXUE7>$MGp!Xf51FO2q{b2}pRZMJyS?^#-{<@JeZSxPO_ynZEz@R&25ak>
z(kP0eX($=%EkjE~;Ymh<Ht3}n4K<o%@X!p$08Pm_cxg{29e#^8Y6g)cz#X45xkA>-
zI2@9B>23F84mRT6hB+u+;EksbOl!e9l|_{fc=oV{)E+ke6!fSpyzwA!9x~)%<Bb{w
zx+tu3KV~|ABz^NPp=3`kZnmV37aS$CcY0a)z1J+s72ZWeH@^(hFA3N*hMAH89^xsC
z(R7b4{t{ipgguB7PLrPQi@(U3I#M=>vNSePoh~M`k}}+3kGMXULGmYgmPSy&DQ6mh
z<JDHAZ|z<q%tbPe9ja8B<4-l=a4&aRb~w3VfIRA0W0)Sa6t_45@)kE>x#c9_&>8>~
zv<3sOTf_Co*=sp0YHh`E7IEA7X7zm|LB2E^&1d_&`;S8jZMG%D`mgv#!u4yLzQu>c
z3h7v#LRJ=&mStzj&B~~Gkp5z#ZM|Gyl|N9I!%G!=UKX>n*%OJ&dmTfKQ`6tMK2<Z#
z9mMv0*Fe7}!OCi&BE8hBVbP~iS7iHr!F4#bdCp)l^Ndr+O?3<-R^&5k&CHD)%`9}O
zh-l{yuJeb2Lh37uBwNo4Y8TjMQ;&Yy96vHf*R(`UtqGSZukwDI9z-7!m_MwXo(q(<
zbKmCfVCT?aCbciw@S%MBG#+#~5naoa_V;B(A<}rb2C4KCU@pr8?#oC;mnT7$BEJ9(
z$rAy4Oj;h}OsGuS^MPCKr2wm=04VPu;nq%--<bvB=gw>(wu`JA=^~xN?hFWVcOl@=
zLmpJU!)i|ogfWU-U`&w%2z%pzrrr|3T6rG0p^N|~mEnM6-#MVFPXuiAMFHU|viWWm
zIW4z82Ex34J|O8o0nGG!0v2i^kfIJ^YpCn~|6T^9R7YAsvimYkw=eboCk{Ejw9yTd
GLh=W5FqZiM

delta 1008
zcmYk)c}SCC7y$6ixyy?w;xzJFnmVINW!}duooR)M4v)wykEV8bY>0TIXcS?`i<OGU
zNHYtM?bFXWb(>cqWps#@qLmtj2V#(c`A0slR1Q9VJkR^Q&-Xs>zO^#iTp7(MBAljg
zPGPZF6f3sEXo9Y1#U^IxNi@)(9Sbp<p$pJwt|3}gaET?8Y$~k9a-M>yRpd<snq9*C
z6kIOO`Lm(k4BaI55RO(-=!Ft|gv8w5IX&2`v8~bvPdlvO*w-n91vMI5Au%RcfE@C5
z5~3y_21+3<2<G8wT({sJfzRdc<&5J59~azvr`8C0syM_q|2KF|EiA%%9nZphT18u?
z(6?12K!IvgwARNUmSc;Ua1Ke*NnE2k{~OQNleURfWEf+07v#8CN|raAlW5GN<NTw1
zdk)0o6--0$?QI^e+ql~deUXCeiW)T5#A0m}+|L~&S0c4(1iy;k9La`~;`T#;vfT?<
zZ4Uqrc8CC3M>sIr5k;LxyiPYu$q}0e-V_SOYx~*#zadGdbIFjwup8(2+SRRN#dh+a
ziE@wSwlcezfv`|gMV=ZtDqeaY@5+x_Ctudp)VE7xg1C#+$0JiMJh5qd!9r$+j&2=t
z#==q(8vL;E@{h3T!Y0AHe)~v8+?MVY>5yAzkQM#9djH~q{>1FB&&0Q$U%yfHV$p?B
zW8CKXYkIb_RzwUk%N=V=3a9kFOY6(VCIva^lfJ&6`gpm+Hs5K|$qmnj`3ld46_bc?
zChNY_hvX;QQ}C%U302RW^7k7=iCqaW^-xzPz6wP?(4xSRnKA_;nKBXhs7wa@2wc)l
zWJ9#CTME>5mjc#3GT>ehPMVN7x<+1s<R+N|T<pdBW_$6PSd|6IQB?sD(1%|n-+`u1
zgJh;U5BQ?a1;qX50J6UX@EAA?R1ZW0D+5tL&|o~!I4A)OH8DV{1|NQ0gQw+d;~-h7
zbpupd4`5yE2e|2i0h#WEu@$>K<ljetCUjz3$n3sM^X*Ih|BFUJLrx4~7i9hb-?vQS

diff --git a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
index c954cec91..6637cedb2 100644
--- a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
+++ b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
\ No newline at end of file
diff --git a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw
index a1ba1bf55..6ecc150ae 100755
--- a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw
+++ b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw
@@ -184,16 +184,6 @@ fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-fi
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
@@ -219,6 +209,18 @@ concat_lines() {
 export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
 # Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
@@ -226,8 +228,9 @@ export MAVEN_CMD_LINE_ARGS
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
+# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} "$@"
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw.cmd b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw.cmd
index 2b934e89d..8bb827541 100644
--- a/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw.cmd
+++ b/vscode-extensions/commons/project-test-harness/test-projects/custom-properties-boot-project/mvnw.cmd
@@ -80,7 +80,7 @@ goto error
 
 :init
 
-set MAVEN_CMD_LINE_ARGS=%*
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %*
 
 @REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
 @REM Fallback to current working directory if not found.
@@ -118,10 +118,11 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 
-set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %*
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -142,4 +143,4 @@ if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
\ No newline at end of file
+exit /B %ERROR_CODE%