2.1.8 PR

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Gradle wrapper validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/pr.yml

@@ -0,0 +1,39 @@
+name: PR Build
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11, 15]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+      - uses: actions/cache@v2.1.4
+        id: gradle-cache
+        with:
+          path: |
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - uses: actions/cache@v2.1.4
+        id: gradle-wrapper-cache
+        with:
+          path: |
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+      - name: Build
+        run: ./gradlew build
+  validation:
+    name: "Gradle Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/release.yml

@@ -0,0 +1,49 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 8
+      - uses: actions/cache@v2.1.4
+        id: gradle-cache
+        with:
+          path: |
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - uses: actions/cache@v2.1.4
+        id: gradle-wrapper-cache
+        with:
+          path: |
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+      - name: Build 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: Build 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/snapshot.yml

@@ -0,0 +1,38 @@
+name: Snapshot
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 8
+      - uses: actions/cache@v2.1.4
+        id: gradle-cache
+        with:
+          path: |
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - uses: actions/cache@v2.1.4
+        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 }}

.gitignore

@@ -61,5 +61,10 @@ atlassian-ide-plugin.xml
 .settings
 .metadata
 
+zuul-sample/src/main/generated/
+
 # NetBeans specific files/directories
 .nbattrs
+
+# publishing secrets
+secrets/signing-key

build.gradle

@@ -1,8 +1,9 @@
 
 plugins {
-    id 'nebula.netflixoss' version '8.0.0'
-    id 'nebula.dependency-lock' version '8.0.0'
+    id 'nebula.netflixoss' version '9.1.0'
+    id 'nebula.dependency-lock' version '10.1.0'
     id "com.google.osdetector" version "1.6.2"
+    id "me.champeau.gradle.jmh" version "0.5.0"
 }
 
 ext.githubProjectName = rootProject.name
@@ -19,39 +20,34 @@ configurations.all {
     exclude group: 'asm', module: 'asm-all'
 }
 
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+
 subprojects {
     apply plugin: 'nebula.netflixoss'
     apply plugin: 'java'
-    apply plugin: 'groovy'
     apply plugin: 'nebula.javadoc-jar'
     apply plugin: 'nebula.dependency-lock'
-
-    repositories {
-        jcenter()
-        mavenLocal()
-    }
+    apply plugin: 'me.champeau.gradle.jmh'
 
     license {
         ignoreFailures = false
+        excludes([
+                "**/META-INF/services/javax.annotation.processing.Processor",
+                "**/META-INF/gradle/incremental.annotation.processors",
+                "**/*.cert",
+                "**/*.jks",
+                "**/*.key",
+        ])
     }
 
     group = "com.netflix.${githubProjectName}"
 
     sourceCompatibility = '1.8'
 
-    sourceSets {
-        test {
-            java {
-                srcDirs  = ['src/main/java', 'src/test/java']
-                include '**/*.java'
-            }
-            groovy {
-                srcDirs  = ['filters', 'src/main/groovy']
-                include '**/*.groovy'
-            }
-        }
-    }
-
     eclipse {
         classpath {
             downloadSources = true
@@ -61,21 +57,20 @@ subprojects {
 
     tasks.withType(Javadoc).each {
         it.classpath = sourceSets.main.compileClasspath
+        // Ignore Javadoc warnings for now, re-enable after Zuul 3.
+        it.options.addStringOption('Xdoclint:none', '-quiet')
     }
 
-    dependencies {
-        ext.versions_guice = "4.2.2"
-
-        // Use guice-4 while debugging a startup error that is hidden by guice-3's lack of java8 lambda support.
-        compile(group: 'com.google.inject', name: 'guice', version: "${versions_guice}")
-        compile(group: 'com.google.inject.extensions', name: 'guice-multibindings', version: "${versions_guice}")
-        compile(group: 'com.google.inject.extensions', name: 'guice-grapher', version: "${versions_guice}")
-        compile(group: 'com.google.inject.extensions', name: 'guice-assistedinject', version: "${versions_guice}")
-        compile(group: 'com.google.inject.extensions', name: 'guice-servlet', version: "${versions_guice}")
-        compile(group: 'com.google.inject.extensions', name: 'guice-throwingproviders', version: "${versions_guice}")
+    ext {
+        libraries = [
+                guava: "com.google.guava:guava:29.0-jre",
+                junit: "junit:junit:4.13",
+                mockito: 'org.mockito:mockito-core:3.+',
+                slf4j: "org.slf4j:slf4j-api:1.7.25",
+                truth: 'com.google.truth:truth:1.0.1'
+        ]
     }
 
-
     test {
         testLogging {
             showStandardStreams = true

dependencies.lock

@@ -1,3 +1,26 @@
 {
-
+    "jmh": {
+        "org.openjdk.jmh:jmh-core": {
+            "locked": "1.21"
+        },
+        "org.openjdk.jmh:jmh-generator-bytecode": {
+            "locked": "1.21"
+        }
+    },
+    "jmhCompileClasspath": {
+        "org.openjdk.jmh:jmh-core": {
+            "locked": "1.21"
+        },
+        "org.openjdk.jmh:jmh-generator-bytecode": {
+            "locked": "1.21"
+        }
+    },
+    "jmhRuntimeClasspath": {
+        "org.openjdk.jmh:jmh-core": {
+            "locked": "1.21"
+        },
+        "org.openjdk.jmh:jmh-generator-bytecode": {
+            "locked": "1.21"
+        }
+    }
 }

gradle.properties

@@ -1,4 +1,5 @@
-versions_groovy=2.4.4
-versions_ribbon=2.2.4
-versions_netty=4.1.45.Final
+versions_groovy=3.0.3
+versions_ribbon=2.4.4
+versions_netty=4.1.63.Final
 release.scope=patch
+release.version=2.3.1-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists