Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support JDK 17 #1143

Merged
merged 5 commits into from Dec 9, 2021
Merged

support JDK 17 #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e60d602
chore(ci): JDK 17
sullis Dec 1, 2021
e5d3951
groovy 3.0.3 -> groovy 3.0.9
sullis Dec 1, 2021
f9560d9
workaround for BouncyCastle exception
sullis Dec 2, 2021
7bd35b0
fix dependencies.lock
sullis Dec 2, 2021
0225dcd
fix zuul-guice/dependencies.lock
sullis Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion zuul-core/build.gradle
View file
Open in desktop
Expand Up @@ -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'

Expand Down
18 changes: 18 additions & 0 deletions zuul-core/dependencies.lock
View file
Open in desktop
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down
12 changes: 6 additions & 6 deletions zuul-groovy/dependencies.lock
View file
Open in desktop
Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions zuul-guice/dependencies.lock
View file
Open in desktop
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
24 changes: 24 additions & 0 deletions zuul-processor/dependencies.lock
View file
Open in desktop
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
36 changes: 30 additions & 6 deletions zuul-sample/dependencies.lock
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -303,7 +309,7 @@
"firstLevelTransitive": [
"com.netflix.zuul:zuul-groovy"
],
"locked": "3.0.3"
"locked": "3.0.9"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -1005,7 +1023,7 @@
"firstLevelTransitive": [
"com.netflix.zuul:zuul-groovy"
],
"locked": "3.0.3"
"locked": "3.0.9"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -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": [
Expand Down