Merge pull request #418 from Netflix/upgrade-gradle

Upgrade to Gradle 7.5.1 and move to com.netflix.nebula.netflixoss

build.gradle

@@ -15,11 +15,11 @@
  */
 
 plugins {
-    id 'nebula.netflixoss' version '9.4.1'
+    id 'com.netflix.nebula.netflixoss' version '11.1.1'
 }
 
 subprojects {
-    apply plugin: 'nebula.netflixoss'
+    apply plugin: 'com.netflix.nebula.netflixoss'
     apply plugin: 'java'
 
     repositories {
@@ -33,8 +33,8 @@ subprojects {
     group = "com.netflix.governator"
 
     dependencies {
-        testCompile 'org.slf4j:slf4j-log4j12:1.7.2'
-        testCompile 'junit:junit:4.12'
+        testImplementation 'org.slf4j:slf4j-log4j12:1.7.2'
+        testImplementation 'junit:junit:4.12'
     }
 
     eclipse {

governator-annotations/build.gradle

@@ -1,5 +1,5 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile     project(':governator-api')
+    api     project(':governator-api')
 }

governator-api/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 dependencies {
-    compile 'javax.inject:javax.inject:1'
+    api 'javax.inject:javax.inject:1'
 }

governator-archaius/build.gradle

@@ -1,8 +1,8 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile     project(':governator')
-    compile     'com.netflix.archaius:archaius-core:0.5.12'
+    api     project(':governator')
+    api     'com.netflix.archaius:archaius-core:0.5.12'
 
-    testCompile project(':governator').sourceSets.test.output
+    testImplementation project(':governator').sourceSets.test.output
 }

governator-commons-cli/build.gradle

@@ -1,7 +1,7 @@
 // Establish version and status
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile     project(':governator')
-    compile     "commons-cli:commons-cli:1.2"
+    api     project(':governator')
+    api     "commons-cli:commons-cli:1.2"
 }

governator-core/build.gradle

@@ -1,18 +1,18 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile     project(':governator-api')
-    compile     "javax.inject:javax.inject:1"
-    compile     "org.slf4j:slf4j-api:${slf4j_version}"
-    compile     "jakarta.annotation:jakarta.annotation-api:1.3.5"
-    compile     "com.google.inject:guice:${guice_version}"
-    compile     "com.google.inject.extensions:guice-multibindings:${guice_version}"
-    compile     "com.google.inject.extensions:guice-grapher:${guice_version}"    // should be provided - only if you want graphing
+    api     project(':governator-api')
+    api     "javax.inject:javax.inject:1"
+    api     "org.slf4j:slf4j-api:${slf4j_version}"
+    api     "jakarta.annotation:jakarta.annotation-api:1.3.5"
+    api     "com.google.inject:guice:${guice_version}"
+    api     "com.google.inject.extensions:guice-multibindings:${guice_version}"
+    api     "com.google.inject.extensions:guice-grapher:${guice_version}"    // should be provided - only if you want graphing
 
-    testCompile "org.hamcrest:hamcrest-core:${hamcrest_version}"
-    testCompile "org.hamcrest:hamcrest-library:${hamcrest_version}"
-    testCompile "org.mockito:mockito-all:1.9.5"
-    testCompile "com.google.code.findbugs:jsr305:3.0.0"
+    testImplementation "org.hamcrest:hamcrest-core:${hamcrest_version}"
+    testImplementation "org.hamcrest:hamcrest-library:${hamcrest_version}"
+    testImplementation "org.mockito:mockito-all:1.9.5"
+    testImplementation "com.google.code.findbugs:jsr305:3.0.0"
 
     test {
         useJUnit()

governator-jersey/build.gradle

@@ -1,20 +1,20 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile project(':governator-core')
-    compile project(':governator-providers')
+    api project(':governator-core')
+    api project(':governator-providers')
 
-    compile "com.google.inject.extensions:guice-servlet:${guice_version}"
-    compile "javax.xml.bind:jaxb-api:${jaxb_version}"
+    api "com.google.inject.extensions:guice-servlet:${guice_version}"
+    api "javax.xml.bind:jaxb-api:${jaxb_version}"
 
-    compile 'com.sun.jersey:jersey-server:1.19'
-    compile 'com.sun.jersey.contribs:jersey-guice:1.19'
+    api 'com.sun.jersey:jersey-server:1.19'
+    api 'com.sun.jersey.contribs:jersey-guice:1.19'
 
     compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
 
-    testCompile'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020'
-    testCompile project(':governator-jetty')
+    testImplementation 'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020'
+    testImplementation project(':governator-jetty')
 }

governator-jetty/build.gradle

@@ -1,16 +1,16 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile project(':governator-core')
-    compile "com.google.inject.extensions:guice-servlet:${guice_version}"
+    api project(':governator-core')
+    api "com.google.inject.extensions:guice-servlet:${guice_version}"
 
-    compile "javax.xml.bind:jaxb-api:${jaxb_version}"
+    api "javax.xml.bind:jaxb-api:${jaxb_version}"
 
-    compile 'com.sun.jersey:jersey-server:1.19'
-    compile 'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020'
-    compile 'org.eclipse.jetty:jetty-webapp:9.4.33.v20201020'
+    api 'com.sun.jersey:jersey-server:1.19'
+    api 'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020'
+    api 'org.eclipse.jetty:jetty-webapp:9.4.33.v20201020'
     compileOnly "com.netflix.archaius:archaius2-api:${archaius2_version}"
     compileOnly "com.netflix.archaius:archaius2-core:${archaius2_version}"
 
-    testCompile 'com.sun.jersey.contribs:jersey-guice:1.19'
+    testImplementation 'com.sun.jersey.contribs:jersey-guice:1.19'
 }

governator-legacy/build.gradle

@@ -2,27 +2,27 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 // Add a new configuration 'bundle' for fine grain control on what artifacts to shadow.
 configurations {
     bundle
-    compile.extendsFrom bundle
+    api.extendsFrom bundle
 }
 
 dependencies {
-    compile    project(':governator-api')
-    compile    project(':governator-core')
-    compile    'com.fasterxml.jackson.core:jackson-databind:2.4.3'
-    compile    "javax.xml.bind:jaxb-api:${jaxb_version}"
+    api    project(':governator-api')
+    api    project(':governator-core')
+    api    'com.fasterxml.jackson.core:jackson-databind:2.4.3'
+    api    "javax.xml.bind:jaxb-api:${jaxb_version}"
 
     // ASM is being shaded
     bundle    'org.ow2.asm:asm:7.2'
 
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'com.tngtech.java:junit-dataprovider:1.11.0'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile "com.google.code.findbugs:jsr305:3.0.0"
+    testImplementation 'org.hamcrest:hamcrest-library:1.3'
+    testImplementation 'com.tngtech.java:junit-dataprovider:1.11.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation "com.google.code.findbugs:jsr305:3.0.0"
 }
 
 shadowJar {

governator-providers/build.gradle

@@ -1,9 +1,9 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile     "javax.inject:javax.inject:1"
-    compile     "com.google.inject:guice:${guice_version}"
+    api     "javax.inject:javax.inject:1"
+    api     "com.google.inject:guice:${guice_version}"
 }

governator-servlet/build.gradle

@@ -1,12 +1,12 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile     project(':governator-core')
-    compile     "com.google.inject.extensions:guice-servlet:${guice_version}"
+    api     project(':governator-core')
+    api     "com.google.inject.extensions:guice-servlet:${guice_version}"
 
     compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
 
-    testCompile "org.mockito:mockito-all:1.9.5"
-    testCompile 'com.sun.jersey.contribs:jersey-guice:1.19'
-    testCompile 'javax.servlet:javax.servlet-api:3.0.1'
+    testImplementation "org.mockito:mockito-all:1.9.5"
+    testImplementation 'com.sun.jersey.contribs:jersey-guice:1.19'
+    testImplementation 'javax.servlet:javax.servlet-api:3.0.1'
 }

governator-test-junit/build.gradle

@@ -1,6 +1,6 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile    project(':governator-test')
-    compile    'junit:junit:4.12'
+    api    project(':governator-test')
+    api    'junit:junit:4.12'
 }

governator-test-spock/build.gradle

@@ -1,10 +1,11 @@
 apply plugin: 'groovy'
+apply plugin: 'java-library'
 
 dependencies {
-    compile    project(':governator-test')
-    compile 'org.spockframework:spock-core:1.1-groovy-2.4'
-    compile 'com.cyrusinnovation:mockito-groovy-support:1.3'
-    compile 'cglib:cglib-nodep:3.2.2'
+    api    project(':governator-test')
+    api 'org.spockframework:spock-core:1.1-groovy-2.4'
+    api 'com.cyrusinnovation:mockito-groovy-support:1.3'
+    api 'cglib:cglib-nodep:3.2.2'
 
 }
 

governator-test/build.gradle

@@ -1,18 +1,18 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile    project(':governator')
-    compile    project(':governator-api')
-    compile    project(':governator-core')
-    compile    "com.netflix.archaius:archaius2-guice:${archaius2_version}"
-    compile    ("com.netflix.archaius:archaius2-test:${archaius2_version}") {
+    api    project(':governator')
+    api    project(':governator-api')
+    api    project(':governator-core')
+    api    "com.netflix.archaius:archaius2-guice:${archaius2_version}"
+    api    ("com.netflix.archaius:archaius2-test:${archaius2_version}") {
         exclude module: 'junit'
     }
-    compile "com.netflix.archaius:archaius2-api:${archaius2_version}"
-    compile "com.netflix.archaius:archaius2-core:${archaius2_version}"
-    compile    'org.apache.commons:commons-lang3:3.3.2'
-    compile    'org.mockito:mockito-core:1.9.5'
+    api "com.netflix.archaius:archaius2-api:${archaius2_version}"
+    api "com.netflix.archaius:archaius2-core:${archaius2_version}"
+    api    'org.apache.commons:commons-lang3:3.3.2'
+    api    'org.mockito:mockito-core:1.9.5'
     compileOnly 'junit:junit:4.12'
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,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