From 7eea8ffb61f23f73fc1c5f51bc2bc24750305015 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 7 Sep 2016 17:26:12 +0200 Subject: [PATCH 1/8] Updating mvnw for all projects --- mvnw | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/mvnw b/mvnw index 53c0d72..fe1957e 100755 --- a/mvnw +++ b/mvnw @@ -46,15 +46,6 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then fi -VERSION=$(awk '/ 0) {$0=$0} 1' `dirname $0`/pom.xml| grep '\(.*\)<.*/\1/') -if echo $VERSION | egrep -q 'M|RC'; then - echo Activating \"milestone\" profile for version=\"$VERSION\" - echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone" -else - echo Deactivating \"milestone\" profile for version=\"$VERSION\" - 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. cygwin=false; darwin=false; @@ -66,27 +57,27 @@ case "`uname`" in # # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. - # + # if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then # # Apple JDKs # export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home fi - + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then # # Apple JDKs # export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi - + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then # # Oracle JDKs # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi + fi if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then # @@ -228,16 +219,30 @@ concat_lines() { export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" -# Provide a "standardized" way to retrieve the CLI args that will +# 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 $@" export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +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 --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) + +if echo $VERSION | egrep -q 'M|RC'; then + echo Activating \"milestone\" profile for version=\"$VERSION\" + echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone" +else + echo Deactivating \"milestone\" profile for version=\"$VERSION\" + 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" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@" - From a47e9b4014b0a554e665c2a43ccc7c9896240be4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 7 Sep 2016 17:59:12 +0200 Subject: [PATCH 2/8] Removed adoc footer --- docs/src/main/asciidoc/spring-cloud-cli.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/main/asciidoc/spring-cloud-cli.adoc b/docs/src/main/asciidoc/spring-cloud-cli.adoc index c1880e8..001ba9c 100644 --- a/docs/src/main/asciidoc/spring-cloud-cli.adoc +++ b/docs/src/main/asciidoc/spring-cloud-cli.adoc @@ -2,6 +2,7 @@ :github: https://github.com/spring-cloud/spring-cloud-cli :githubmaster: {github}/tree/master :docslink: {githubmaster}/docs/src/main/asciidoc +:nofooter: include::intro.adoc[] From 31101b0959e0d594d0feea82b49f43ceb4a4a313 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 15 Sep 2016 16:09:55 +0200 Subject: [PATCH 3/8] Updating mvnw for all projects --- mvnw | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mvnw b/mvnw index fe1957e..a1af4c4 100755 --- a/mvnw +++ b/mvnw @@ -226,12 +226,21 @@ 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 --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 --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) +echo "The found version is [${VERSION}]" + if echo $VERSION | egrep -q 'M|RC'; then echo Activating \"milestone\" profile for version=\"$VERSION\" echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone" From 051fdf4c154ad9f860e956d0c50b0c2087d0dc74 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Sep 2016 12:44:13 +0200 Subject: [PATCH 4/8] Updating mvnw for all projects --- mvnw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mvnw b/mvnw index a1af4c4..dbabd63 100755 --- a/mvnw +++ b/mvnw @@ -231,14 +231,14 @@ 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 --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) + -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 --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) + -Dexec.executable="echo" -Dexec.args='${project.version}' ${WRAPPER_LAUNCHER} -q -o --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec ) echo "The found version is [${VERSION}]" if echo $VERSION | egrep -q 'M|RC'; then From 8b45604eee8f2813ce1e1f716b76a59e29569b69 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Sep 2016 14:16:38 +0200 Subject: [PATCH 5/8] 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" \ From ecd2d3164e9c23bbb9331cdb5c4409b7bcf16626 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Sep 2016 19:29:38 +0200 Subject: [PATCH 6/8] Updating mvnw for all projects --- mvnw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvnw b/mvnw index 2e39056..ee316a2 100755 --- a/mvnw +++ b/mvnw @@ -226,7 +226,7 @@ export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -eecho "Running version check" +echo "Running version check" VERSION=$( sed '\!//' -e 's!.*$!!' ) echo "The found version is [${VERSION}]" From fd87508361318c0c699e07715807cc76310f5300 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 21 Sep 2016 12:45:19 +0100 Subject: [PATCH 7/8] Update for Brixton.RC6 (1.1.6) --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2ff6d50..8ab17ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.BUILD-SNAPSHOT + 1.1.6.RELEASE pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index a505f4a..293a9e4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.1.6.BUILD-SNAPSHOT + 1.1.6.RELEASE org.springframework.cloud spring-cloud-build - 1.1.3.BUILD-SNAPSHOT + 1.1.2.RELEASE pom @@ -95,14 +95,14 @@ org.springframework.cloud spring-cloud-config - 1.1.4.BUILD-SNAPSHOT + 1.1.3.RELEASE pom import org.springframework.cloud spring-cloud-netflix - 1.1.6.BUILD-SNAPSHOT + 1.1.6.RELEASE pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index a7f803e..804b04a 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.BUILD-SNAPSHOT + 1.1.6.RELEASE diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index b977655..3dbd07e 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.BUILD-SNAPSHOT + 1.1.6.RELEASE diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java index 50c9f12..5a8525d 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java @@ -28,7 +28,7 @@ import org.springframework.boot.cli.compiler.GenericBomAstTransformation; @GroovyASTTransformation(phase = CompilePhase.CONVERSION) public class SpringCloudBomAstTransformation extends GenericBomAstTransformation { - private static final String SPRING_CLOUD_VERSION = "Brixton.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Brixton.SR6"; @Override protected String getBomModule() { From 27b759ee389af05bab350b08152fe4cb3f4d69ab Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 21 Sep 2016 12:48:05 +0100 Subject: [PATCH 8/8] Revert to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- .../cloud/cli/compiler/SpringCloudBomAstTransformation.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8ab17ef..c621121 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.RELEASE + 1.1.7.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index 293a9e4..c53c235 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.1.6.RELEASE + 1.1.7.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build @@ -95,14 +95,14 @@ org.springframework.cloud spring-cloud-config - 1.1.3.RELEASE + 1.1.4.BUILD-SNAPSHOT pom import org.springframework.cloud spring-cloud-netflix - 1.1.6.RELEASE + 1.1.7.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 804b04a..dd6d014 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.RELEASE + 1.1.7.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 3dbd07e..d91810a 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.6.RELEASE + 1.1.7.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java index 5a8525d..50c9f12 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java @@ -28,7 +28,7 @@ import org.springframework.boot.cli.compiler.GenericBomAstTransformation; @GroovyASTTransformation(phase = CompilePhase.CONVERSION) public class SpringCloudBomAstTransformation extends GenericBomAstTransformation { - private static final String SPRING_CLOUD_VERSION = "Brixton.SR6"; + private static final String SPRING_CLOUD_VERSION = "Brixton.BUILD-SNAPSHOT"; @Override protected String getBomModule() {