Skip to content

Commit 14df0f4

Browse files
author
Matt Jacobs
committed
Upgrade to Gradle 3.1 / Nebula 3.4.0
1 parent 9433411 commit 14df0f4

File tree

16 files changed

+35
-60
lines changed

16 files changed

+35
-60
lines changed

Diff for: ‎build.gradle

+3-28
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11-
id 'nebula.netflixoss' version '3.3.0'
11+
id 'nebula.netflixoss' version '3.4.0'
1212
id 'me.champeau.gradle.jmh' version '0.2.0'
1313
id 'net.saliman.cobertura' version '2.2.8'
1414
}
@@ -29,7 +29,8 @@ subprojects {
2929
apply plugin: 'nebula.netflixoss'
3030
apply plugin: 'java'
3131
apply plugin: 'nebula.provided-base'
32-
32+
apply plugin: 'nebula.compile-api'
33+
3334
sourceCompatibility = 1.6
3435
targetCompatibility = 1.6
3536

@@ -52,30 +53,4 @@ subprojects {
5253
scopes.COMPILE.plus += [configurations.provided]
5354
}
5455
}
55-
56-
//mark all first-level dependencies as 'compile' in generated POM
57-
//except for 'servlet-api', which should be 'provided'
58-
publishing {
59-
publications {
60-
nebula(MavenPublication) {
61-
if (!project.name.equals("hystrix-dashboard") && !project.name.equals("hystrix-examples-webapp")) {
62-
pom.withXml {
63-
configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep ->
64-
if (dep.moduleName == "servlet-api") {
65-
asNode().dependencies[0].dependency.find {
66-
it.artifactId[0].text() == dep.moduleName &&
67-
it.groupId[0].text() == dep.moduleGroup
68-
}.scope[0].value = 'provided'
69-
} else {
70-
asNode().dependencies[0].dependency.find {
71-
it.artifactId[0].text() == dep.moduleName &&
72-
it.groupId[0].text() == dep.moduleGroup
73-
}.scope[0].value = 'compile'
74-
}
75-
}
76-
}
77-
}
78-
}
79-
}
80-
}
8156
}

Diff for: ‎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.14-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

Diff for: ‎hystrix-contrib/hystrix-clj/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repositories {
1818
}
1919

2020
dependencies {
21-
compile project(':hystrix-core')
21+
compileApi project(':hystrix-core')
2222
compile 'org.clojure:clojure:1.7.0'
2323
}
2424

Diff for: ‎hystrix-contrib/hystrix-codahale-metrics-publisher/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':hystrix-core')
3-
compile 'io.dropwizard.metrics:metrics-core:3.1.2'
2+
compileApi project(':hystrix-core')
3+
compileApi 'io.dropwizard.metrics:metrics-core:3.1.2'
44
testCompile 'junit:junit-dep:4.10'
55
testCompile 'org.mockito:mockito-all:1.9.5'
66
}

Diff for: ‎hystrix-contrib/hystrix-javanica/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ task ajcJar(type: Jar) {
9494
assemble.dependsOn(jar, ajcJar)
9595

9696
dependencies {
97-
compile project(':hystrix-core')
97+
compileApi project(':hystrix-core')
9898
ajtools "org.aspectj:aspectjtools:$aspectjVersion"
9999
testRuntime "org.aspectj:aspectjrt:$aspectjVersion"
100-
compile "org.aspectj:aspectjweaver:$aspectjVersion"
100+
compileApi "org.aspectj:aspectjweaver:$aspectjVersion"
101101
compile "org.aspectj:aspectjrt:$aspectjVersion"
102102

103-
compile 'com.google.guava:guava:15.0'
103+
compileApi 'com.google.guava:guava:15.0'
104104
compile 'commons-collections:commons-collections:3.2.2'
105105
compile 'org.apache.commons:commons-lang3:3.1'
106-
compile 'com.google.code.findbugs:jsr305:2.0.0'
106+
compileApi 'com.google.code.findbugs:jsr305:2.0.0'
107107
compile 'org.ow2.asm:asm:5.0.4'
108108
testCompile group: 'junit', name: 'junit', version: '4.12'
109109
testCompile 'pl.pragmatists:JUnitParams:1.0.5'

Diff for: ‎hystrix-contrib/hystrix-junit/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':hystrix-core')
3-
compile "junit:junit:4.11"
2+
compileApi project(':hystrix-core')
3+
compileApi "junit:junit:4.11"
44
}

Diff for: ‎hystrix-contrib/hystrix-metrics-event-stream/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':hystrix-core')
2+
compileApi project(':hystrix-core')
33
compile project(':hystrix-serialization')
44
provided 'javax.servlet:servlet-api:2.5'
55
testCompile 'junit:junit-dep:4.10'

Diff for: ‎hystrix-contrib/hystrix-network-auditor-agent/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile 'org.javassist:javassist:3.19+'
2+
compileApi 'org.javassist:javassist:3.19+'
33

44
jar {
55
// make a fatjar otherwise it's painful getting the boot-class-path correct when deploying

Diff for: ‎hystrix-contrib/hystrix-request-servlet/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':hystrix-core')
2+
compileApi project(':hystrix-core')
33
provided 'javax.servlet:servlet-api:2.5'
44
}

Diff for: ‎hystrix-contrib/hystrix-rx-netty-metrics-stream/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
2-
compile project(':hystrix-core')
2+
compileApi project(':hystrix-core')
33
compile project(':hystrix-serialization')
4-
compile 'io.reactivex:rxnetty:0.4.17'
4+
compileApi 'io.reactivex:rxnetty:0.4.17'
55
testCompile 'junit:junit-dep:4.10'
66
testCompile 'org.powermock:powermock-easymock-release-full:1.5.5'
77
testCompile 'org.easymock:easymock:3.2'

Diff for: ‎hystrix-contrib/hystrix-servo-metrics-publisher/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':hystrix-core')
3-
compile 'com.netflix.servo:servo-core:0.7.5'
2+
compileApi project(':hystrix-core')
3+
compileApi 'com.netflix.servo:servo-core:0.7.5'
44
testCompile 'junit:junit-dep:4.10'
55
testCompile 'org.mockito:mockito-all:1.9.5'
66
}

Diff for: ‎hystrix-contrib/hystrix-yammer-metrics-publisher/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':hystrix-core')
3-
compile 'com.yammer.metrics:metrics-core:2.2.0'
2+
compileApi project(':hystrix-core')
3+
compileApi 'com.yammer.metrics:metrics-core:2.2.0'
44
}

Diff for: ‎hystrix-core/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apply plugin: 'osgi'
22
apply plugin: 'me.champeau.gradle.jmh'
33

44
dependencies {
5-
compile 'com.netflix.archaius:archaius-core:0.4.1'
6-
compile 'io.reactivex:rxjava:1.2.0'
5+
compileApi 'com.netflix.archaius:archaius-core:0.4.1'
6+
compileApi 'io.reactivex:rxjava:1.2.0'
77
compile 'org.slf4j:slf4j-api:1.7.0'
8-
compile 'org.hdrhistogram:HdrHistogram:2.1.9'
8+
compileApi 'org.hdrhistogram:HdrHistogram:2.1.9'
99
testCompile 'junit:junit-dep:4.10'
1010
testCompile project(':hystrix-junit')
1111
}

Diff for: ‎hystrix-examples-webapp/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apply plugin: 'war'
22
apply plugin: 'jetty'
33

44
dependencies {
5-
compile project(':hystrix-core')
6-
compile project(':hystrix-examples')
7-
compile project(':hystrix-request-servlet')
8-
compile project(':hystrix-metrics-event-stream')
5+
compileApi project(':hystrix-core')
6+
compileApi project(':hystrix-examples')
7+
compileApi project(':hystrix-request-servlet')
8+
compileApi project(':hystrix-metrics-event-stream')
99
}
1010

1111
jettyRun {

Diff for: ‎hystrix-examples/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'osgi'
22

33
dependencies {
4-
compile project(':hystrix-core')
4+
compileApi project(':hystrix-core')
55
provided 'junit:junit-dep:4.10'
66
}
77

Diff for: ‎hystrix-serialization/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ sourceCompatibility = JavaVersion.VERSION_1_6
77
targetCompatibility = JavaVersion.VERSION_1_6
88

99
dependencies {
10-
compile project(':hystrix-core')
10+
compileApi project(':hystrix-core')
1111

1212
//if we bump into the the 2.8.0 series, we are forced to use Java7
13-
compile 'com.fasterxml.jackson.core:jackson-core:2.7.5'
14-
compile 'com.fasterxml.jackson.core:jackson-databind:2.7.5'
15-
compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.5'
13+
compileApi 'com.fasterxml.jackson.core:jackson-core:2.7.5'
14+
compileApi 'com.fasterxml.jackson.core:jackson-databind:2.7.5'
15+
compileApi 'com.fasterxml.jackson.core:jackson-annotations:2.7.5'
1616
compile 'com.fasterxml.jackson.module:jackson-module-afterburner:2.7.5'
17-
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.7.5'
17+
compileApi 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.7.5'
1818

1919
testCompile 'junit:junit-dep:4.10'
2020
testCompile 'org.mockito:mockito-all:1.9.5'

0 commit comments

Comments
 (0)