From 63221718f1ac172eed5fb682cd33302bdc5bb617 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 2 Mar 2016 17:32:29 +0000 Subject: [PATCH] Update for 1.1.0.RC1 --- mvnw | 6 +++--- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mvnw b/mvnw index e9df15e1..29c32014 100755 --- a/mvnw +++ b/mvnw @@ -49,10 +49,10 @@ fi VERSION=$(sed `dirname $0`/pom.xml -e '/\(.*\)<.*/\1/') if echo $VERSION | egrep -q 'M|RC'; then echo Activating \"milestone\" profile for version=\"$VERSION\" - echo $MAVEN_OPTS | grep -q milestone || MAVEN_OPTS="$MAVEN_OPTS -Pmilestone" + echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone" else echo Deactivating \"milestone\" profile for version=\"$VERSION\" - echo $MAVEN_OPTS | grep -q milestone && MAVEN_OPTS=$(echo $MAVEN_OPTS | sed -e 's/-Pmilestone//') + echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//') fi # OS specific support. $var _must_ be set to either true or false. @@ -239,5 +239,5 @@ 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_ARGS} "$@" diff --git a/pom.xml b/pom.xml index af926a6e..ffcff2b7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 pom Spring Cloud Parent diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 032ba0d1..d131f5f0 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index b9da50ba..007fbffd 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent