diff --git a/build.gradle b/build.gradle index be3770cd..05d33e00 100755 --- a/build.gradle +++ b/build.gradle @@ -14,19 +14,11 @@ * limitations under the License. */ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.netflix.nebula:nebula-dependency-recommender:9.1.1' - classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:9.1.0' - } -} - plugins { - id 'me.champeau.gradle.jmh' version '0.5.2' - id "com.github.spotbugs" version "4.6.0" apply false + id 'me.champeau.jmh' version '0.6.8' + id "com.github.spotbugs" version "5.0.13" apply false + id 'com.netflix.nebula.dependency-recommender' version '12.0.0' + id 'com.netflix.nebula.netflixoss' version '11.1.1' } ext { @@ -34,9 +26,9 @@ ext { } allprojects { - apply plugin: 'nebula.dependency-recommender' - apply plugin: 'nebula.netflixoss' - apply plugin: 'me.champeau.gradle.jmh' + apply plugin: 'com.netflix.nebula.dependency-recommender' + apply plugin: 'com.netflix.nebula.netflixoss' + apply plugin: 'me.champeau.jmh' } subprojects { @@ -75,12 +67,12 @@ subprojects { } dependencies { - compile 'org.slf4j:slf4j-api' - compile 'com.google.guava:guava' - compile 'com.netflix.spectator:spectator-api' - testCompile 'org.testng:testng:6.1.1' - testRuntime 'org.slf4j:slf4j-log4j12' - testRuntime 'log4j:log4j:1.2.17' + api 'org.slf4j:slf4j-api' + api 'com.google.guava:guava' + api 'com.netflix.spectator:spectator-api' + testImplementation 'org.testng:testng:6.1.1' + testImplementation 'org.slf4j:slf4j-log4j12' + testImplementation 'log4j:log4j:1.2.17' jmh 'org.slf4j:slf4j-simple' } @@ -89,7 +81,7 @@ subprojects { iterations = 10 fork = 5 profilers = ['STACK'] - include = ['.*'] + includes = ['.*'] } checkstyle { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8178ab14..8f1ca97d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip diff --git a/servo-apache/build.gradle b/servo-apache/build.gradle index ee252e91..e3596ce7 100644 --- a/servo-apache/build.gradle +++ b/servo-apache/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':servo-core') + api project(':servo-core') } jar { diff --git a/servo-atlas/build.gradle b/servo-atlas/build.gradle index 7cb7ff09..1c44a04d 100644 --- a/servo-atlas/build.gradle +++ b/servo-atlas/build.gradle @@ -1,13 +1,13 @@ dependencies { - compile project(':servo-core') - compile 'com.netflix.archaius:archaius2-core' - compile 'com.netflix.iep-shadow:iepshadow-rxnetty' - compile 'com.netflix.iep-shadow:iepshadow-iep-rxhttp' - compile "com.fasterxml.jackson.core:jackson-databind" - compile "com.fasterxml.jackson.dataformat:jackson-dataformat-smile" - compile 'io.netty:netty-buffer' - compile 'io.netty:netty-codec-http' - compile 'io.reactivex:rxjava' + api project(':servo-core') + api 'com.netflix.archaius:archaius2-core' + api 'com.netflix.iep-shadow:iepshadow-rxnetty' + api 'com.netflix.iep-shadow:iepshadow-iep-rxhttp' + api "com.fasterxml.jackson.core:jackson-databind" + api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile" + api 'io.netty:netty-buffer' + api 'io.netty:netty-codec-http' + api 'io.reactivex:rxjava' jmh project(':servo-core') } diff --git a/servo-aws/build.gradle b/servo-aws/build.gradle index 17675a99..f61c33d1 100644 --- a/servo-aws/build.gradle +++ b/servo-aws/build.gradle @@ -1,7 +1,7 @@ dependencies { - compile project(':servo-core') - compile('com.amazonaws:aws-java-sdk-autoscaling') - compile('com.amazonaws:aws-java-sdk-cloudwatch') + api project(':servo-core') + api('com.amazonaws:aws-java-sdk-autoscaling') + api('com.amazonaws:aws-java-sdk-cloudwatch') } checkstyle { diff --git a/servo-example/build.gradle b/servo-example/build.gradle index 85e4ec13..bed109cb 100644 --- a/servo-example/build.gradle +++ b/servo-example/build.gradle @@ -1,7 +1,7 @@ dependencies { - compile project(':servo-core') - compile project(':servo-atlas') - compile project(':servo-graphite') + api project(':servo-core') + api project(':servo-atlas') + api project(':servo-graphite') } task(run, dependsOn: 'classes', type: JavaExec) { diff --git a/servo-graphite/build.gradle b/servo-graphite/build.gradle index 895241b4..36eda11e 100644 --- a/servo-graphite/build.gradle +++ b/servo-graphite/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':servo-core') + api project(':servo-core') } pmd { diff --git a/servo-tomcat/build.gradle b/servo-tomcat/build.gradle index 04f8cab1..2c7dd13c 100644 --- a/servo-tomcat/build.gradle +++ b/servo-tomcat/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':servo-core') + api project(':servo-core') } pmd {