Skip to content

Commit 372fecd

Browse files
authored
update gradle and nebula (Netflix#478)
Bump to recent version that works with jdk17.
1 parent 98d4bcc commit 372fecd

File tree

8 files changed

+33
-41
lines changed

8 files changed

+33
-41
lines changed

build.gradle

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,21 @@
1414
* limitations under the License.
1515
*/
1616

17-
buildscript {
18-
repositories {
19-
mavenCentral()
20-
}
21-
dependencies {
22-
classpath 'com.netflix.nebula:nebula-dependency-recommender:9.1.1'
23-
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:9.1.0'
24-
}
25-
}
26-
2717
plugins {
28-
id 'me.champeau.gradle.jmh' version '0.5.2'
29-
id "com.github.spotbugs" version "4.6.0" apply false
18+
id 'me.champeau.jmh' version '0.6.8'
19+
id "com.github.spotbugs" version "5.0.13" apply false
20+
id 'com.netflix.nebula.dependency-recommender' version '12.0.0'
21+
id 'com.netflix.nebula.netflixoss' version '11.1.1'
3022
}
3123

3224
ext {
3325
githubProjectName = 'servo'
3426
}
3527

3628
allprojects {
37-
apply plugin: 'nebula.dependency-recommender'
38-
apply plugin: 'nebula.netflixoss'
39-
apply plugin: 'me.champeau.gradle.jmh'
29+
apply plugin: 'com.netflix.nebula.dependency-recommender'
30+
apply plugin: 'com.netflix.nebula.netflixoss'
31+
apply plugin: 'me.champeau.jmh'
4032
}
4133

4234
subprojects {
@@ -75,12 +67,12 @@ subprojects {
7567
}
7668

7769
dependencies {
78-
compile 'org.slf4j:slf4j-api'
79-
compile 'com.google.guava:guava'
80-
compile 'com.netflix.spectator:spectator-api'
81-
testCompile 'org.testng:testng:6.1.1'
82-
testRuntime 'org.slf4j:slf4j-log4j12'
83-
testRuntime 'log4j:log4j:1.2.17'
70+
api 'org.slf4j:slf4j-api'
71+
api 'com.google.guava:guava'
72+
api 'com.netflix.spectator:spectator-api'
73+
testImplementation 'org.testng:testng:6.1.1'
74+
testImplementation 'org.slf4j:slf4j-log4j12'
75+
testImplementation 'log4j:log4j:1.2.17'
8476
jmh 'org.slf4j:slf4j-simple'
8577
}
8678

@@ -89,7 +81,7 @@ subprojects {
8981
iterations = 10
9082
fork = 5
9183
profilers = ['STACK']
92-
include = ['.*']
84+
includes = ['.*']
9385
}
9486

9587
checkstyle {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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-6.8.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip

servo-apache/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':servo-core')
2+
api project(':servo-core')
33
}
44

55
jar {

servo-atlas/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
dependencies {
2-
compile project(':servo-core')
3-
compile 'com.netflix.archaius:archaius2-core'
4-
compile 'com.netflix.iep-shadow:iepshadow-rxnetty'
5-
compile 'com.netflix.iep-shadow:iepshadow-iep-rxhttp'
6-
compile "com.fasterxml.jackson.core:jackson-databind"
7-
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-smile"
8-
compile 'io.netty:netty-buffer'
9-
compile 'io.netty:netty-codec-http'
10-
compile 'io.reactivex:rxjava'
2+
api project(':servo-core')
3+
api 'com.netflix.archaius:archaius2-core'
4+
api 'com.netflix.iep-shadow:iepshadow-rxnetty'
5+
api 'com.netflix.iep-shadow:iepshadow-iep-rxhttp'
6+
api "com.fasterxml.jackson.core:jackson-databind"
7+
api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile"
8+
api 'io.netty:netty-buffer'
9+
api 'io.netty:netty-codec-http'
10+
api 'io.reactivex:rxjava'
1111
jmh project(':servo-core')
1212
}
1313

servo-aws/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
2-
compile project(':servo-core')
3-
compile('com.amazonaws:aws-java-sdk-autoscaling')
4-
compile('com.amazonaws:aws-java-sdk-cloudwatch')
2+
api project(':servo-core')
3+
api('com.amazonaws:aws-java-sdk-autoscaling')
4+
api('com.amazonaws:aws-java-sdk-cloudwatch')
55
}
66

77
checkstyle {

servo-example/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
2-
compile project(':servo-core')
3-
compile project(':servo-atlas')
4-
compile project(':servo-graphite')
2+
api project(':servo-core')
3+
api project(':servo-atlas')
4+
api project(':servo-graphite')
55
}
66

77
task(run, dependsOn: 'classes', type: JavaExec) {

servo-graphite/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':servo-core')
2+
api project(':servo-core')
33
}
44

55
pmd {

servo-tomcat/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':servo-core')
2+
api project(':servo-core')
33
}
44

55
pmd {

0 commit comments

Comments
 (0)