Upgrade to Gradle 8.12.1

.github/workflows/nebula-ci.yml

@@ -0,0 +1,49 @@
+name: "CI"
+on:
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # test against JDK 8
+        java: [ 8 ]
+    name: CI with Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Setup jdk
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - uses: actions/cache@v1
+        id: gradle-cache
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradle-
+      - uses: actions/cache@v1
+        id: gradle-wrapper-cache
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradlewrapper-
+      - name: Build with Gradle
+        run: ./gradlew --info --stacktrace build
+        env:
+          CI_NAME: github_actions
+          CI_BUILD_NUMBER: ${{ github.sha }}
+          CI_BUILD_URL: 'https://github.com/${{ github.repository }}'
+          CI_BRANCH: ${{ github.ref }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nebula-publish.yml

@@ -0,0 +1,52 @@
+name: "Publish to NetflixOSS and Maven Central"
+on:
+  push:
+    tags:
+      - v*.*.*
+      - v*.*.*-rc.*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Setup jdk 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - uses: actions/cache@v1
+        id: gradle-cache
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradle-
+      - uses: actions/cache@v1
+        id: gradle-wrapper-cache
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradlewrapper-
+      - name: Publish candidate
+        if: contains(github.ref, '-rc.')
+        run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate
+        env:
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
+      - name: Publish release
+        if: (!contains(github.ref, '-rc.'))
+        run: ./gradlew --info -Prelease.useLastTag=true final
+        env:
+          NETFLIX_OSS_SONATYPE_USERNAME: ${{ secrets.ORG_SONATYPE_USERNAME }}
+          NETFLIX_OSS_SONATYPE_PASSWORD: ${{ secrets.ORG_SONATYPE_PASSWORD }}
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

.github/workflows/nebula-snapshot.yml

@@ -0,0 +1,41 @@
+name: Snapshot
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - uses: actions/cache@v2
+        id: gradle-cache
+        with:
+          path: |
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - uses: actions/cache@v2
+        id: gradle-wrapper-cache
+        with:
+          path: |
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+      - name: Build
+        run: ./gradlew build snapshot
+        env:
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

build.gradle

@@ -3,108 +3,109 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.netflixoss' version '3.3.0'
+    id("com.netflix.nebula.netflixoss") version "11.5.0"
 }
 
 // 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: 'java-library'
 
     repositories {
-        jcenter()
+        mavenCentral()
+    }
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(8)
+        }
     }
 
     group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
 
     dependencies {
-        compile 'javax.ws.rs:jsr311-api:1.1.1'
-        compile 'com.sun.jersey.contribs:jersey-guice:1.19'
-        compile 'com.sun.jersey:jersey-core:1.19'
-        compile 'com.sun.jersey:jersey-json:1.19'
-        compile 'com.sun.jersey:jersey-servlet:1.19'
-
-        compile 'org.slf4j:slf4j-api:1.7.13'
-        testCompile 'junit:junit:4.10'
-        testCompile 'org.mockito:mockito-core:1.8.5'
+        api 'javax.ws.rs:jsr311-api:1.1.1'
+        api 'com.sun.jersey.contribs:jersey-guice:1.19'
+        api 'com.sun.jersey:jersey-core:1.19'
+        api 'com.sun.jersey:jersey-json:1.19'
+        api 'com.sun.jersey:jersey-servlet:1.19'
+
+        api 'org.slf4j:slf4j-api:1.7.13'
+        testImplementation 'junit:junit:4.10'
+        testImplementation 'org.mockito:mockito-core:1.8.5'
     }
 
 }
 
 project(':pytheas-core') {
     dependencies {
-        compile project(':pytheas-api')
-
-        compile 'javax.servlet:servlet-api:2.5'
-
-        compile 'commons-configuration:commons-configuration:1.8'
-
-        compile 'com.google.guava:guava:18.0'
-        compile 'com.google.inject.extensions:guice-servlet:4.0'
-        compile 'com.google.code.findbugs:annotations:2.0.0'
-
-        compile 'com.sun.jersey:jersey-server:1.19'
-
-        compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
-
-        compile 'org.freemarker:freemarker:2.3.15'
-
-        compile 'com.netflix.archaius:archaius-core:0.7.3'
-        compile 'com.netflix.governator:governator:1.14.2'
-
-        compile 'commons-collections:commons-collections:3.2.1'
-        compile 'commons-codec:commons-codec:1.7'
-        compile 'commons-beanutils:commons-beanutils:1.9.1'
-        compile 'commons-io:commons-io:2.4'
-
-        runtime 'com.sun.jersey:jersey-servlet:1.19'
+        api project(':pytheas-api')
+
+        api 'javax.servlet:servlet-api:2.5'
+
+        api 'commons-configuration:commons-configuration:1.8'
+
+        api 'com.google.guava:guava:18.0'
+        api 'com.google.inject.extensions:guice-servlet:4.0'
+        api 'com.google.inject.extensions:guice-multibindings:4.0'
+        api 'com.google.code.findbugs:annotations:2.0.0'
+
+        api 'com.sun.jersey:jersey-server:1.19'
+
+        api 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
+
+        api 'org.freemarker:freemarker:2.3.15'
+
+        api 'com.netflix.archaius:archaius-core:0.7.3'
+        api 'com.netflix.governator:governator:1.14.2'
+
+        api 'commons-collections:commons-collections:3.2.1'
+        api 'commons-codec:commons-codec:1.7'
+        api 'commons-beanutils:commons-beanutils:1.9.1'
+        api 'commons-io:commons-io:2.4'
+
+        runtimeOnly 'com.sun.jersey:jersey-servlet:1.19'
     }
 }
 
 project(':pytheas-api') {
     dependencies {
-        compile 'commons-configuration:commons-configuration:1.8'
-        compile 'com.google.guava:guava:18.0'
+        api 'javax.annotation:javax.annotation-api:1.3.2'
+        api 'commons-configuration:commons-configuration:1.8'
+        api 'com.google.guava:guava:18.0'
     }
 }
 
 project(':pytheas-karyon') {
     dependencies {
-        compile project(':pytheas-core')
-        compile 'com.netflix.karyon:karyon-core:1.0.28'
+        api project(':pytheas-core')
+        api 'com.netflix.karyon:karyon-core:1.0.28'
+        api 'com.netflix.karyon:karyon-spi:1.0.28'
     }
 }
 
 
 project(':pytheas-helloworld') {
-
-    apply plugin: 'jetty'
     apply plugin: 'war'
 
     dependencies {
-        compile project(':pytheas-karyon')
-        compile 'com.netflix.karyon:karyon-extensions:1.0.28'
-        runtime 'org.slf4j:slf4j-simple:1.7.13'
-        testCompile 'org.eclipse.jetty:jetty-server:7.6.7.v20120910'
-        testCompile 'org.eclipse.jetty:jetty-servlet:7.6.7.v20120910'
-    }
-
-    jettyRun.doFirst {
-        System.setProperty("archaius.deployment.applicationId","helloworld-app")
-        System.setProperty("archaius.deployment.environment","dev")
+        implementation project(':pytheas-karyon')
+        implementation 'com.netflix.karyon:karyon-extensions:1.0.28'
+        implementation 'org.apache.httpcomponents:httpclient:4.3.2'
+        runtimeOnly 'org.slf4j:slf4j-simple:1.7.13'
+        testImplementation 'org.eclipse.jetty:jetty-server:7.6.7.v20120910'
+        testImplementation 'org.eclipse.jetty:jetty-servlet:7.6.7.v20120910'
     }
 
     war {
         from('resources')  {
             include '*.properties'
             into 'WEB-INF/classes/'
         }
-        webXml = file('src/main/webapp/WEB-INF/web.xml')
-    }
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
-    jettyRun {
-        httpPort = 8989
+        webXml = file('src/main/webapp/WEB-INF/web.xml')
     }
 }

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

pytheas-core/src/main/java/com/netflix/explorers/ExplorersManagerImpl.java

@@ -19,7 +19,6 @@
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import com.netflix.config.ConfigurationManager;
 import com.netflix.explorers.context.GlobalModelContext;
 import com.netflix.explorers.services.ExplorerServiceCachedFactorySupplier;
 import com.netflix.explorers.services.ExplorerServiceInstanceSupplier;