Upgrade nebula and gradle

.github/workflows/nebula-ci.yml

@@ -17,6 +17,10 @@ jobs:
     name: CI with Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "NetflixOss Maintainers"
+          git config --global user.email "netflix-oss@netflix.com"
       - name: Setup jdk
         uses: actions/setup-java@v1
         with:

.github/workflows/nebula-publish.yml

@@ -13,6 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "NetflixOss Maintainers"
+          git config --global user.email "netflix-oss@netflix.com"
       - name: Setup jdk 8
         uses: actions/setup-java@v1
         with:

.github/workflows/nebula-snapshot.yml

@@ -12,6 +12,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "NetflixOss Maintainers"
+          git config --global user.email "netflix-oss@netflix.com"
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:

build.gradle

@@ -1,14 +1,13 @@
 
 buildscript {
-  repositories { jcenter() }
+  repositories { mavenCentral() }
    dependencies {
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:latest.release'
-        classpath "org.akhikhl.gretty:gretty:latest.release"
+       classpath "org.gretty:gretty:3.1.2"
    }
 }
 
 plugins {
-    id 'nebula.netflixoss' version '9.1.0'
+    id 'nebula.netflixoss' version '11.5.0'
 }
 
 ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
@@ -39,27 +38,27 @@ subprojects {
 
     dependencies {
       //StringUtils
-      compile 'commons-lang:commons-lang:2.6'
+      implementation 'commons-lang:commons-lang:2.6'
 
       //Jersey & Servlet
       compileOnly 'javax.servlet:servlet-api:2.5'
 
       //Logging
-      compile 'org.slf4j:slf4j-api:1.6.1'
-      compile 'org.slf4j:slf4j-log4j12:1.6.1'
+      implementation 'org.slf4j:slf4j-api:1.6.1'
+      implementation 'org.slf4j:slf4j-log4j12:1.6.1'
 
         // Archaius-2
-        compile group: 'com.netflix.archaius', name: 'archaius2-core', version: '2.1.11'
+        implementation group: 'com.netflix.archaius', name: 'archaius2-core', version: '2.1.11'
 
       //Unit Testing
-      testCompile 'org.jmockit:jmockit:1.19'
-      testCompile 'junit:junit:latest.release'
+      testImplementation 'org.jmockit:jmockit:1.19'
+        testImplementation 'junit:junit:latest.release'
 
       //Google Injections
-      compile  'com.google.inject:guice:4.0'
-      compile  'com.google.inject.extensions:guice-multibindings:4.0'
+      implementation  'com.google.inject:guice:4.0'
+      implementation  'com.google.inject.extensions:guice-multibindings:4.0'
 
-      compile  'javax.inject:javax.inject:1'
+      implementation  'javax.inject:javax.inject:1'
 
     }
 }

dynomitemanager-common/build.gradle

@@ -1,29 +1,29 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
     // Archaius-2
-    compile group: 'com.netflix.archaius', name: 'archaius2-guice', version: '2.1.11'
-    compile group: 'com.netflix.archaius', name: 'archaius2-api', version: '2.1.11'
+    api group: 'com.netflix.archaius', name: 'archaius2-guice', version: '2.1.11'
+    api group: 'com.netflix.archaius', name: 'archaius2-api', version: '2.1.11'
 
-    compile "com.google.inject:guice:3.0"
-    compile "com.google.guava:guava:19.0"
+    api "com.google.inject:guice:3.0"
+    api "com.google.guava:guava:19.0"
 
-    compile 'com.amazonaws:aws-java-sdk:1.11.172'
-    compile 'com.amazonaws:aws-java-sdk-core:1.11.172'
-    compile "org.quartz-scheduler:quartz:1.7.3"
-    compile 'javax.inject:javax.inject:1'
-    compile "org.slf4j:slf4j-log4j12:1.6.1"
-    compile 'commons-io:commons-io:2.5'
-    compile 'commons-cli:commons-cli:1.3.1'
-    compile "javax.ws.rs:jsr311-api:1.1.1"
-    compile "joda-time:joda-time:2.0"
-    compile "commons-configuration:commons-configuration:1.5"
-    compile('com.netflix.astyanax:astyanax:2.0.1') {
+    api 'com.amazonaws:aws-java-sdk:1.11.172'
+    api 'com.amazonaws:aws-java-sdk-core:1.11.172'
+    api "org.quartz-scheduler:quartz:1.7.3"
+    api 'javax.inject:javax.inject:1'
+    api "org.slf4j:slf4j-log4j12:1.6.1"
+    api 'commons-io:commons-io:2.5'
+    api 'commons-cli:commons-cli:1.3.1'
+    api "javax.ws.rs:jsr311-api:1.1.1"
+    api "joda-time:joda-time:2.0"
+    api "commons-configuration:commons-configuration:1.5"
+    api('com.netflix.astyanax:astyanax:2.0.1') {
         exclude module: 'junit'
     }
 
     //Unit test
-    testCompile 'junit:junit:4.+'
-    testCompile 'org.mockito:mockito-all:1.+'
-    testCompile 'org.assertj:assertj-core:3.3.0'
+    testImplementation 'junit:junit:4.+'
+    testImplementation 'org.mockito:mockito-all:1.+'
+    testImplementation 'org.assertj:assertj-core:3.3.0'
 }

dynomitemanager-core/build.gradle

@@ -1,42 +1,42 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
     // Project
-    compile project(':dynomitemanager-common')
+    api project(':dynomitemanager-common')
 
-    compile "com.netflix.runtime:health-api:latest.release"
-    compile group: 'com.netflix.archaius', name: 'archaius2-guice', version: '2.1.11'
-     compile "com.netflix.servo:servo-core:latest.release"
+    api "com.netflix.runtime:health-api:latest.release"
+    api group: 'com.netflix.archaius', name: 'archaius2-guice', version: '2.1.11'
+     api "com.netflix.servo:servo-core:latest.release"
 
     //External
-    compile 'javax.inject:javax.inject:1'
-
-    compile group: 'commons-httpclient', name: 'commons-httpclient', version: '3.1'
-    compile "org.codehaus.jettison:jettison:latest.release"
-
-
-    compile "redis.clients:jedis:2.9.0"
-    compile "org.yaml:snakeyaml:1.17"
-    compile "com.googlecode.json-simple:json-simple:1.1"
-
-    compile "javax.ws.rs:jsr311-api:1.1.1"
-    compile "org.apache.cassandra:cassandra-thrift:1.2.11"
-    compile "org.quartz-scheduler:quartz:1.8.6"
-    compile "org.xerial.snappy:snappy-java:1.0.4.1"
-    compile "com.googlecode.json-simple:json-simple:1.1"
-    compile 'commons-io:commons-io:2.5'
-    compile 'commons-cli:commons-cli:1.3.1'
-    compile "javax.ws.rs:jsr311-api:1.1.1"
-    compile "joda-time:joda-time:2.0"
-    compile "commons-configuration:commons-configuration:1.5"
-    compile "net.java.dev.jna:jna:3.2.3"
+    api 'javax.inject:javax.inject:1'
+
+    api group: 'commons-httpclient', name: 'commons-httpclient', version: '3.1'
+    api "org.codehaus.jettison:jettison:latest.release"
+
+
+    api "redis.clients:jedis:2.9.0"
+    api "org.yaml:snakeyaml:1.17"
+    api "com.googlecode.json-simple:json-simple:1.1"
+
+    api "javax.ws.rs:jsr311-api:1.1.1"
+    api "org.apache.cassandra:cassandra-thrift:1.2.11"
+    api "org.quartz-scheduler:quartz:1.8.6"
+    api "org.xerial.snappy:snappy-java:1.0.4.1"
+    api "com.googlecode.json-simple:json-simple:1.1"
+    api 'commons-io:commons-io:2.5'
+    api 'commons-cli:commons-cli:1.3.1'
+    api "javax.ws.rs:jsr311-api:1.1.1"
+    api "joda-time:joda-time:2.0"
+    api "commons-configuration:commons-configuration:1.5"
+    api "net.java.dev.jna:jna:3.2.3"
 
 
     //Unit test
-    testCompile 'junit:junit:4.+'
-    testCompile 'org.mockito:mockito-all:1.+'
-    testCompile 'org.assertj:assertj-core:3.3.0'
-    testCompile 'com.netflix.governator:governator-test-junit:[1.15.3,)'
+    testImplementation 'junit:junit:4.+'
+    testImplementation 'org.mockito:mockito-all:1.+'
+    testImplementation 'org.assertj:assertj-core:3.3.0'
+    testImplementation 'com.netflix.governator:governator-test-junit:[1.15.3,)'
 
 
 

dynomitemanager-web/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'war'
-apply plugin: "org.akhikhl.gretty"
+apply plugin: "org.gretty"
 apply plugin: 'jacoco'
 
 
@@ -11,45 +11,43 @@ if (!gradle.startParameter.taskRequests.isEmpty()) {
         jacocoEnabled = false
         httpPort = development_properties.getProperty("netflix.appinfo.port", "8080").toInteger()
         contextPath = '/'
-        servletContainer = 'tomcat8'
+        servletContainer = 'tomcat85'
         systemProperties = development_properties
         scanDirs = ['**/src/main/resources/**']
         scanDependencies = true
         // More properties can be found here:
         // http://akhikhl.github.io/gretty-doc/Gretty-configuration.html
     }
     // Required exclusions to work around a bug in gretty: log4j-over-slf4j is accidentally included
-    configurations.grettyRunnerTomcat7 {
-        exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
-    }
-    configurations.grettyRunnerTomcat8 {
+
+    configurations.grettyRunnerTomcat85 {
         exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
     }
 }
 
 dependencies {
-    compile project(':dynomitemanager-common')
-    compile project(':dynomitemanager-core')
+    implementation  project(':dynomitemanager-common')
+    implementation  project(':dynomitemanager-core')
 
-    compile 'com.google.inject.extensions:guice-servlet:4.0'
-    compile 'com.google.inject:guice:4.0'
-    compile group: 'com.owlike', name: 'genson', version: '1.4'
+    implementation  'com.google.inject.extensions:guice-servlet:4.0'
+    implementation  'com.google.inject:guice:4.0'
+    implementation  group: 'com.owlike', name: 'genson', version: '1.4'
 
-    compile "com.netflix.runtime:health-guice:latest.release"    
+    implementation  "com.netflix.runtime:health-guice:latest.release"    
 
     // Governator wires up all of our dependencies in dependency injection fashion.
-    compile "com.netflix.governator:governator-core:latest.release"
-    compile "com.netflix.governator:governator-servlet:latest.release"
-    compile "com.netflix.governator:governator-jersey:latest.release"
-    compile "com.sun.jersey.contribs:jersey-guice:1.19"
+    implementation  "com.netflix.governator:governator-core:latest.release"
+    implementation  "com.netflix.governator:governator-servlet:latest.release"
+    implementation  "com.netflix.governator:governator-jersey:latest.release"
+    implementation  "com.sun.jersey.contribs:jersey-guice:1.19"
 
     // This is here because it's the only reliable way to make IDEs pick up the proper dependencies when running
     // a main() function while also not packaging the dependencies to be deployed on EC2.
     if (gradle.startParameter.taskRequests.isEmpty()) {
-        compile("com.netflix.governator:governator-jetty:latest.release") { transitive = false }
-        compile "org.eclipse.jetty:jetty-servlet:latest.release"
-        compile "org.eclipse.jetty:jetty-webapp:latest.release"
-        compile "javax.servlet:javax.servlet-api:latest.release"
+        implementation ("com.netflix.governator:governator-jetty:latest.release") { transitive = false }
+        implementation  "org.eclipse.jetty:jetty-servlet:latest.release"
+        implementation  "org.eclipse.jetty:jetty-webapp:latest.release"
+        implementation  "javax.servlet:javax.servlet-api:latest.release"
     } else {
         compileOnly("com.netflix.governator:governator-jetty:latest.release") { transitive = false }
         compileOnly "org.eclipse.jetty:jetty-servlet:latest.release"
@@ -60,4 +58,4 @@ dependencies {
 
 }
 
-war.archiveName = "dynomite-manager.war"
+war.archiveFileName = "dynomite-manager.war"

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip