SpringCloud/spring-cloud-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Finchley

Browse Source 
# Conflicts:
#	docs/pom.xml
#	docs/src/main/asciidoc/spring-cloud-starters.adoc
#	pom.xml
#	spring-cloud-dependencies/pom.xml
#	spring-cloud-starter-parent/pom.xml
This commit is contained in:
Spencer Gibb
2017-06-30 09:57:12 -06:00
parent 8606c4d228 e2fb819e03
commit 472c7073b9
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/spring-cloud-starters.adoc
View File

@@ -3,7 +3,7 @@
:docslink: {githubmaster}/docs/src/main/asciidoc
:springcloudversion: Finchley.BUILD-SNAPSHOT
:springioplatformversion: Brussels-BUILD-SNAPSHOT
:springBootVersion: 1.5.0.BUILD-SNAPSHOT
:springBootVersion: 1.5.4.BUILD-SNAPSHOT
= Spring Cloud Release Train

11
mvnw vendored
View File

@@ -238,6 +238,17 @@ else
echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
fi
if echo $VERSION | egrep -q 'RELEASE'; then
echo Activating \"central\" profile for version=\"$VERSION\"
echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
elif echo $VERSION | egrep -q 'SR\d'; then
echo Activating \"central\" profile for version=\"$VERSION\"
echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
else
echo Deactivating \"central\" profile for version=\"$VERSION\"
echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//')
fi
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \

4
spring-cloud-dependencies/pom.xml
View File

@@ -17,11 +17,11 @@
<main.basedir>${basedir}/../..</main.basedir>
<spring-cloud-aws.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-aws.version>
<spring-cloud-bus.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-cloudfoundry.version>2.0.-.BUILD-SNAPSHOT</spring-cloud-cloudfoundry.version>
<spring-cloud-cloudfoundry.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-cloudfoundry.version>
<spring-cloud-commons.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-consul.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-gateway.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-security.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-security.version>