From 91d579ca488c380274bdcfec0dfe136f6ffc50fe Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Sep 2016 14:16:47 +0200 Subject: [PATCH] Updating mvnw for all projects --- mvnw | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/mvnw b/mvnw index dbabd63..2e39056 100755 --- a/mvnw +++ b/mvnw @@ -226,19 +226,8 @@ export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -echo "Running version check for the first time to ensure all jars are downloaded. Without this wrong version might be chosen" -VERSION=$(exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - -Dexec.executable="echo" -Dexec.args='${project.version}' ${WRAPPER_LAUNCHER} -q -o --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) - -echo "Running version check for the second time in order to output only the version" -VERSION=$(exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - -Dexec.executable="echo" -Dexec.args='${project.version}' ${WRAPPER_LAUNCHER} -q -o --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) +eecho "Running version check" +VERSION=$( sed '\!//' -e 's!.*$!!' ) echo "The found version is [${VERSION}]" if echo $VERSION | egrep -q 'M|RC'; then @@ -249,7 +238,6 @@ else echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//') fi - exec "$JAVACMD" \ $MAVEN_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \