Skip to content

Commit

Permalink
Merge pull request #104 from cfieber/master
Browse files Browse the repository at this point in the history
dependency updates
  • Loading branch information
cfieber authored Oct 12, 2016
2 parents d618d84 + 1893ca8 commit 8f9ce27
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
27 changes: 24 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

buildscript {
ext {
springBootVersion = "1.2.5.RELEASE"
springBootVersion = "1.2.8.RELEASE"
}
repositories {
jcenter()
maven { url 'http://spinnaker.bintray.com/gradle/' }
}
dependencies {
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.5.0'
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.9.0'
classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
}
}
Expand All @@ -34,9 +34,30 @@ allprojects {
apply plugin: 'jacoco'
group = "com.netflix.spinnaker.echo"

ext {
spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.57.0'
}

def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]
if (ext.has('versions')) {
def extVers = ext.get('versions')
if (extVers instanceof Map) {
checkLocalVersions.putAll(extVers)
}
}

def localVersions = checkLocalVersions.findAll { it.value.endsWith('-SNAPSHOT') }
if (localVersions) {
logger.info("Enabling mavenLocal repo for $localVersions")
repositories {
mavenLocal()
}
}

spinnaker {
dependenciesVersion = "0.42.0"
dependenciesVersion = spinnakerDependenciesVersion
}

test {
testLogging {
exceptionFormat = 'full'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

0 comments on commit 8f9ce27

Please sign in to comment.