Upgrade to Gradle 7.5.1

build.gradle

@@ -1,16 +1,20 @@
 plugins {
-    id 'nebula.netflixoss' version '9.1.0'
+    id 'com.netflix.nebula.netflixoss' version '11.1.1'
 }
 
 // Establish version and status
 ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
 
 subprojects {
-    apply plugin: 'nebula.netflixoss'
-    apply plugin: 'java'
+    apply plugin: 'com.netflix.nebula.netflixoss'
+    apply plugin: 'java-library'
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(8)
+        }
+    }
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
 
     group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
 

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.5.1-bin.zip

ribbon-archaius/build.gradle

@@ -1,12 +1,12 @@
 dependencies {
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    compile 'com.google.code.findbugs:annotations:2.0.0'
-    compile "com.google.guava:guava:${guava_version}"
-    compile 'commons-configuration:commons-configuration:1.8'
-    compile 'commons-lang:commons-lang:2.6'
-    compile "com.netflix.archaius:archaius-core:${archaius_version}"
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    api 'com.google.code.findbugs:annotations:2.0.0'
+    api "com.google.guava:guava:${guava_version}"
+    api 'commons-configuration:commons-configuration:1.8'
+    api 'commons-lang:commons-lang:2.6'
+    api "com.netflix.archaius:archaius-core:${archaius_version}"
 
-    compile project(':ribbon-core')
+    api project(':ribbon-core')
 
-    testCompile 'junit:junit:4.11' 
+    testImplementation 'junit:junit:4.11' 
 }

ribbon-core/build.gradle

@@ -1,10 +1,10 @@
 dependencies {
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    compile 'com.google.code.findbugs:annotations:2.0.0'
-    compile "com.google.guava:guava:${guava_version}"
-    compile 'commons-lang:commons-lang:2.6'
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    api 'com.google.code.findbugs:annotations:2.0.0'
+    api "com.google.guava:guava:${guava_version}"
+    api 'commons-lang:commons-lang:2.6'
 
-    testCompile 'junit:junit:4.11'
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile project(":ribbon-archaius")
+    testImplementation 'junit:junit:4.11'
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation project(":ribbon-archaius")
 }

ribbon-eureka/build.gradle

@@ -1,18 +1,18 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-loadbalancer')
-    compile "com.netflix.eureka:eureka-client:${eureka_version}"
-    compile "com.netflix.archaius:archaius-core:0.7.5"
-    compile "commons-configuration:commons-configuration:1.8"
-    compile "javax.inject:javax.inject:1"
-    compile 'com.google.code.findbugs:annotations:2.0.0'
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
+    api project(':ribbon-core')
+    api project(':ribbon-loadbalancer')
+    api "com.netflix.eureka:eureka-client:${eureka_version}"
+    api "com.netflix.archaius:archaius-core:0.7.5"
+    api "commons-configuration:commons-configuration:1.8"
+    api "javax.inject:javax.inject:1"
+    api 'com.google.code.findbugs:annotations:2.0.0'
+    api "org.slf4j:slf4j-api:${slf4j_version}"
 
-    testCompile project(":ribbon-archaius")
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile "junit:junit:${junit_version}"
-    testCompile "org.powermock:powermock-easymock-release-full:${powermock_version}"
-    testCompile "org.powermock:powermock-mockito-release-full:${powermock_version}"
-    testCompile "org.easymock:easymock:${easymock_version}"
-    testCompile "com.netflix.eureka:eureka-test-utils:${eureka_version}"
+    testImplementation project(":ribbon-archaius")
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation "junit:junit:${junit_version}"
+    testImplementation "org.powermock:powermock-easymock-release-full:${powermock_version}"
+    testImplementation "org.powermock:powermock-mockito-release-full:${powermock_version}"
+    testImplementation "org.easymock:easymock:${easymock_version}"
+    testImplementation "com.netflix.eureka:eureka-test-utils:${eureka_version}"
 }

ribbon-evcache/build.gradle

