support JDK 17 for CI

Netflix · Dec 9, 2021 · 1697e0c · 1697e0c
1 parent b3f6952
commit 1697e0c
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 15 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [8, 11, 17]
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-versions_groovy=3.0.3
+versions_groovy=3.0.9
 versions_ribbon=2.4.4
 versions_netty=4.1.69.Final
 release.scope=patch

diff --git a/zuul-core/build.gradle b/zuul-core/build.gradle
@@ -6,7 +6,8 @@ dependencies {
     implementation libraries.guava
     // TODO(carl-mastrangelo): this can be implementation; remove Logger from public api points.
     api libraries.slf4j
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.+'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
     api 'com.fasterxml.jackson.core:jackson-databind:2.12.1'
 

diff --git a/zuul-core/dependencies.lock b/zuul-core/dependencies.lock
@@ -72,6 +72,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.25"
         }
@@ -160,6 +163,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.33"
         },
@@ -279,6 +285,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
         },
@@ -401,6 +410,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-discovery"
@@ -487,6 +499,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
         },
@@ -600,6 +615,9 @@
         "org.bouncycastle:bcprov-jdk15on": {
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "locked": "1.70"
+        },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
         },

diff --git a/zuul-groovy/dependencies.lock b/zuul-groovy/dependencies.lock
@@ -103,7 +103,7 @@
             "locked": "1.3.8"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -224,7 +224,7 @@
             "locked": "1.3.8"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.25"
@@ -416,7 +416,7 @@
             "locked": "1.70"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
@@ -606,7 +606,7 @@
             "locked": "1.70"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -726,7 +726,7 @@
             "locked": "4.13.2"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
@@ -915,7 +915,7 @@
             "locked": "1.70"
         },
         "org.codehaus.groovy:groovy-all": {
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"

diff --git a/zuul-guice/dependencies.lock b/zuul-guice/dependencies.lock
@@ -421,6 +421,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
         },
@@ -614,6 +620,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
@@ -926,6 +938,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.mockito:mockito-core": {
             "locked": "4.1.0"
         },

diff --git a/zuul-processor/dependencies.lock b/zuul-processor/dependencies.lock
@@ -409,6 +409,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.25"
         },
@@ -593,6 +599,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
@@ -778,6 +790,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
@@ -1078,6 +1096,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",

diff --git a/zuul-sample/dependencies.lock b/zuul-sample/dependencies.lock
@@ -176,6 +176,12 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
@@ -303,7 +309,7 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -439,7 +445,7 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.25"
@@ -653,11 +659,17 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.codehaus.groovy:groovy-all": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.25"
@@ -872,11 +884,17 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.codehaus.groovy:groovy-all": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -1005,7 +1023,7 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -1213,11 +1231,17 @@
             ],
             "locked": "1.70"
         },
+        "org.bouncycastle:bcpkix-jdk15on": {
+            "firstLevelTransitive": [
+                "com.netflix.zuul:zuul-core"
+            ],
+            "locked": "1.70"
+        },
         "org.codehaus.groovy:groovy-all": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-groovy"
             ],
-            "locked": "3.0.3"
+            "locked": "3.0.9"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [