Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

Commit

Permalink
Bumped libs to Dalston
Browse files Browse the repository at this point in the history
  • Loading branch information
marcingrzejszczak committed Jun 7, 2017
1 parent 0cbb2a6 commit db0d213
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 27 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -10,8 +10,8 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.2.RELEASE"
classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:1.0.4.RELEASE"
classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE"
classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:1.1.1.RELEASE"
}
}

Expand Down Expand Up @@ -76,7 +76,7 @@ publishing {
}

task wrapper(type: Wrapper) {
gradleVersion = '3.4.1'
gradleVersion = '3.5'
}

String getProp(String propName) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,2 +1,2 @@
org.gradle.daemon=false
BOM_VERSION=Camden.SR6
BOM_VERSION=Dalston.SR1
24 changes: 16 additions & 8 deletions gradle/pipeline.gradle
Expand Up @@ -32,23 +32,31 @@ task deploy(dependsOn: 'publish') {
description = "Abstraction over publishing artifacts to Artifactory / Nexus"
}

task groupId << {
println projectGroupId
task groupId {
doLast {
println projectGroupId
}
}
groupId.description = "Task to retrieve Group ID"

task artifactId << {
println projectArtifactId
task artifactId {
doLast {
println projectArtifactId
}
}
artifactId.description = "Task to retrieve Artifact ID"

task currentVersion << {
println projectVersion
task currentVersion {
doLast {
println projectVersion
}
}
currentVersion.description = "Task to retrieve version"

task stubIds << {
println stubrunnerIds
task stubIds {
doLast {
println stubrunnerIds
}
}
stubIds.description = "Task to retrieve Stub Runner IDS"

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed Mar 22 16:14:39 CET 2017
#Wed Jun 07 11:29:20 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
22 changes: 15 additions & 7 deletions gradlew
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
Expand Down Expand Up @@ -154,11 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
6 changes: 0 additions & 6 deletions gradlew.bat
Expand Up @@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
Expand All @@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line
Expand Down

0 comments on commit db0d213

Please sign in to comment.