@@ -1,10 +1,10 @@
 dependencies {
-    compile project(':ribbon')
-    compile 'com.netflix.evcache:evcache-client:1.0.5'
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    testCompile project(':ribbon-test')
-    testCompile "junit:junit:${junit_version}"
-    testCompile "org.powermock:powermock-easymock-release-full:${powermock_version}"
-    testCompile "org.easymock:easymock:${easymock_version}"
+    api project(':ribbon')
+    api 'com.netflix.evcache:evcache-client:1.0.5'
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    testImplementation project(':ribbon-test')
+    testImplementation "junit:junit:${junit_version}"
+    testImplementation "org.powermock:powermock-easymock-release-full:${powermock_version}"
+    testImplementation "org.easymock:easymock:${easymock_version}"
 }

ribbon-examples/build.gradle

@@ -1,18 +1,18 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-httpclient')
-    compile project(':ribbon-transport')
-    compile project(':ribbon-loadbalancer')
-    compile project(':ribbon')
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile "io.reactivex:rxnetty:${rx_netty_version}"
-    compile "com.netflix.hystrix:hystrix-core:${hystrix_version}"
-    compile 'javax.ws.rs:jsr311-api:1.1.1'
-    compile 'com.google.code.findbugs:annotations:2.0.0'
-    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
-    compile 'com.thoughtworks.xstream:xstream:1.4.5'
-    compile "com.sun.jersey:jersey-server:${jersey_version}"
-    compile "com.google.guava:guava:${guava_version}"
-    compile "com.netflix.archaius:archaius-core:${archaius_version}"
-    testCompile 'junit:junit:4.11'
+    api project(':ribbon-core')
+    api project(':ribbon-httpclient')
+    api project(':ribbon-transport')
+    api project(':ribbon-loadbalancer')
+    api project(':ribbon')
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api "io.reactivex:rxnetty:${rx_netty_version}"
+    api "com.netflix.hystrix:hystrix-core:${hystrix_version}"
+    api 'javax.ws.rs:jsr311-api:1.1.1'
+    api 'com.google.code.findbugs:annotations:2.0.0'
+    api 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
+    api 'com.thoughtworks.xstream:xstream:1.4.5'
+    api "com.sun.jersey:jersey-server:${jersey_version}"
+    api "com.google.guava:guava:${guava_version}"
+    api "com.netflix.archaius:archaius-core:${archaius_version}"
+    testImplementation 'junit:junit:4.11'
 }

ribbon-guice/build.gradle

@@ -1,12 +1,12 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-transport')
-    compile project(':ribbon')
-    compile 'com.google.inject:guice:4.0'
-    compile 'com.google.inject.extensions:guice-multibindings:4.0'
-    testCompile 'junit:junit:4.11'
-    testCompile "io.reactivex:rxjava:${rx_java_version}"
-    testCompile "io.reactivex:rxnetty:${rx_netty_version}"
-    testCompile (project(':ribbon-examples')) {transitive=false}
-    testCompile "com.netflix.archaius:archaius-core:${archaius_version}"
+    api project(':ribbon-core')
+    api project(':ribbon-transport')
+    api project(':ribbon')
+    api 'com.google.inject:guice:4.0'
+    api 'com.google.inject.extensions:guice-multibindings:4.0'
+    testImplementation 'junit:junit:4.11'
+    testImplementation "io.reactivex:rxjava:${rx_java_version}"
+    testImplementation "io.reactivex:rxnetty:${rx_netty_version}"
+    testImplementation (project(':ribbon-examples')) {transitive=false}
+    testImplementation "com.netflix.archaius:archaius-core:${archaius_version}"
 }

ribbon-httpclient/build.gradle

@@ -1,21 +1,21 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-loadbalancer')
-    compile 'commons-collections:commons-collections:3.2.2'        
-    compile 'org.apache.httpcomponents:httpclient:4.2.1'
-    compile 'com.google.code.findbugs:annotations:2.0.0' 
-    compile "com.sun.jersey:jersey-client:${jersey_version}"
-    compile "com.sun.jersey.contribs:jersey-apache-client4:${jersey_version}"
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    compile "com.netflix.servo:servo-core:${servo_version}"
-    compile "com.google.guava:guava:${guava_version}"
-    compile 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
-    testCompile 'junit:junit:4.11'
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile 'commons-io:commons-io:2.0.1'
-    testCompile "com.sun.jersey:jersey-server:${jersey_version}"
-    testCompile 'com.google.mockwebserver:mockwebserver:20130505'
-    testCompile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
-    testCompile project(':ribbon-archaius')
-    testCompile project(":ribbon-loadbalancer").sourceSets.test.output
+    api project(':ribbon-core')
+    api project(':ribbon-loadbalancer')
+    api 'commons-collections:commons-collections:3.2.2'        
+    api 'org.apache.httpcomponents:httpclient:4.2.1'
+    api 'com.google.code.findbugs:annotations:2.0.0' 
+    api "com.sun.jersey:jersey-client:${jersey_version}"
+    api "com.sun.jersey.contribs:jersey-apache-client4:${jersey_version}"
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    api "com.netflix.servo:servo-core:${servo_version}"
+    api "com.google.guava:guava:${guava_version}"
+    api 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
+    testImplementation 'junit:junit:4.11'
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation 'commons-io:commons-io:2.0.1'
+    testImplementation "com.sun.jersey:jersey-server:${jersey_version}"
+    testImplementation 'com.google.mockwebserver:mockwebserver:20130505'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
+    testImplementation project(':ribbon-archaius')
+    testImplementation project(":ribbon-loadbalancer").sourceSets.test.output
 }

ribbon-loadbalancer/build.gradle

@@ -1,16 +1,16 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile 'com.netflix.netflix-commons:netflix-statistics:0.1.1'
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    compile "com.netflix.servo:servo-core:${servo_version}"
-    compile "com.google.guava:guava:${guava_version}"
-    compile 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
+    api project(':ribbon-core')
+    api 'com.netflix.netflix-commons:netflix-statistics:0.1.1'
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    api "com.netflix.servo:servo-core:${servo_version}"
+    api "com.google.guava:guava:${guava_version}"
+    api 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
 
-    testCompile project(":ribbon-archaius")
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.mockito:mockito-core:2.13.0'
-    testCompile 'org.awaitility:awaitility:3.0.0'
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile "com.sun.jersey:jersey-server:${jersey_version}"
+    testImplementation project(":ribbon-archaius")
+    testImplementation 'junit:junit:4.11'
+    testImplementation 'org.mockito:mockito-core:2.13.0'
+    testImplementation 'org.awaitility:awaitility:3.0.0'
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation "com.sun.jersey:jersey-server:${jersey_version}"
 }

ribbon-test/build.gradle

@@ -1,13 +1,13 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-loadbalancer')
-    compile project(':ribbon-eureka')
-    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
-    compile "com.netflix.eureka:eureka-client:${eureka_version}"
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile 'javax.ws.rs:jsr311-api:1.1.1'  
-    compile "com.google.guava:guava:${guava_version}"
-    compile "junit:junit:${junit_version}"
-    compile "org.powermock:powermock-easymock-release-full:${powermock_version}"
-    compile "org.easymock:easymock:${easymock_version}"
+    api project(':ribbon-core')
+    api project(':ribbon-loadbalancer')
+    api project(':ribbon-eureka')
+    api 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'
+    api "com.netflix.eureka:eureka-client:${eureka_version}"
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api 'javax.ws.rs:jsr311-api:1.1.1'  
+    api "com.google.guava:guava:${guava_version}"
+    api "junit:junit:${junit_version}"
+    api "org.powermock:powermock-easymock-release-full:${powermock_version}"
+    api "org.easymock:easymock:${easymock_version}"
 }

ribbon-transport/build.gradle

@@ -1,20 +1,20 @@
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-archaius')
-    compile project(':ribbon-loadbalancer')
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile "io.reactivex:rxnetty:${rx_netty_version}"
-    compile "io.reactivex:rxnetty-contexts:${rx_netty_version}"
-    compile "io.reactivex:rxnetty-servo:${rx_netty_version}"
-    compile "io.netty:netty-codec-http:4.0.27.Final"
-    compile 'javax.inject:javax.inject:1'
-    compile "org.slf4j:slf4j-api:${slf4j_version}"
-    compile "com.google.guava:guava:${guava_version}"
-    testCompile 'junit:junit:4.11'
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile "com.sun.jersey:jersey-server:${jersey_version}"
-    testCompile 'com.google.mockwebserver:mockwebserver:20130706'
-    testCompile project(':ribbon-eureka')
-    testCompile project(':ribbon-test')
-    testCompile project(':ribbon-archaius')
+    api project(':ribbon-core')
+    api project(':ribbon-archaius')
+    api project(':ribbon-loadbalancer')
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api "io.reactivex:rxnetty:${rx_netty_version}"
+    api "io.reactivex:rxnetty-contexts:${rx_netty_version}"
+    api "io.reactivex:rxnetty-servo:${rx_netty_version}"
+    api "io.netty:netty-codec-http:4.0.27.Final"
+    api 'javax.inject:javax.inject:1'
+    api "org.slf4j:slf4j-api:${slf4j_version}"
+    api "com.google.guava:guava:${guava_version}"
+    testImplementation 'junit:junit:4.11'
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation "com.sun.jersey:jersey-server:${jersey_version}"
+    testImplementation 'com.google.mockwebserver:mockwebserver:20130706'
+    testImplementation project(':ribbon-eureka')
+    testImplementation project(':ribbon-test')
+    testImplementation project(':ribbon-archaius')
 }

ribbon/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'nebula.facet'
+apply plugin: 'com.netflix.nebula.facet'
 
 facets {
     examples {
@@ -9,20 +9,20 @@ facets {
 build.dependsOn(examplesClasses)
 
 dependencies {
-    compile project(':ribbon-core')
-    compile project(':ribbon-transport')
-    compile "com.netflix.hystrix:hystrix-core:${hystrix_version}"
-    compile 'javax.inject:javax.inject:1'
-    compile "io.reactivex:rxjava:${rx_java_version}"
-    compile "io.reactivex:rxnetty:${rx_netty_version}"
-    compile 'commons-configuration:commons-configuration:1.8'
-    compile "com.google.guava:guava:${guava_version}"
-    compile "com.netflix.archaius:archaius-core:${archaius_version}"
-    testCompile "junit:junit:${junit_version}"
-    testCompile "org.powermock:powermock-easymock-release-full:${powermock_version}"
-    testCompile "org.easymock:easymock:${easymock_version}"
-    testCompile "org.slf4j:slf4j-log4j12:${slf4j_version}"
-    testCompile project(':ribbon-eureka')
-    testCompile project(':ribbon-test')
-    testCompile 'com.google.mockwebserver:mockwebserver:20130706'
+    api project(':ribbon-core')
+    api project(':ribbon-transport')
+    api "com.netflix.hystrix:hystrix-core:${hystrix_version}"
+    api 'javax.inject:javax.inject:1'
+    api "io.reactivex:rxjava:${rx_java_version}"
+    api "io.reactivex:rxnetty:${rx_netty_version}"
+    api 'commons-configuration:commons-configuration:1.8'
+    api "com.google.guava:guava:${guava_version}"
+    api "com.netflix.archaius:archaius-core:${archaius_version}"
+    testImplementation "junit:junit:${junit_version}"
+    testImplementation "org.powermock:powermock-easymock-release-full:${powermock_version}"
+    testImplementation "org.easymock:easymock:${easymock_version}"
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}"
+    testImplementation project(':ribbon-eureka')
+    testImplementation project(':ribbon-test')
+    testImplementation 'com.google.mockwebserver:mockwebserver:20130706'
 }