Skip to content

Commit 35a1413

Browse files
authored
Merge pull request #52 from cfieber/aws_spect_upd
update to newest dependencies to pick up newer spectator version
2 parents 512718f + 29063db commit 35a1413

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

build.gradle

+22-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
maven { url 'http://dl.bintray.com/spinnaker/gradle/' }
2222
}
2323
dependencies {
24-
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.5.0'
24+
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.9.0'
2525
}
2626
}
2727

@@ -32,8 +32,28 @@ allprojects {
3232

3333
group = 'com.netflix.spinnaker.kork'
3434

35+
ext {
36+
spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.56.0'
37+
}
38+
39+
def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]
40+
if (ext.has('versions')) {
41+
def extVers = ext.get('versions')
42+
if (extVers instanceof Map) {
43+
checkLocalVersions.putAll(extVers)
44+
}
45+
}
46+
47+
def localVersions = checkLocalVersions.findAll { it.value.endsWith('-SNAPSHOT') }
48+
if (localVersions) {
49+
logger.info("Enabling mavenLocal repo for $localVersions")
50+
repositories {
51+
mavenLocal()
52+
}
53+
}
54+
3555
spinnaker {
36-
dependenciesVersion = "0.50.0"
56+
dependenciesVersion = spinnakerDependenciesVersion
3757
}
3858

3959
jacoco {

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

settings.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
include 'kork-core', 'kork-cassandra', 'kork-jedis-test', 'kork-swagger', 'kork-security', 'kork-web', 'kork-hystrix', 'kork-stackdriver'
17+
include 'kork-core', 'kork-cassandra', 'kork-jedis-test', 'kork-swagger', 'kork-security', 'kork-web', 'kork-hystrix'
18+
//TODO(ewiseblatt) - fix for spectator 0.41.0: , 'kork-stackdriver'
1819

1920
rootProject.name='kork'
2021

0 commit comments

Comments
 (0)